Renamed SHAPER_CONFIG_FILE to PLUGINS_CONFIG_FILE

diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake
index af133e197ffc3a1dc703dcec5df72c79fbd137c2..34cdeba1bd7db452f56a5edb7cc5b6be218e05c4 100644 (file)
--- a/CMakeCommon/UnitTest.cmake
+++ b/CMakeCommon/UnitTest.cmake
@@ -54,10 +54,10 @@ MACRO(ADD_UNIT_TESTS)
                COMMAND ${PYTHON_EXECUTABLE} ${aTestFileName})
       if (WIN32) # different path to libraries variable name
         SET_TESTS_PROPERTIES(${aTestName} PROPERTIES
-               ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};SHAPER_CONFIG_FILE=${_CONFIG_FILE}")
+               ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};PLUGINS_CONFIG_FILE=${_CONFIG_FILE}")
       else()
         SET_TESTS_PROPERTIES(${aTestName} PROPERTIES
-               ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};SHAPER_CONFIG_FILE=${_CONFIG_FILE}")
+               ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};PLUGINS_CONFIG_FILE=${_CONFIG_FILE}")
       endif()
       # Debug output...
       #MESSAGE(STATUS "Test added: ${aTestName} file: ${aTestFileName}")

diff --git a/env_Salome.bat b/env_Salome.bat
index bcb80178b70cdfcd34614d00ca0f18f7cdf24564..56ce96877b65f568ce932b3cedb75296b2528d9a 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -99,7 +99,7 @@ IF "%ARCH%" == "Win64" (
   )
 )
 
-@SET SHAPER_CONFIG_FILE=%ROOT_DIR%\install\share\salome\resources\shaper
+@SET PLUGINS_CONFIG_FILE=%ROOT_DIR%\install\share\salome\resources\shaper
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET PATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PATH%
 @SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH%

diff --git a/env_linux.sh b/env_linux.sh
index 7ef0107d71042fbc8b7f73e9738d8370ab0b11bb..d7f2e2f722ed2588cb1afedc7b4466d389bb3753 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -55,5 +55,5 @@ export PATH=${CASROOT}:${PATH}
 export PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PATH}
 export PYTHONPATH=${SHAPER_ROOT_DIR}//bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export SHAPER_CONFIG_FILE=${SHAPER_ROOT_DIR}/share/salome/resources/shaper
+export PLUGINS_CONFIG_FILE=${SHAPER_ROOT_DIR}/share/salome/resources/shaper
 export SHAPERResources=${SHAPER_ROOT_DIR}/share/salome/resources/shaper

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index a995f3c7191cdb21dfcdd108d18aaad898174db3..c08238a08de361d8ef55d9de14c91c5f64bb9df2 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -41,7 +41,7 @@ Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
    * to use environment variable (at least for the current moment)
    */
   if (prefix.empty()) {
-    char* anEnv = getenv("SHAPER_CONFIG_FILE");
+    char* anEnv = getenv("PLUGINS_CONFIG_FILE");
     if (anEnv) {
       prefix = std::string(anEnv);
     }