From 7fc0434a95f0c34fd5f76d256337f28f5dab408f Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 19 Apr 2022 10:32:12 +0200 Subject: [PATCH] windows: paraview/salome in debug mode --- applications/SALOME-master-windows.pyconf | 1 + products/ParaView.pyconf | 35 +++++++++++++++++++ products/compil_scripts/ParaView-5.9.0.bat | 8 +++-- products/compil_scripts/zlib-1.2.5.bat | 9 +++-- .../patches/paraview-5.9.0-vs-debug.patch | 17 +++++++++ 5 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 products/patches/paraview-5.9.0-vs-debug.patch diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index d623b49..cbad8dd 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -207,5 +207,6 @@ __overwrite__ : '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' } + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section : 'version_5_9_0_win_dbg' } } ] diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 101c11e..a381b04 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -222,6 +222,41 @@ version_5_9_0_win : ] } +version_5_9_0_win_dbg : +{ + compil_script : 'ParaView-5.9.0.bat' + archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"} + depend : [ + 'Python', + 'hdf5', + 'qt', + 'boost', + 'libxml2', + 'freetype', + 'cgns', + 'Pygments', + 'pthreads', + 'zlib' + ] + opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib'] + patches : ['paraview.0003-ParaViewClient.patch', + 'paraview.0004-ParaView_hdf5.patch', + 'paraview.0005-ParaView_find_cgns.patch', + 'paraview.0006-ParaView_find_libxml2.patch', + 'paraview.0007-ParaView_find_freetype.patch', + 'paraview.0009-ParaView_find_zlib.patch', + 'paraview.0010-ParaView_CATALYST_cmake.patch', + 'paraview.1001-ParaView_windows_catalyst_cmake.patch', + 'paraview.0008-ParaView_coincident_rendering.patch', + 'paraview.0011-ParaView_protobuf_crash.patch', + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', + 'paraview-5.9.0-vs-debug.patch' + ] +} + version_5_9_0_MPI : { compil_script : 'ParaView-5.9.0.sh' diff --git a/products/compil_scripts/ParaView-5.9.0.bat b/products/compil_scripts/ParaView-5.9.0.bat index 5abfee3..9ca556e 100644 --- a/products/compil_scripts/ParaView-5.9.0.bat +++ b/products/compil_scripts/ParaView-5.9.0.bat @@ -80,11 +80,13 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF REM Python settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_PYTHON:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_WRAP_PYTHON:BOOL=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_INCLUDE_DIR:STRING=%PYTHON_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_EXECUTABLE:FILEPATH=%PYTHON_ROOT_DIR:\=/%/python3.exe +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_INCLUDE_DIR:FILEPATH=%PYTHON_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRAY_DIRS=%PYTHON_ROOT_DIR:\=/%/libs if %SAT_DEBUG% == 0 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:FILEPATH=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib ) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%_d.lib + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:FILEPATH=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%_d.lib ) set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_NO_PYTHON_THREADS:BOOL=OFF diff --git a/products/compil_scripts/zlib-1.2.5.bat b/products/compil_scripts/zlib-1.2.5.bat index cf5a3c4..a1b42aa 100644 --- a/products/compil_scripts/zlib-1.2.5.bat +++ b/products/compil_scripts/zlib-1.2.5.bat @@ -55,13 +55,13 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj" +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj echo ********************************************************************* echo. msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild gmsh.vcxproj + echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 ) @@ -77,5 +77,10 @@ if NOT %ERRORLEVEL% == 0 ( exit 3 ) +if %SAT_DEBUG% == 1 ( + copy /Y /B %PRODUCT_INSTALL%\lib\zlibd.lib %PRODUCT_INSTALL%\lib\zlib.lib + copy /Y /B %PRODUCT_INSTALL%\bin\zlibd1.dll %PRODUCT_INSTALL%\bin\zlib1.dll +) +if echo. echo ########## END diff --git a/products/patches/paraview-5.9.0-vs-debug.patch b/products/patches/paraview-5.9.0-vs-debug.patch new file mode 100644 index 0000000..91af04b --- /dev/null +++ b/products/patches/paraview-5.9.0-vs-debug.patch @@ -0,0 +1,17 @@ +--- paraview-5.9.0_ref/VTK/Utilities/Python/vtkPython.h 2022-04-19 10:11:34.466378625 +0200 ++++ paraview-5.9.0_new/VTK/Utilities/Python/vtkPython.h 2022-04-19 10:13:54.217617713 +0200 +@@ -76,8 +76,12 @@ + #define HAVE_ROUND 1 + #endif + +-#include +- ++//#include ++#ifdef VTK_PYTHON_UNDEF_DEBUG ++ #define _DEBUG 1 ++ #include ++ #undef _DEBUG ++#endif + #if defined(_MSC_VER) && _MSC_VER >= 1800 + #undef HAVE_ROUND + #endif -- 2.39.2