ParaView 5.4.1 and dependencies support. Pascal Beckstein

Merge branch 'feature/paraFoam-5.4.1' into nextRelease
pasbec · Feb 27, 2018 · 2d33f8e · 2d33f8e
2 parents 077f219 + b5e9533
commit 2d33f8e
Show file tree

Hide file tree

Showing 108 changed files with 1,582 additions and 12,034 deletions.
diff --git a/ThirdParty/AllClean.stage1 b/ThirdParty/AllClean.stage1
@@ -51,21 +51,25 @@ echo ========================================
 echo
 
 # gmp
+uninstallPackage gmp-4.3.2 $1
 uninstallPackage gmp-5.0.1 $1
-uninstallPackage gmp-5.0.5 $1
+uninstallPackage gmp-5.1.2 $1
 
 # mpfr
+uninstallPackage mpfr-2.4.2 $1
+uninstallPackage mpfr-3.0.0 $1
 uninstallPackage mpfr-3.0.1 $1
-uninstallPackage mpfr-3.1.0 $1
+uninstallPackage mpfr-3.1.2 $1
 
 # mpc
 uninstallPackage mpc-0.8.2 $1
-uninstallPackage mpc-0.9   $1
+uninstallPackage mpc-1.0.1 $1
 
 # gcc
 uninstallPackage gcc-4.4.5 $1
 uninstallPackage gcc-4.5.1 $1
-uninstallPackage gcc-4.6.3 $1
+uninstallPackage gcc-4.6.4 $1
+uninstallPackage gcc-4.7.4 $1
 uninstallPackage gcc-4.8.4 $1
 uninstallPackage gcc-4.9.2 $1
 
@@ -79,14 +83,21 @@ uninstallPackage Python-2.7 $1
 uninstallPackage m4-1.4.16 $1
 
 # bison
-uninstallPackage bison-2.7 $1
+uninstallPackage bison-2.4.3 $1
+uninstallPackage bison-2.7   $1
 
 # flex
 uninstallPackage flex-2.5.35 $1
 
 # cmake
+uninstallPackage cmake-2.8.3  $1
+uninstallPackage cmake-2.8.5  $1
+uninstallPackage cmake-2.8.6  $1
+uninstallPackage cmake-2.8.8  $1
+uninstallPackage cmake-2.8.11 $1
 uninstallPackage cmake-2.8.12 $1
-uninstallPackage cmake-3.2.2 $1
+uninstallPackage cmake-3.2.2  $1
+uninstallPackage cmake-3.3.2  $1
 
 
 echo

diff --git a/ThirdParty/AllClean.stage4 b/ThirdParty/AllClean.stage4
@@ -51,13 +51,19 @@ echo ========================================
 echo
 
 # QT
-uninstallPackage qt-everywhere-opensource-src-4.8.6 $1
+uninstallPackage qt-everywhere-opensource-src-4.7.0 $1
 uninstallPackage qt-everywhere-opensource-src-4.7.4 $1
+uninstallPackage qt-everywhere-opensource-src-4.8.5 $1
+uninstallPackage qt-everywhere-opensource-src-4.8.6 $1
+uninstallPackage qt-everywhere-opensource-src-5.8.0 $1
 
 # ParaView
 uninstallPackage ParaView-4.0.1 $1
 uninstallPackage ParaView-4.1.0 $1
+uninstallPackage ParaView-4.2.0 $1
 uninstallPackage ParaView-4.3.1 $1
+uninstallPackage ParaView-4.4.0 $1
+uninstallPackage ParaView-5.4.1 $1
 
 # ParaView-Server
 uninstallPackage llvm-3.6.0

diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1
@@ -175,6 +175,13 @@ echo
     ( rpm_make -p cmake-3.2.2 -s cmake-3.2.2.spec -u http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz        )
 }
 
+# cmake 3.3.2
+#
+[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_332" ] && {
+    echo "Building cmake 3.3.2"
+    ( rpm_make -p cmake-3.3.2 -s cmake-3.3.2.spec -u http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz        )
+}
+
 echo ========================================
 echo Done ThirdParty AllMake: Stage1
 echo ========================================

diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4
@@ -65,6 +65,12 @@ then
 	echo "Building Qt 4.8.6"
 	( rpm_make -p qt-everywhere-opensource-src-4.8.6 -s qt-everywhere-opensource-src-4.8.6.spec -u http://download.qt.io/archive/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz )
     }
+    # Qt 5.8.0
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_QT_580" ] && {
+    echo "Building Qt 5.8.0"
+    ( rpm_make -p qt-everywhere-opensource-src-5.8.0 -s qt-everywhere-opensource-src-5.8.0.spec -u http://download.qt.io/archive/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.gz )
+    }
 else
     echo "Using system installed QT"
     echo ""
@@ -110,6 +116,14 @@ then
 		-f --define='_qmakePath $QT_BIN_DIR/qmake'
             )
         }
+        # ParaView 5.4.1
+        #
+        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_541" ] && {
+            echo "Building ParaView 5.4.1"
+            ( rpm_make -p ParaView-5.4.1 -s ParaView-5.4.1.spec -u http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz \
+        -f --define='_qmakePath $QT_BIN_DIR/qmake'
+            )
+        }
     else
         echo "WARNING: "
         echo "WARNING: Skipping the installation of ParaView-4.x.x."

diff --git a/ThirdParty/rpmBuild/SOURCES/ParaView-4.4.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParaView-4.4.0.patch_darwin
@@ -1,9 +1,9 @@
-diff -ruN ParaView-4.3.1_orig/Applications/ParaView-4.3.1_extra_install_Darwin.cmake ParaView-4.3.1/Applications/ParaView-4.3.1_extra_install_Darwin.cmake
---- ParaView-4.3.1_orig/Applications/ParaView-4.3.1_extra_install_Darwin.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ ParaView-4.3.1/Applications/ParaView-4.3.1_extra_install_Darwin.cmake	2013-10-02 19:00:00.000000000 -0400
+diff -ruN ParaView-4.4.0_orig/Applications/ParaView-4.4.0_extra_install_Darwin.cmake ParaView-4.4.0/Applications/ParaView-4.4.0_extra_install_Darwin.cmake
+--- ParaView-4.4.0_orig/Applications/ParaView-4.4.0_extra_install_Darwin.cmake	1969-12-31 19:00:00.000000000 -0500
++++ ParaView-4.4.0/Applications/ParaView-4.4.0_extra_install_Darwin.cmake	2013-10-02 19:00:00.000000000 -0400
 @@ -0,0 +1,8 @@
 +#
-+# Additional install rules for Mac OS X platforms 
++# Additional install rules for Mac OS X platforms
 +#
 +INSTALL (DIRECTORY buildObj/bin/paraview.app
 +           DESTINATION ${CMAKE_INSTALL_PREFIX}/bin

diff --git a/ThirdParty/rpmBuild/SOURCES/ParaView-5.4.1.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParaView-5.4.1.patch_darwin
@@ -0,0 +1,12 @@
+diff -ruN ParaView-5.4.1_orig/Applications/ParaView-5.4.1_extra_install_Darwin.cmake ParaView-5.4.1/Applications/ParaView-5.4.1_extra_install_Darwin.cmake
+--- ParaView-5.4.1_orig/Applications/ParaView-5.4.1_extra_install_Darwin.cmake	1969-12-31 19:00:00.000000000 -0500
++++ ParaView-5.4.1/Applications/ParaView-5.4.1_extra_install_Darwin.cmake	2013-10-02 19:00:00.000000000 -0400
+@@ -0,0 +1,8 @@
++#
++# Additional install rules for Mac OS X platforms
++#
++INSTALL (DIRECTORY buildObj/bin/paraview.app
++           DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++	   USE_SOURCE_PERMISSIONS
++           COMPONENT Runtime)
++