From e8f73c6d814f79d2abd932bef81f7b31eb0662b6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 30 Sep 2022 15:20:46 +0200 Subject: [PATCH] Paraview 5.11 Windows build script --- applications/SALOME-master-windows.pyconf | 3 +- products/ParaView.pyconf | 31 +++------------------ products/compil_scripts/ParaView-5.11.0.bat | 2 +- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 55eb223..6e9dcce 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -92,8 +92,7 @@ APPLICATION : openturns: '1.19' ospray : '2.4.0' packaging : '19.0' - ParaView : {tag:'08c5d057a8', base: 'no', section: 'version_5_11_0'} - ParaView : '5.9.0' + ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} perl : '5.28.1.1' Pillow : '7.1.1' planegcs : '0.18-3cb6890' diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 8baf85b..b1d1eab 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -87,19 +87,8 @@ version_5_11_0_win : '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' + patches : ['paraview-5.11.0.p001-FindCGNS.patch', + 'paraview-5.11.0.p002-FindMPI.patch' ] } @@ -120,20 +109,8 @@ version_5_11_0_win_dbg : '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-5.9.0-vs-debug.patch' + patches : ['paraview-5.11.0.p001-FindCGNS.patch', + 'paraview-5.11.0.p002-FindMPI.patch' ] } diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat index 9ca556e..48872b6 100644 --- a/products/compil_scripts/ParaView-5.11.0.bat +++ b/products/compil_scripts/ParaView-5.11.0.bat @@ -18,7 +18,7 @@ if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) -set PVLIBVERSION=5.9 +set PVLIBVERSION=5.11 set python_name=python%PYTHON_VERSION% -- 2.39.2