merge from master

[tools/sat_salome.git] / products / compil_scripts / MeshGems.bat

diff --git a/products/compil_scripts/MeshGems.bat b/products/compil_scripts/MeshGems.bat
index 5d76b6f4de40d332cd38ab2e0b97897f69f9888c..82ea574c9f7c663a91c3e942f12020923f6adfbd 100755 (executable)
--- a/products/compil_scripts/MeshGems.bat
+++ b/products/compil_scripts/MeshGems.bat
@@ -8,6 +8,7 @@ if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin\r
 if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib\r
 if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include\r
+if NOT exist "%PRODUCT_INSTALL%\Docs" mkdir %PRODUCT_INSTALL%\Docs\r
 \r
 REM clean BUILD directory\r
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%\r
@@ -15,37 +16,50 @@ mkdir %BUILD_DIR%
 \r
 cd %SOURCE_DIR%\r
 \r
-set SRC_FOLDER=Win7_64_VC14\r
-\r
+set SRC_FOLDER_VC14=Win7_64_VC14\r
+set SRC_FOLDER_VC15=Win7_64_VC15\r
 cd DISTENE\MeshGems-*\Products\r
 \r
-echo SRC_FOLDER = %SRC_FOLDER%\r
 echo PRODUCT_INSTALL = %PRODUCT_INSTALL%\r
 \r
-rem ## Includes\r
-xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q\r
+REM\r
+xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q /Y\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on copying include\r
     exit 1\r
 )\r
 \r
-rem ## Lib\r
+REM\r
+set SRC_FOLDER=%SRC_FOLDER_VC15%\r
+if exist "lib\%SRC_FOLDER_VC14%" (\r
+   set SRC_FOLDER=%SRC_FOLDER_VC14%\r
+)\r
+\r
+echo SRC_FOLDER = %SRC_FOLDER%\r
 echo. \r
-echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q\r
-xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q\r
+echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y\r
+xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on copying lib\r
     exit 2\r
 )\r
 \r
-rem ## Bin\r
+REM\r
 echo. \r
-echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q\r
-xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q\r
+echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y\r
+xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on copying bin\r
     exit 3\r
 )\r
 \r
+REM\r
+echo.\r
+xcopy Docs\* %PRODUCT_INSTALL%\Docs /E /I /Q /Y\r
+if NOT %ERRORLEVEL% == 0 (\r
+    echo ERROR on copying Docs\r
+    exit 4\r
+)\r
+\r
 echo.\r
 echo ########## END\r