X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=env_Salome.bat;h=1fa82488b0b4598876337268699a7ee9b9d4d817;hb=refs%2Ftlpr%2F42%2Fhead;hp=2a7d7a437062fc4d15cda83f4823418e3d72218e;hpb=d31b2834853f65576fceedcb8dd2ee8fd94d65a0;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index 2a7d7a437..1fa82488b 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..
@@ -18,32 +16,33 @@ if "%SALOME_ROOT_DIR%" == "" (
   set SALOME_ROOT_DIR=%ROOT_DIR%\SALOME
 )
 
-if "%SOLVESPACE_ROOT_DIR%" == "" (
-  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.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%
+
+if "%2" == "run" (
+  call "%PDIR%\env_launch.bat"
+) else (
+  call "%PDIR%\env_compile.bat"
+)
+
+cd /d %ROOT_DIR%
 
 @REM -------------------------
 @REM Python
@@ -53,8 +52,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 +77,38 @@ 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.
-  )
+@SET VC_VERSION_SHORT=15
+for /f "tokens=1,2*" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "%VC_VERSION_SHORT%.0" 2^>nul') do set "VSPATH=%%c"
+IF NOT EXIST "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" GOTO ERROR1
+
+if exist "%VSPATH%\Common7\IDE\devenv.exe"  (
+  SET msvc_exe=devenv
+) else if exist "%VSPATH%\Common7\IDE\VCExpress.exe"  (
+  SET msvc_exe=VCExpress
+) else (
+  GOTO ERROR1
 )
+call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 > NUL
 
-@SET SHAPER_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
+
+goto END
+
+:ERROR1
+ECHO "Visual Studio environment file is not found."
 
-@SET LightAppConfig=%%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
-@SET SHAPERResources=%SHAPER_ROOT_DIR%\resources
+:END