Merge remote-tracking branch 'origin/cbr/export_to_geom_via_xao'

[modules/shaper.git] / env_Salome.bat

diff --git a/env_Salome.bat b/env_Salome.bat
index 56ce96877b65f568ce932b3cedb75296b2528d9a..416599222e367fb8522d2239306d4ec69da973ac 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -24,12 +24,12 @@ if "%SOLVESPACE_ROOT_DIR%" == "" (
 SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 
 if "%PLANEGCS_ROOT_DIR%" == "" (
-  SET PLANEGCS_ROOT_DIR=%ROOT_DIR%\products\planegcs-0.16
+  SET PLANEGCS_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.16
 )
 SET PATH=%PLANEGCS_ROOT_DIR%\lib;%PATH%
 
 if "%EIGEN_ROOT_DIR%" == "" (
-  SET EIGEN_ROOT_DIR=%ROOT_DIR%\products\eigen-3.2.7
+  SET EIGEN_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\eigen-3.2.7
 )
 
 if "%BOOST_ROOT_DIR%" == "" (
@@ -40,10 +40,10 @@ if "%BOOST_ROOT_DIR%" == "" (
   )
 )
 
-cd %SALOME_ROOT_DIR%\WORK
+cd /d %SALOME_ROOT_DIR%\WORK
 call set_env.bat %1
 call "%PDIR%\env_compile.bat"
-cd %ROOT_DIR%
+cd /d %ROOT_DIR%
 
 @REM -------------------------
 @REM Python
@@ -99,10 +99,9 @@ IF "%ARCH%" == "Win64" (
   )
 )
 
-@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%
+@SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
+REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\lib\python2.7\site-packages\salome\salome;%PYTHONPATH%
+REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%PYTHONPATH%
 
 @SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
-@SET SHAPERResources=%SHAPER_ROOT_DIR%\share\salome\resources\shaper