X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=57d9e32f6d3ad673c0ee8cf54677fee9d9556586;hb=1c38303bfb14e83f7ccfd2c51774ee12c431e9e3;hp=a056258e7a023a84723c00524f1cb06e6c9ad7f4;hpb=061a63480f6840b6d945f7744b3b972e2d4cb25d;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index a056258e7..57d9e32f6 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -1,7 +1,5 @@
 @echo off
 
-IF NOT EXIST "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" GOTO ERROR1
-
 @REM Load local settings from file localenv.bat that should be located in the root directory
 if "%ROOT_DIR%" == "" (
   set ROOT_DIR=%~dp0..
@@ -24,26 +22,26 @@ 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.18
 )
 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%" == "" (
   if "SALOME_ROOT_DIR" == "" (
-    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.67.0
   ) else (
-    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.67.0
   )
 )
 
-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
@@ -53,8 +51,8 @@ cd %ROOT_DIR%
 
 @REM -------------------------
 @REM CASCADE
-@SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH%
-@SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB%
+@SET PATH=%CASROOT%;%CASROOT%\win64\vc14\bin%OCC_LIB_PREFIX%;%PATH%
+@SET LIB=%CASROOT%\win64\vc14\lib%OCC_LIB_PREFIX%;%LIB%
 @set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT
 @set CSF_LANGUAGE=us
 @set MMGT_CLEAR=1
@@ -78,31 +76,32 @@ cd %ROOT_DIR%
 @SET PYTHON_INCLUDE=%PYTHONHOME%\include
 @REM -------------------------
 
-
 @REM -------------------------
 @REM Some OCCT headers include FREETYPE headers
-@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.9.0
 @REM -------------------------
 
 @SET PATH=%GEOM_ROOT_DIR%\lib\salome;%PATH%
 
 @SET _NO_DEBUG_HEAP=1
 
-IF "%ARCH%" == "Win64" (
-  call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-) ELSE (
-  IF "%ARCH%" == "Win32" (
-    call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-  ) ELSE (
-    echo Wrong architecture is used. Win32 or Win64 architecture is allowed only.
-    echo Refer to the set_env.bat script.
-  )
+if "%VS140COMNTOOLS%" == "" (
+    echo Could not find MS Visual Studio: variable VS140COMNTOOLS is not defined!
+    exit 1
+) else if exist "%VS140COMNTOOLS%\..\IDE\devenv.exe" (
+    set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\devenv.exe"
+) else if exist "%VS140COMNTOOLS%\..\IDE\VCExpress.exe" (
+    set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\VCExpress.exe"
+) else (
+    echo "Could not find MS Visual Studio in %VS140COMNTOOLS%\..\IDE"
+    echo Check environment variable VS140COMNTOOLS!
+    exit 1
 )
+call "%VS140COMNTOOLS%..\Tools\vsvars32.bat"
 
-@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