Move to the newest SALOME version

diff --git a/build_Salome_deb.bat b/build_Salome_deb.bat
index 9ab127ec1e7cc685cd7fcb985e6fca501a35e8e1..985249431aff37db10550c3ed6a8d71beb7c8dcc 100644 (file)
--- a/build_Salome_deb.bat
+++ b/build_Salome_deb.bat
@@ -15,6 +15,6 @@ mkdir %ROOT_DIR%\build
 cd %ROOT_DIR%\build
 
 REM Add -DADD_MODELS_TESTS=TRUE to enable test models
-cmake %SRC_DIR% -G "Visual Studio 14 Win64" -DPYTHON_EXECUTABLE=%PYTHONHOME%\python_d.exe -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
+cmake %SRC_DIR% -G "Visual Studio 15 Win64" -DPYTHON_EXECUTABLE=%PYTHONHOME%\python_d.exe -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
 
 start "" %MSVC_EXE% SHAPER.sln

diff --git a/env.sh b/env.sh
index 1b7c6dadab916a1003e722085627c844e3be2174..cdaec7021c072d3b3b43c3534d669b49cae1535e 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-export SALOME_DIR=/dn46/SALOME/series9x/current-2020-02-03
+export SALOME_DIR=/dn46/SALOME/series9x/current-2020-02-26
 
 # Path to sources
 export SOURCES_DIR=$(pwd)

diff --git a/env_Salome.bat b/env_Salome.bat
index c10acdb0c2bd2de6df116e5a47c388fa8b6e0049..77b338f1c9a18e8932066d9160e4229349208349 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -16,11 +16,6 @@ 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=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.18
 )
@@ -41,7 +36,7 @@ if "%BOOST_ROOT_DIR%" == "" (
 cd /d %SALOME_ROOT_DIR%\WORK
 call set_env.bat %1
 
-if %2 == run (
+if "%2" == run (
   call "%PDIR%\env_launch.bat"
 ) else (
   call "%PDIR%\env_compile.bat"
@@ -91,19 +86,19 @@ cd /d %ROOT_DIR%
 
 @SET _NO_DEBUG_HEAP=1
 
-if "%VS140COMNTOOLS%" == "" (
-    echo Could not find MS Visual Studio: variable VS140COMNTOOLS is not defined!
+if "%VS150COMNTOOLS%" == "" (
+    echo Could not find MS Visual Studio: variable VS150COMNTOOLS 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 if exist "%VS150COMNTOOLS%\..\IDE\devenv.exe" (
+    set MSVC_EXE="%VS150COMNTOOLS%\..\IDE\devenv.exe"
+) else if exist "%VS150COMNTOOLS%\..\IDE\VCExpress.exe" (
+    set MSVC_EXE="%VS150COMNTOOLS%\..\IDE\VCExpress.exe"
 ) else (
-    echo "Could not find MS Visual Studio in %VS140COMNTOOLS%\..\IDE"
-    echo Check environment variable VS140COMNTOOLS!
+    echo "Could not find MS Visual Studio in %VS150COMNTOOLS%\..\IDE"
+    echo Check environment variable VS150COMNTOOLS!
     exit 1
 )
-call "%VS140COMNTOOLS%..\Tools\vsvars32.bat"
+call "%VS150COMNTOOLS%..\Tools\vsvars32.bat"
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%