X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=416599222e367fb8522d2239306d4ec69da973ac;hb=3958bd83bc41c4c9bddbbbba375dd187e2363044;hp=0a97e7c729832a5b8d3b6b2441953d2190e507ef;hpb=a9bdd72e4748283ea455fef89e11eb0eae3b7b48;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index 0a97e7c72..416599222 100644
--- 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 NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
-@SET PATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\bin;%PATH%
-@SET PYTHONPATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\addons;%SHAPER_ROOT_DIR%\pythonAPI;%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%\resources
+@SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui