X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=416599222e367fb8522d2239306d4ec69da973ac;hb=844220fef6e3d006be674b807099bb55f7183c0b;hp=ffad9939b00fed2da1f8575426baac8882dc0011;hpb=6946089feb5cfde70fa0b901b1fa6c7534bdea09;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index ffad9939b..416599222 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -19,14 +19,31 @@ 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%
 
-cd %SALOME_ROOT_DIR%\WORK
+if "%PLANEGCS_ROOT_DIR%" == "" (
+  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=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\eigen-3.2.7
+)
+
+if "%BOOST_ROOT_DIR%" == "" (
+  if "SALOME_ROOT_DIR" == "" (
+    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+  ) else (
+    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+  )
+)
+
+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
@@ -57,20 +74,14 @@ cd %ROOT_DIR%
 @REM -------------------------
 
 @REM -------------------------
-@REM Create launch path
-rem @SET PATH=%LIBXML2_ROOT_DIR%\bin;%PATH%
-rem @SET PATH=%PDIR%\tbb\bin;%PATH%
-rem @SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH%
-rem @SET PATH=%PDIR%\ftgl-2.1.3\bin;%PATH%
-rem @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
-rem @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH%
-rem @SET PATH=%PDIR%\qwt-5.2.1\lib;%PATH%
-rem @SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
+@SET PYTHONHOME=%PYTHON_ROOT_DIR%
+@SET PYTHON_INCLUDE=%PYTHONHOME%\include
 @REM -------------------------
 
+
 @REM -------------------------
-@SET PYTHONHOME=%PYTHON_ROOT_DIR%
-@SET PYTHON_INCLUDE=%PYTHONHOME%\include
+@REM Some OCCT headers include FREETYPE headers
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
 @REM -------------------------
 
 @SET PATH=%GEOM_ROOT_DIR%\lib\salome;%PATH%
@@ -88,9 +99,9 @@ IF "%ARCH%" == "Win64" (
   )
 )
 
-@SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\plugins;%ROOT_DIR%\install\bin;%PATH%
-@SET PYTHONPATH=%ROOT_DIR%\install\swig;%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=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
-@SET NewGeomResources=%ROOT_DIR%\install\resources
+@SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui