)
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%" == "" (
- SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+ 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 %SALOME_ROOT_DIR%\WORK
)
)
-@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