From ae1a17162df94f0e038fc0487d4ac09180e7e5c1 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 17 Jan 2022 15:29:39 +0100 Subject: [PATCH] update windows debug mode --- applications/SALOME-master-windows.pyconf | 11 ++++ products/Cython.pyconf | 1 + products/ParaView.pyconf | 10 ++-- products/compil_scripts/openVKL-0.11.0.bat | 68 ++++++++++++++++++++++ products/compil_scripts/psutil-5.7.2.bat | 34 +++++++++++ products/embree.pyconf | 6 +- products/llvm.pyconf | 17 ++++++ products/omniORB.pyconf | 5 ++ products/openVKL.pyconf | 11 ++++ products/psutil.pyconf | 11 ++++ products/rkCommon.pyconf | 9 +++ products/tbb.pyconf | 14 +++++ 12 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 products/compil_scripts/openVKL-0.11.0.bat create mode 100644 products/compil_scripts/psutil-5.7.2.bat diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 2f2548c..a1ee13d 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -192,4 +192,15 @@ APPLICATION : __overwrite__ : [ + { + __condition__ : "APPLICATION.debug == 'yes'" + 'APPLICATION.rm_products' : ['matplotlib'] + 'APPLICATION.products.numpy' : {tag: '1.16.4', base: 'no', section : 'version_1_16_4_win_dbg' } + 'APPLICATION.products.Cython' : {tag: '0.29.12', base: 'no', section : 'version_0_29_12_win_dbg' } + 'APPLICATION.products.sphinxintl' : {tag: '2.0.0', base: 'no', section : 'version_2_0_0_win_dbg' } + 'APPLICATION.products.llvm' : {tag: '8.0.1', base: 'no', section : 'version_8_0_1_clang_win_dbg'} + 'APPLICATION.products.tbb' : {tag: '2019_U8', base: 'no', section : 'version_2019_U8_win_dbg' } + 'APPLICATION.products.omniORB' : {tag: '4.2.3', base: 'no', section : 'version_4_2_3_win_dbg' } + 'APPLICATION.products.psutil' : {tag: '5.7.2', base: 'no', section : 'version_5_7_2_win_dbg' } + } ] diff --git a/products/Cython.pyconf b/products/Cython.pyconf index d1abce2..007d5fe 100755 --- a/products/Cython.pyconf +++ b/products/Cython.pyconf @@ -47,6 +47,7 @@ version_0_29_12_win_dbg : env_script : $name + ".py" } depend : ['Python', 'setuptools'] + opt_depend: ['psutil'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name properties: diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 22b27bc..00903ec 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -54,13 +54,13 @@ version_5_10_0_win : 'boost', 'libxml2', 'freetype', - 'matplotlib', 'cgns', 'Pygments', 'pthreads', 'zlib' ] - patches : ['paraview.0003-ParaViewClient.patch', + opt_depend: ['matplotlib'] + patches : ['paraview.0003-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0006-ParaView_find_libxml2.patch', 'paraview.0007-ParaView_find_freetype.patch', @@ -111,12 +111,12 @@ version_5_9_1_win : 'boost', 'libxml2', 'freetype', - 'matplotlib', 'cgns', 'Pygments', 'pthreads', 'zlib' ] + opt_depend: ['matplotlib'] # in debug mode, do not build this product patches : ['paraview.0003-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', @@ -199,12 +199,12 @@ version_5_9_0_win : 'boost', 'libxml2', 'freetype', - 'matplotlib', 'cgns', 'Pygments', 'pthreads', 'zlib' ] + opt_depend: ['matplotlib'] # in debug mode, do not build this product patches : ['paraview.0003-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', @@ -231,12 +231,12 @@ version_5_9_0_win_int32 : 'boost', 'libxml2', 'freetype', - 'matplotlib', 'cgns', 'Pygments', 'pthreads', 'zlib' ] + opt_depend: ['matplotlib'] # in debug mode, do not build this product patches : ['paraview.0003-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat new file mode 100644 index 0000000..524ffbd --- /dev/null +++ b/products/compil_scripts/openVKL-0.11.0.bat @@ -0,0 +1,68 @@ +@echo off + +echo ########################################################################## +echo openVKL %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +SET PRODUCT_BUILD_TYPE=Release +REM Building openVKL in DEBUG mode is definitely not relevant. +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + + +SET CMAKE_OPTIONS= +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" +cd %BUILD_DIR% + +echo. +echo -------------------------------------------------------------------------- +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +echo -------------------------------------------------------------------------- + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on CMake + exit 1 +) + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% INSTALL.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% INSTALL.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +taskkill /F /IM "mspdbsrv.exe" + +echo. +echo ########## END diff --git a/products/compil_scripts/psutil-5.7.2.bat b/products/compil_scripts/psutil-5.7.2.bat new file mode 100644 index 0000000..f980aca --- /dev/null +++ b/products/compil_scripts/psutil-5.7.2.bat @@ -0,0 +1,34 @@ +@echo off + +echo ########################################################################## +echo psutil %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR% +mkdir %PRODUCT_INSTALL%\Lib\site-packages +set PATH=%CWD%\bin;%PATH% +set PYTHONPATH=%PYTHONPATH%;%PRODUCT_INSTALL%\Lib\site-packages + +echo. +echo *** +%PYTHONBIN% setup.py build --debug install --prefix=%PRODUCT_INSTALL% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on psutil running %PYTHONBIN% setup.py build --debug install --prefix=%PRODUCT_INSTALL% + exit 1 +) +echo. +echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt +echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt + +echo. +echo ########## END diff --git a/products/embree.pyconf b/products/embree.pyconf index 9cc7dab..6b8510f 100644 --- a/products/embree.pyconf +++ b/products/embree.pyconf @@ -22,5 +22,9 @@ default_win : { cmake_options : ' -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TUTORIALS=OFF -DEMBREE_TASKING_SYSTEM=TBB -DTBB_ROOT=%TBB_DIR:\=/% ' depend : ['ispc','tbb'] + properties : + { + incremental : "yes" + single_install_dir: "yes" + } } - diff --git a/products/llvm.pyconf b/products/llvm.pyconf index e99bc55..ded0adf 100644 --- a/products/llvm.pyconf +++ b/products/llvm.pyconf @@ -51,3 +51,20 @@ version_8_0_1_clang_win : } patches : [] } + +version_8_0_1_clang_win_dbg : +{ + build_source : "script" + compil_script: "llvm-8.0.1.bat" + depend : [ 'Python' ] + archive_info: + { + archive_name : "llvm-8.0.1-clang.tar.gz" + } + properties: + { + incremental : "yes" + compile_time : "yes" + } + patches : [] +} diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf index a973fbd..1be9786 100644 --- a/products/omniORB.pyconf +++ b/products/omniORB.pyconf @@ -18,3 +18,8 @@ default : } patches : [] } + +version_4_2_3_win_dbg: +{ + patches: ['omniORB-4.2.3-windows-debug.patch'] +} diff --git a/products/openVKL.pyconf b/products/openVKL.pyconf index c797092..f1143f4 100644 --- a/products/openVKL.pyconf +++ b/products/openVKL.pyconf @@ -18,3 +18,14 @@ default : incremental : "yes" } } + +default_win: +{ + build_source : "cmake" + cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%" + properties : + { + incremental : "yes" + single_install_dir : "yes" + } +} diff --git a/products/psutil.pyconf b/products/psutil.pyconf index 344e3cf..0e40e1c 100755 --- a/products/psutil.pyconf +++ b/products/psutil.pyconf @@ -31,3 +31,14 @@ default_win : compil_script : 'pip_install_whl' + $VARS.scriptExtension archive_info : {archive_name : "psutil-" + $APPLICATION.products.psutil + "_windows.tar.gz"} } + + +version_5_7_2_win_dbg: +{ + compil_script: "psutil-5.7.2.bat" + properties: + { + incremental : "yes" + pip : "no" + } +} diff --git a/products/rkCommon.pyconf b/products/rkCommon.pyconf index a31ed48..2cb8ab0 100644 --- a/products/rkCommon.pyconf +++ b/products/rkCommon.pyconf @@ -18,3 +18,12 @@ default : incremental : "yes" } } + +default_win : +{ + properties : + { + incremental : "yes" + single_install_dir : "yes" + } +} diff --git a/products/tbb.pyconf b/products/tbb.pyconf index f9cf2b5..4181c5c 100644 --- a/products/tbb.pyconf +++ b/products/tbb.pyconf @@ -41,3 +41,17 @@ version_2019_U8_win : single_install_dir : "yes" } } + +version_2019_U8_win_dbg : +{ + archive_info : {archive_name : "tbb-2019_U8.tar.gz"} + patches : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_debug.patch'] + depend : ['Python'] + opt_depend : ['ispc'] + build_depend : ['swig'] + properties : + { + incremental : "yes" + single_install_dir : "yes" + } +} -- 2.39.2