From 710953bd812794b06c1ac2e66edef2d2b028c8e8 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 6 May 2024 15:46:31 +0200 Subject: [PATCH] OCCT 7.8.0: windows build: stlgeom.hpp needs to be copied to install from sources --- products/compil_scripts/CAS_7.8.bat | 6 ++-- products/compil_scripts/netgen_5_3_1.bat | 43 ++++++++++++++---------- products/netgen.pyconf | 3 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/products/compil_scripts/CAS_7.8.bat b/products/compil_scripts/CAS_7.8.bat index 5fff230..e2bc014 100644 --- a/products/compil_scripts/CAS_7.8.bat +++ b/products/compil_scripts/CAS_7.8.bat @@ -89,9 +89,9 @@ echo ********************************************************************* echo *** installation (data)... echo ********************************************************************* echo. -robocopy %SOURCE_DIR%\data %PRODUCT_INSTALL%\data /E /NP /NFL /NDL /NS /NC -if NOT %ERRORLEVEL% == 1 ( - echo ERROR when copying %SOURCE_DIR%\data +xcopy /Q /R /Y /E /H /I %SOURCE_DIR%\data %PRODUCT_INSTALL%\data +if NOT %ERRORLEVEL% == 0 ( + echo ERROR when copying %SOURCE_DIR%\data to %PRODUCT_INSTALL%\data exit 1 ) diff --git a/products/compil_scripts/netgen_5_3_1.bat b/products/compil_scripts/netgen_5_3_1.bat index e0a1011..4c416e1 100755 --- a/products/compil_scripts/netgen_5_3_1.bat +++ b/products/compil_scripts/netgen_5_3_1.bat @@ -70,86 +70,93 @@ echo -------------------------------------------------------------------------- echo *** Installation into %PRODUCT_INSTALL% echo -------------------------------------------------------------------------- -robocopy nglib\%PRODUCT_BUILD_TYPE% %PRODUCT_INSTALL%\bin "*.exe" /E /NP /NFL /NDL /NS /NC -if NOT %ERRORLEVEL% == 1 ( +copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.exe %PRODUCT_INSTALL%\bin\ +if NOT %ERRORLEVEL% == 0 ( echo ERROR on install executables exit 3 ) -robocopy nglib\%PRODUCT_BUILD_TYPE% %PRODUCT_INSTALL%\lib "*.lib" "*.dll" /E /NP /NFL /NDL /NS /NC -if NOT %ERRORLEVEL% == 1 ( - echo ERROR on install libraries +copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\lib\ +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on install static libraries + exit 4 +) + +copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\lib\ +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on install dynamic libraries exit 4 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\meshing\*.h* %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\meshing\*.h* %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install meshing includes exit 5 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\gprim\*.h* %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\gprim\*.h* %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install gprim includes exit 6 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\general\*.h* %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\general\*.h* %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install general includes exit 7 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\linalg\*.h* %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\linalg\*.h* %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install linalg includes exit 8 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\occ\*.h* %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\occ\*.h* %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install occ includes exit 9 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\mydefs.hpp %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\mydefs.hpp %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install mydefs.hpp exit 10 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\mystdlib.h %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\mystdlib.h %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install mystdlib.h exit 11 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\nginterface.h %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\nginterface.h %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install nginterface.h exit 12 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\nginterface_V2.hpp %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\nginterface_V2.hpp %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install nginterface_V2.hpp exit 13 ) -xcopy /q /r /Y %SOURCE_DIR%\nglib\nglib.h %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\nglib\nglib.h %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install nglib.h exit 14 ) -xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\stlgeom.hpp %PRODUCT_INSTALL%\include +xcopy /Q /R /Y %SOURCE_DIR%\libsrc\stlgeom\stlgeom.hpp %PRODUCT_INSTALL%\include if NOT %ERRORLEVEL% == 0 ( echo ERROR on install stlgeom exit 15 ) -robocopy %SOURCE_DIR%\cmake %PRODUCT_INSTALL%\cmake "*.cmake" /E /NP /NFL /NDL /NS /NC -if NOT %ERRORLEVEL% == 1 ( +xcopy /Q /R /Y %SOURCE_DIR%\cmake\*.cmake %PRODUCT_INSTALL%\cmake +if NOT %ERRORLEVEL% == 0 ( echo ERROR on install cmake files exit 16 ) + taskkill /F /IM "mspdbsrv.exe" diff --git a/products/netgen.pyconf b/products/netgen.pyconf index a45a43d..987591e 100644 --- a/products/netgen.pyconf +++ b/products/netgen.pyconf @@ -62,11 +62,12 @@ version_5_3_1_with_CAS_7_8 : version_5_3_1_with_CAS_7_8_win : { archive_info : {archive_name : "netgen-5.3.1.tar.gz"} + compil_script : 'netgen_5_3_1.bat' patches : ['netgen53ForSalomeOCCT730.patch','netgen53ForWindowsOCC780.patch','netgen53ForSalomeVisualStudio2017.patch','netgen5.3_withOCCT780_win.patch'] properties : { incremental : "yes" - single_install_dir : "no" + single_install_dir : "yes" } } -- 2.39.2