X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=416599222e367fb8522d2239306d4ec69da973ac;hb=f9d184932396590fe9eddb5d38a2be34054eba8e;hp=9de52650f137e89bb52f21993b9a3a8dbf6fc472;hpb=5fcae986cb44da30e664f678927ab21bafea6baa;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index 9de52650f..416599222 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -19,17 +19,17 @@ if "%SALOME_ROOT_DIR%" == "" (
 )
 
 if "%SOLVESPACE_ROOT_DIR%" == "" (
-  SET SOLVESPACE_ROOT_DIR=%ROOT_DIR%\products\solvespace-2.0
+  SET SOLVESPACE_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\solvespace-2.1
 )
 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 NEWGEOM_ROOT_DIR=%ROOT_DIR%\install
-@SET PATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\bin;%PATH%
-@SET PYTHONPATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\addons;%NEWGEOM_ROOT_DIR%\pythonAPI;%PYTHONPATH%
+@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
+@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=%%NEWGEOM_ROOT_DIR%\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
-@SET NewGeomResources=%NEWGEOM_ROOT_DIR%\resources
+@SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui