Commit 48f322c3 authored by Ludovic Courtès's avatar Ludovic Courtès

core: 'ALTA_LIB' becomes 'ALTA_PLUGIN_PATH'.

parent 66a57f03
......@@ -23,7 +23,7 @@ scripts=${sources}/sources/scripts/
export ALTA=$sources
export ALTA_DIR=$sources/sources
export ALTA_LIB="$builddir/plugins"
export ALTA_PLUGIN_PATH="$builddir/plugins"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$builddir/plugins:$external"
export PATH="$PATH:$builddir/softs:$scripts"
export PYTHONPATH="$PYTHONPATH:$builddir/python"
/* ALTA --- Analysis of Bidirectional Reflectance Distribution Functions
Copyright (C) 2014, 2015 CNRS
Copyright (C) 2013, 2014, 2015 Inria
Copyright (C) 2013, 2014, 2015, 2016 Inria
This file is part of ALTA.
......@@ -57,12 +57,12 @@ std::string library_name(const std::string name)
return filename;
}
void get_library_dirs(std::list<std::string>& dirs)
void plugin_search_path(std::list<std::string>& dirs)
{
dirs.push_back("");
std::string obj_str ;
const char *env_str = std::getenv("ALTA_LIB") ;
const char *env_str = std::getenv("ALTA_PLUGIN_PATH");
if(env_str == NULL) {
obj_str = "" ;
......@@ -89,7 +89,7 @@ void get_library_dirs(std::list<std::string>& dirs)
template<typename T> T open_library(const std::string& filename, const char* function)
{
std::list<std::string> basename;
get_library_dirs(basename);
plugin_search_path(basename);
std::list<std::string>::iterator iter;
for(iter = basename.begin(); iter != basename.end(); ++iter)
......
......@@ -65,7 +65,7 @@ Section "ALTA" SecMain
# Update the ENVIROMNENT
WriteRegStr HKCU "Environment" "ALTA_DIR" '$INSTDIR'
WriteRegStr HKCU "Environment" "ALTA_LIB" '$INSTDIR\plugins'
WriteRegStr HKCU "Environment" "ALTA_PLUGIN_PATH" '$INSTDIR\plugins'
${EnvVarUpdate} $0 "PATH" "A" "HKCU" '$INSTDIR\bin'
${EnvVarUpdate} $1 "PYTHONPATH" "A" "HKCU" '$INSTDIR\python'
......@@ -93,9 +93,9 @@ Section "Uninstall"
RMDir /r "$INSTDIR"
;Remove ALTA_LIB AND ALTA_DIR env. variable
;Remove ALTA_PLUGIN_PATH AND ALTA_DIR env. variable
DeleteRegKey HKCU "ALTA_DIR"
DeleteRegKey HKCU "ALTA_LIB"
DeleteRegKey HKCU "ALTA_PLUGIN_PATH"
${un.EnvVarUpdate} $0 "PATH" "R" "HKCU" "$INSTDIR"
......
......@@ -58,7 +58,7 @@ def build_environment_variables():
envvars = os.environ.copy()
envvars['TEST_DATA_DIRECTORY'] = test_data_directory
envvars['PYTHONPATH'] = Dir('#build/python').abspath
envvars['ALTA_LIB'] = Dir('#build/plugins').abspath;
envvars['ALTA_PLUGIN_PATH'] = Dir('#build/plugins').abspath;
libdir = Dir('#build/plugins').abspath
lib_path_var = library_search_path_variable()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment