From d3b269b7c6ffa0cd68845adfecdfb849316dba71 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sat, 31 May 2014 20:26:57 -0700 Subject: [PATCH] ThirdParty apckages: Various adjustments. - Add spec file for bison-2.7. Switch to this version - Modify patch file for ParMGridGen-1.0 so we no longer need to bother with gmake - Updated Ubuntu 14.04 build instructions - Added missing ThirdParty packages configuration for settings.csh - Replaced occurences of string 'OpenFOAM' for 'foam-extend' in various files --- ThirdParty/AllClean | 2 +- ThirdParty/AllClean.stage1 | 2 +- ThirdParty/AllClean.stage2 | 2 +- ThirdParty/AllClean.stage3 | 2 +- ThirdParty/AllClean.stage4 | 2 +- ThirdParty/AllClean.stage5 | 2 +- ThirdParty/AllClean.stage6 | 2 +- ThirdParty/AllMake | 4 +- ThirdParty/AllMake.post | 4 +- ThirdParty/AllMake.pre | 2 +- ThirdParty/AllMake.stage0 | 2 +- ThirdParty/AllMake.stage1 | 10 +- ThirdParty/AllMake.stage2 | 8 +- ThirdParty/AllMake.stage3 | 4 +- ThirdParty/AllMake.stage4 | 8 +- ThirdParty/AllMake.stage5 | 8 +- ThirdParty/AllMake.stage6 | 4 +- .../LocalDev/Hydro-Quebec/PyFoam/AllMake | 4 +- ThirdParty/README.ThirdParty | 17 +- .../rpmBuild/SOURCES/ParMGridGen-1.0.patch | 24 ++- .../rpmBuild/SPECS/ParMGridGen-1.0.spec | 8 +- ThirdParty/rpmBuild/SPECS/ParMetis-3.1.1.spec | 8 +- .../rpmBuild/SPECS/ParaView-3.10.1.spec | 8 +- .../rpmBuild/SPECS/ParaView-3.12.0.spec | 8 +- .../rpmBuild/SPECS/ParaView-3.14.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/ParaView-4.0.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.5.6.spec | 14 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.5.7.spec | 14 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec | 14 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec | 14 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec | 14 +- ThirdParty/rpmBuild/SPECS/Python-2.7.spec | 8 +- ThirdParty/rpmBuild/SPECS/bison-2.4.3.spec | 8 +- ThirdParty/rpmBuild/SPECS/bison-2.7.spec | 154 ++++++++++++++++++ ThirdParty/rpmBuild/SPECS/cmake-2.8.11.spec | 8 +- ThirdParty/rpmBuild/SPECS/cmake-2.8.12.spec | 8 +- ThirdParty/rpmBuild/SPECS/cmake-2.8.3.spec | 8 +- ThirdParty/rpmBuild/SPECS/cmake-2.8.5.spec | 8 +- ThirdParty/rpmBuild/SPECS/cmake-2.8.6.spec | 8 +- ThirdParty/rpmBuild/SPECS/cmake-2.8.8.spec | 8 +- ThirdParty/rpmBuild/SPECS/flex-2.5.35.spec | 8 +- ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec | 8 +- ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/gcc-4.6.4.spec | 29 ++-- ThirdParty/rpmBuild/SPECS/gmp-5.0.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/gmp-5.1.2.spec | 29 ++-- ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/hwloc-1.7.2.spec | 8 +- ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/m4-1.4.16.spec | 8 +- ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec | 8 +- ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec | 8 +- ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec | 8 +- ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec | 8 +- ThirdParty/rpmBuild/SPECS/mpc-1.0.1.spec | 29 ++-- ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec | 8 +- ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/mpfr-3.1.2.spec | 29 ++-- ThirdParty/rpmBuild/SPECS/openmpi-1.4.1.spec | 8 +- ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec | 12 +- ThirdParty/rpmBuild/SPECS/openmpi-1.5.spec | 12 +- ThirdParty/rpmBuild/SPECS/openmpi-1.6.3.spec | 12 +- ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec | 12 +- ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec | 8 +- .../qt-everywhere-opensource-src-4.7.0.spec | 8 +- .../qt-everywhere-opensource-src-4.7.4.spec | 8 +- .../qt-everywhere-opensource-src-4.8.5.spec | 8 +- ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec | 8 +- ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec | 8 +- ThirdParty/rpmBuild/SPECS/zoltan-3.5.spec | 8 +- ThirdParty/rpmBuild/SPECS/zoltan-3.6.spec | 8 +- doc/buildInstructions/Ubuntu/Ubuntu_14.04 | 47 +++++- etc/settings.csh | 24 +++ etc/settings.sh | 4 +- 75 files changed, 547 insertions(+), 333 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/bison-2.7.spec diff --git a/ThirdParty/AllClean b/ThirdParty/AllClean index 6d74115c6..f3c7feb8c 100755 --- a/ThirdParty/AllClean +++ b/ThirdParty/AllClean @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage1 b/ThirdParty/AllClean.stage1 index ea0928a1c..100c76ec5 100755 --- a/ThirdParty/AllClean.stage1 +++ b/ThirdParty/AllClean.stage1 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage2 b/ThirdParty/AllClean.stage2 index 4efd635da..8f0a5f8e3 100755 --- a/ThirdParty/AllClean.stage2 +++ b/ThirdParty/AllClean.stage2 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage3 b/ThirdParty/AllClean.stage3 index 1e8a39f89..bacfe5d66 100755 --- a/ThirdParty/AllClean.stage3 +++ b/ThirdParty/AllClean.stage3 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage4 b/ThirdParty/AllClean.stage4 index 221982516..987df8a64 100755 --- a/ThirdParty/AllClean.stage4 +++ b/ThirdParty/AllClean.stage4 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage5 b/ThirdParty/AllClean.stage5 index 01705c7a6..1eac91dd1 100755 --- a/ThirdParty/AllClean.stage5 +++ b/ThirdParty/AllClean.stage5 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllClean.stage6 b/ThirdParty/AllClean.stage6 index 33afc8a9a..beddcab8c 100755 --- a/ThirdParty/AllClean.stage6 +++ b/ThirdParty/AllClean.stage6 @@ -38,7 +38,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllMake b/ThirdParty/AllMake index a736311af..48f14a41c 100755 --- a/ThirdParty/AllMake +++ b/ThirdParty/AllMake @@ -42,7 +42,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM @@ -73,7 +73,7 @@ echo # Running stage 5 # This stage depends on a properly compiled installation -# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext, +# of foam-extend. On a brand new installation of foam-extend-3.0 # this stage should be called last in your compilation process ./AllMake.stage5 diff --git a/ThirdParty/AllMake.post b/ThirdParty/AllMake.post index 111646732..f17ea6b09 100755 --- a/ThirdParty/AllMake.post +++ b/ThirdParty/AllMake.post @@ -43,7 +43,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM @@ -56,7 +56,7 @@ echo # Running stage 5 # This stage depends on a properly compiled installation -# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext, +# of foam-extend. On a brand new installation of foam-extend-3.0, # this stage should be called last in your compilation process ./AllMake.stage5 diff --git a/ThirdParty/AllMake.pre b/ThirdParty/AllMake.pre index 4700b5d12..cebcc2a6f 100755 --- a/ThirdParty/AllMake.pre +++ b/ThirdParty/AllMake.pre @@ -43,7 +43,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllMake.stage0 b/ThirdParty/AllMake.stage0 index f867f4553..0b795382b 100755 --- a/ThirdParty/AllMake.stage0 +++ b/ThirdParty/AllMake.stage0 @@ -46,7 +46,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1 index 334f09131..c17f636ef 100755 --- a/ThirdParty/AllMake.stage1 +++ b/ThirdParty/AllMake.stage1 @@ -31,13 +31,13 @@ # Compilers and basic tools. # # Once this stage is built, you would normally re-initialize your -# OpenFOAM environment in order to use the new compilers and tools +# foam-extend environment in order to use the new compilers and tools # # NOTE: This stage is optional. Use it only if you want to override # your system pre-installed compilers and tools # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized +# 1: Your foam-extend environment must be properly initialized # # Author: # Martin Beaudoin, Hydro-Quebec, (2010) @@ -49,7 +49,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM @@ -87,13 +87,13 @@ echo #( rpm_make -p m4-1.4.16 -s m4-1.4.16.spec -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz ) # bison -#( rpm_make -p bison-2.4.3 -s bison-2.4.3.spec -u http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz ) +( rpm_make -p bison-2.7 -s bison-2.7.spec -u http://ftp.gnu.org/gnu/bison/bison-2.7.tar.gz ) # flex #( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz ) # cmake -( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz ) +#( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz ) echo ======================================== echo Done ThirdParty AllMake: Stage1 diff --git a/ThirdParty/AllMake.stage2 b/ThirdParty/AllMake.stage2 index 34dfc56ae..61784adcf 100755 --- a/ThirdParty/AllMake.stage2 +++ b/ThirdParty/AllMake.stage2 @@ -31,14 +31,14 @@ # Communication libraries # # Once this stage is built, you would normally re-initialize your -# OpenFOAM environment in order redirect OpenFOAM toward the appropriate -# communication library +# foam-extend environment in order redirect foam-extend toward the +# appropriate communication library # # NOTE: This stage is optional. Use it only if you want to override # your system communication libraries # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized +# 1: Your foam-extend environment must be properly initialized # 2: AllMake.stage1 if you are overriding your system compiler # # Author: @@ -51,7 +51,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 05e03f9ce..72eec03e0 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -31,7 +31,7 @@ # The ThirdParty libraries # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized +# 1: Your foam-extend environment must be properly initialized # 2: AllMake.stage1 if you are overriding your system compiler # 3: AllMake.stage2 if you are overriding your system comm. libraries # @@ -45,7 +45,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4 index d222d5ff5..de2bb8e1e 100755 --- a/ThirdParty/AllMake.stage4 +++ b/ThirdParty/AllMake.stage4 @@ -26,12 +26,12 @@ # AllMake.stage4 # # Description -# Build script for ThirdParty packages: Stage3 +# Build script for ThirdParty packages: Stage4 # -# The OpenFOAM viewers +# The foam-extend viewers # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized +# 1: Your foam-extend environment must be properly initialized # 2: AllMake.stage1 if you are overriding your system compiler # 3: AllMake.stage2 if you are overriding your system comm. libraries # @@ -45,7 +45,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } . tools/makeThirdPartyFunctionsForRPM diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5 index 11f150621..e7284071d 100755 --- a/ThirdParty/AllMake.stage5 +++ b/ThirdParty/AllMake.stage5 @@ -30,9 +30,9 @@ # # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized -# 2: OpenFOAM must already been compiled because swak4Foam depends on -# OpenFOAM include files and libraries +# 1: Your foam-extend environment must be properly initialized +# 2: foam-extend must already been compiled because swak4Foam depends on +# foam-extend include files and libraries # # Author: # Martin Beaudoin, Hydro-Quebec, (2012) @@ -44,7 +44,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } diff --git a/ThirdParty/AllMake.stage6 b/ThirdParty/AllMake.stage6 index e40189d90..e1629e148 100755 --- a/ThirdParty/AllMake.stage6 +++ b/ThirdParty/AllMake.stage6 @@ -30,7 +30,7 @@ # # # Requirements: -# 1: Your OpenFOAM environment must be properly initialized +# 1: Your foam-extend environment must be properly initialized # # Author: # Martin Beaudoin, Hydro-Quebec, (2012) @@ -42,7 +42,7 @@ cd ${0%/*} || exit 1 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo " The environment variables are inconsistent with the installation." - echo " Check the OpenFOAM entries in your dot-files and source them." + echo " Check the foam-extend entries in your dot-files and source them." exit 1 } diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake index 64fea2baf..c2b91b106 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake @@ -44,8 +44,8 @@ if [ -z "$PYFOAM_DIR" ] then echo "Error: Missing environment variable \$PYFOAM_DIR." echo " Please execute the script ThirdParty/AllMake.stage5 to install PyFoam." - echo " Then, make sure to freshen your OpenFOAM environment by sourcing your main" - echo " OpenFOAM configuration file." + echo " Then, make sure to freshen your foam-extend environment by sourcing your main" + echo " foam-extend configuration file." exit -1 fi diff --git a/ThirdParty/README.ThirdParty b/ThirdParty/README.ThirdParty index 4381be5e7..18c9833ef 100644 --- a/ThirdParty/README.ThirdParty +++ b/ThirdParty/README.ThirdParty @@ -2,7 +2,7 @@ A new design for the ThirdParty packages compilation and installation process: ============================================================================== The main purpose of this new development is to build a complete ThirParty -packages set for OpenFOAM 1.6-ext using only the original package source +packages set for foam-extend-3.1 using only the original package source tarball and some patch files (when necessary). A useful by-product of this development is also to provide some kind of @@ -87,16 +87,16 @@ and .csh files one needs to source in order to properly initialize the PATH and LD_LIBRARY_PATH environment variables for running the packages. Some packages will also create environments variables necessary for the -compilation of some OpenFOAM libraries. +compilation of some foam-extend libraries. The scripts AllMake.stage[1-4] are taking care of refreshing the environment variable after the installation of every single package, so you will not need to -manually refresh your OpenFOAM environment yourself when building individual +manually refresh your foam-extend environment yourself when building individual ThirdParty packages through the AllMake.stage[1-4] scripts. -The main Allwmake script for the compilation of OpenFOAM will also take care of +The main Allwmake script for the compilation of foam-extend will also take care of refreshing the environment variable before moving on to the compilation of the -main OpenFOAM libraries and applications. +main foam-extend libraries and applications. However, if you decide to compile the libraries and/or applications manually, or through the src/Allwmake or applications/Allwmake scripts, YOU MUST MAKE SURE @@ -169,7 +169,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that of my machines, I will get: > rpm -qip cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm| grep Relocations - Name : cmake Relocations: /home/beaudoin/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty + Name : cmake Relocations: /home/beaudoin/foam/foam-extend-3.1/ThirdParty The Relocations path is the actual location pointed by the $WM_THIRD_PARTY_DIR on my virtual machine when I generated the RPM. It is @@ -186,7 +186,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that this: rpm -ivh ./cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm \ - --relocate /home/beaudoin/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty=/tmp/someDir + --relocate /home/beaudoin/foam/foam-extend-3.1/ThirdParty=/tmp/someDir Even better, you can dig down the hard-coded path even deeper in order to relocate the whole installation directory, down to the last hard-coded @@ -238,7 +238,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that -------------------- Please report ThirdParty packages related bugs to the Bug tracking system - for OpenFOAM-1.6-ext. + for foam-extend-3.1 http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php @@ -246,3 +246,4 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that Martin Beaudoin Rev 0: 05/2011 Rev 1: 08/2011 +Rev 2: 05/2014 diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch index 48615ddf5..1bf93c7ad 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch @@ -1,6 +1,14 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in ---- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 19:30:33.000000000 -0500 -+++ ParMGridGen-1.0/Makefile.in 2010-10-31 16:18:41.000000000 -0400 +--- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 16:30:33.000000000 -0800 ++++ ParMGridGen-1.0/Makefile.in 2013-08-22 20:07:33.491171127 -0700 +@@ -1,6 +1,6 @@ + #-------------------------------------------------------------------------- + # Which make to use +-make = gmake ++make = make + + # Which compiler to use + # CC is the compiler for the serial code @@ -12,7 +12,7 @@ OPTFLAGS = -O3 @@ -41,8 +49,8 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in #-------------------------------------------------------------------------- # diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile ---- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 17:46:56.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2010-10-31 16:16:54.000000000 -0400 +--- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 14:46:56.000000000 -0800 ++++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -33,7 +33,7 @@ .c.o: $(CC) $(CFLAGS) -c $*.c @@ -59,8 +67,8 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/ - rm -f *.o ; rm -f ./libIMlib.a + rm -f *.o ; rm -f ./libIMlib.$(LIBEXT) diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile ---- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 18:01:00.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2010-10-31 16:16:54.000000000 -0400 +--- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 15:01:00.000000000 -0800 ++++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -22,7 +22,7 @@ INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR) CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES) @@ -86,8 +94,8 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Li - rm -f *.o ; rm -f ../../libmgrid.a + rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT) diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile ---- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 18:02:26.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2010-10-31 16:16:54.000000000 -0400 +--- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 15:02:26.000000000 -0800 ++++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -1,6 +1,6 @@ include ../../Makefile.in diff --git a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec index d7728b439..ac43b5fbf 100644 --- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec @@ -115,13 +115,13 @@ Patch1: ParMGridGen-1.0.patch cp ./MGridGen/IMlib/libIMlib.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp ./MGridGen/Lib/libMGridGen.* $RPM_BUILD_ROOT/%{_installPrefix}/lib - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -139,7 +139,7 @@ export PARMGRIDGEN_INCLUDE_DIR=\$PARMGRIDGEN_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParMetis-3.1.1.spec b/ThirdParty/rpmBuild/SPECS/ParMetis-3.1.1.spec index 62ca73ce3..f755b22bd 100644 --- a/ThirdParty/rpmBuild/SPECS/ParMetis-3.1.1.spec +++ b/ThirdParty/rpmBuild/SPECS/ParMetis-3.1.1.spec @@ -115,13 +115,13 @@ Patch1: ParMetis-3.1.1.patch cp METISLib/libmetis-parmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp ParMETISLib/libparmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -140,7 +140,7 @@ export PARMETIS_INCLUDE_DIR=\$PARMETIS_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.10.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.10.1.spec index 7e34426e8..de0410718 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-3.10.1.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.10.1.spec @@ -195,13 +195,13 @@ Patch0: ParaView-3.10.1.patch_darwin cd buildObj make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -233,7 +233,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec index 639acf7f1..35f393ad5 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec @@ -202,13 +202,13 @@ Patch1: paraview-gcc47.patch cd buildObj make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -240,7 +240,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec index 6a5ed0f37..dc5b4acde 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec @@ -212,13 +212,13 @@ Patch3: ParaView-3.14.1.patch_darwin cd buildObj make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -250,7 +250,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec index decfd8e88..1a40dab20 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec @@ -189,13 +189,13 @@ Patch0: ParaView-3.8.1.patch_darwin cd buildObj make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -227,7 +227,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-4.0.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-4.0.1.spec index af450a552..aec695bca 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-4.0.1.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-4.0.1.spec @@ -190,13 +190,13 @@ Patch0: ParaView-4.0.1.patch_darwin cd buildObj make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -228,7 +228,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.6.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.6.spec index 69b0f064e..0bd39116c 100644 --- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.6.spec +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.6.spec @@ -95,13 +95,13 @@ Group: Development/Tools %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available @@ -144,7 +144,7 @@ DOT_CSH_EOF cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available @@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_HARDCODED_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.7.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.7.spec index d7357c4c1..f3e7a648e 100644 --- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.7.spec +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.5.7.spec @@ -95,13 +95,13 @@ Group: Development/Tools %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available @@ -144,7 +144,7 @@ DOT_CSH_EOF cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available @@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_HARDCODED_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec index 57b589fcd..bb96271a4 100644 --- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec @@ -95,13 +95,13 @@ Group: Development/Tools %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available @@ -144,7 +144,7 @@ DOT_CSH_EOF cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available @@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_HARDCODED_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec index 5b58e1992..9fdb3fbb4 100644 --- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec @@ -95,13 +95,13 @@ Group: Development/Tools %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available @@ -144,7 +144,7 @@ DOT_CSH_EOF cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available @@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_HARDCODED_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec index 838c52390..5de0f6bb9 100644 --- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec @@ -95,13 +95,13 @@ Group: Development/Tools %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available @@ -144,7 +144,7 @@ DOT_CSH_EOF cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available @@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON DOT_HARDCODED_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh # In this version of the configuration script, the paths are hardcoded, -# which makes it easier to load PyFoam without the OpenFOAM environment +# which makes it easier to load PyFoam without the foam-extend environment # variables # # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/Python-2.7.spec b/ThirdParty/rpmBuild/SPECS/Python-2.7.spec index b3f8ccc59..17398905f 100644 --- a/ThirdParty/rpmBuild/SPECS/Python-2.7.spec +++ b/ThirdParty/rpmBuild/SPECS/Python-2.7.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export PYTHON_BIN_DIR=\$PYTHON_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/bison-2.4.3.spec b/ThirdParty/rpmBuild/SPECS/bison-2.4.3.spec index 6a37f10ea..ec4e2d121 100644 --- a/ThirdParty/rpmBuild/SPECS/bison-2.4.3.spec +++ b/ThirdParty/rpmBuild/SPECS/bison-2.4.3.spec @@ -102,13 +102,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export BISON_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/bison-2.7.spec b/ThirdParty/rpmBuild/SPECS/bison-2.7.spec new file mode 100644 index 000000000..96a678db9 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/bison-2.7.spec @@ -0,0 +1,154 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for bison-2.7 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2014) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name bison +%define release %{_WM_OPTIONS} +%define version 2.7 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: bison +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://ftp.gnu.org/gnu/bison +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + ./configure \ + --prefix=%{_installPrefix} + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export BISON_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$BISON_DIR/lib ] && _foamAddLib \$BISON_DIR/lib + +# Enable access to the package applications if present +[ -d \$BISON_DIR/bin ] && _foamAddPath \$BISON_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv BISON_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$BISON_DIR/lib ) then + _foamAddLib \$BISON_DIR/lib +endif + +if ( -e \$BISON_DIR/bin ) then + _foamAddPath \$BISON_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.11.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.11.spec index 83dd6ca35..cd46a3442 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.11.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.11.spec @@ -113,13 +113,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -134,7 +134,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.12.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.12.spec index d6ec4d11a..e45450baf 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.12.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.12.spec @@ -113,13 +113,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -134,7 +134,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.3.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.3.spec index 15a00f840..7b64827b7 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.3.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.3.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.5.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.5.spec index a32099931..1495a0da3 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.5.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.5.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.6.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.6.spec index 17b17a68d..35388d232 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.6.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.6.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/cmake-2.8.8.spec b/ThirdParty/rpmBuild/SPECS/cmake-2.8.8.spec index 786f882e1..6c49284f4 100644 --- a/ThirdParty/rpmBuild/SPECS/cmake-2.8.8.spec +++ b/ThirdParty/rpmBuild/SPECS/cmake-2.8.8.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/flex-2.5.35.spec b/ThirdParty/rpmBuild/SPECS/flex-2.5.35.spec index 61cde4738..71fab5ef7 100644 --- a/ThirdParty/rpmBuild/SPECS/flex-2.5.35.spec +++ b/ThirdParty/rpmBuild/SPECS/flex-2.5.35.spec @@ -102,13 +102,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export FLEX_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_ DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec index 28c80fe5f..cc4bed3c4 100644 --- a/ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec @@ -119,13 +119,13 @@ Group: Development/Tools cd ./objBuildDir make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -142,7 +142,7 @@ export WM_COMPILER_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platform DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec index 685298158..f71f01972 100644 --- a/ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec @@ -117,13 +117,13 @@ Group: Development/Tools cd ./objBuildDir make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -139,7 +139,7 @@ export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.6.4.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.6.4.spec index bb94fc575..ed07dd568 100644 --- a/ThirdParty/rpmBuild/SPECS/gcc-4.6.4.spec +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.6.4.spec @@ -1,26 +1,25 @@ #------------------------------------------------------------------------------ # ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | -# \\ / A nd | Copyright held by original author +# \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM. +# This file is part of foam-extend. # -# OpenFOAM is free software; you can redistribute it and/or modify it +# foam-extend is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your +# Free Software Foundation, either version 3 of the License, or (at your # option) any later version. # -# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenFOAM; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with foam-extend. If not, see . # # Script # RPM spec file for gcc-4.6.4 @@ -118,13 +117,13 @@ Group: Development/Tools cd ./objBuildDir make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -142,7 +141,7 @@ export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/gmp-5.0.1.spec b/ThirdParty/rpmBuild/SPECS/gmp-5.0.1.spec index 05f3baf0c..ed068b4ea 100644 --- a/ThirdParty/rpmBuild/SPECS/gmp-5.0.1.spec +++ b/ThirdParty/rpmBuild/SPECS/gmp-5.0.1.spec @@ -101,13 +101,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -123,7 +123,7 @@ export GMP_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/gmp-5.1.2.spec b/ThirdParty/rpmBuild/SPECS/gmp-5.1.2.spec index 280bdfc9d..1c4ea1cec 100644 --- a/ThirdParty/rpmBuild/SPECS/gmp-5.1.2.spec +++ b/ThirdParty/rpmBuild/SPECS/gmp-5.1.2.spec @@ -1,26 +1,25 @@ #------------------------------------------------------------------------------ # ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | -# \\ / A nd | Copyright held by original author +# \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM. +# This file is part of foam-extend. # -# OpenFOAM is free software; you can redistribute it and/or modify it +# foam-extend is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your +# Free Software Foundation, either version 3 of the License, or (at your # option) any later version. # -# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenFOAM; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with foam-extend. If not, see . # # Script # RPM spec file for gmp-5.1.2 @@ -102,13 +101,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +123,7 @@ export GMP_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec index 0346bed92..de38622cc 100644 --- a/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec +++ b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.1.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export HWLOC_BIN_DIR=\$HWLOC_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/hwloc-1.7.2.spec b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.2.spec index c4ff24de3..cfa5fa4d4 100644 --- a/ThirdParty/rpmBuild/SPECS/hwloc-1.7.2.spec +++ b/ThirdParty/rpmBuild/SPECS/hwloc-1.7.2.spec @@ -103,13 +103,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export HWLOC_BIN_DIR=\$HWLOC_DIR/bin DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index 770720d85..99d84a05f 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -132,13 +132,13 @@ Patch0: libccmio-2.6.1.patch_0 mv ${libsdir}/* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp libccmio/*.h $RPM_BUILD_ROOT/%{_installPrefix}/include/libccmio - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -157,7 +157,7 @@ export LIBCCMIO_INCLUDE_DIR=\$LIBCCMIO_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/m4-1.4.16.spec b/ThirdParty/rpmBuild/SPECS/m4-1.4.16.spec index a4fdc193a..9fa83c6c7 100644 --- a/ThirdParty/rpmBuild/SPECS/m4-1.4.16.spec +++ b/ThirdParty/rpmBuild/SPECS/m4-1.4.16.spec @@ -102,13 +102,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -124,7 +124,7 @@ export M4_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OP DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec b/ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec index 7e9ba0824..2441aabb4 100644 --- a/ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec +++ b/ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec @@ -124,13 +124,13 @@ Patch0: mesquite-2.1.2_patch0 %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -148,7 +148,7 @@ export MESQUITE_INCLUDE_DIR=\$MESQUITE_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec b/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec index a07f8f4ba..dff6bf21c 100644 --- a/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec +++ b/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec @@ -116,13 +116,13 @@ Patch0: metis-5.0pre2_patch_darwin cp build/*/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -141,7 +141,7 @@ export METIS_INCLUDE_DIR=\$METIS_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec index aaa2e713a..5450c3e68 100644 --- a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec @@ -117,13 +117,13 @@ Patch0: metis-5.1.0_patch_gcc cp build/*/libmetis/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -142,7 +142,7 @@ export METIS_INCLUDE_DIR=\$METIS_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec b/ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec index ee3f97f95..7c2517af1 100644 --- a/ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec +++ b/ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec @@ -108,13 +108,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -130,7 +130,7 @@ export MPC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mpc-1.0.1.spec b/ThirdParty/rpmBuild/SPECS/mpc-1.0.1.spec index 34be899a0..32f112ad3 100644 --- a/ThirdParty/rpmBuild/SPECS/mpc-1.0.1.spec +++ b/ThirdParty/rpmBuild/SPECS/mpc-1.0.1.spec @@ -1,26 +1,25 @@ #------------------------------------------------------------------------------ # ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | -# \\ / A nd | Copyright held by original author +# \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM. +# This file is part of foam-extend. # -# OpenFOAM is free software; you can redistribute it and/or modify it +# foam-extend is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your +# Free Software Foundation, either version 3 of the License, or (at your # option) any later version. # -# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenFOAM; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with foam-extend. If not, see . # # Script # RPM spec file for mpc-1.0.1 @@ -109,13 +108,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -131,7 +130,7 @@ export MPC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec b/ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec index 74ce05009..e0275547e 100644 --- a/ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec +++ b/ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec @@ -105,13 +105,13 @@ Group: Development/Tools make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -127,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_ DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec b/ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec index c2fee6728..9008dda81 100644 --- a/ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec +++ b/ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec @@ -105,13 +105,13 @@ Group: Development/Tools make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -127,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_ DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/mpfr-3.1.2.spec b/ThirdParty/rpmBuild/SPECS/mpfr-3.1.2.spec index bba8fa9c3..6ec7ad5d1 100644 --- a/ThirdParty/rpmBuild/SPECS/mpfr-3.1.2.spec +++ b/ThirdParty/rpmBuild/SPECS/mpfr-3.1.2.spec @@ -1,26 +1,25 @@ #------------------------------------------------------------------------------ # ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | -# \\ / A nd | Copyright held by original author +# \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM. +# This file is part of foam-extend. # -# OpenFOAM is free software; you can redistribute it and/or modify it +# foam-extend is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your +# Free Software Foundation, either version 3 of the License, or (at your # option) any later version. # -# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenFOAM; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with foam-extend. If not, see . # # Script # RPM spec file for mpfr-3.1.2 @@ -106,13 +105,13 @@ Group: Development/Tools make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -128,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_ DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.1.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.1.spec index 1fd0c0fd5..163b76d40 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.1.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.1.spec @@ -131,13 +131,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -153,7 +153,7 @@ export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$ DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec index 0ca8993f8..7afc244fa 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec @@ -133,13 +133,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -162,7 +162,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags export PINC=\$OPENMPI_COMPILE_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS @@ -185,7 +185,7 @@ fi DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries @@ -212,7 +212,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS" diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.5.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.5.spec index 4aae34002..5452dba6e 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.5.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.5.spec @@ -131,13 +131,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -160,7 +160,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags export PINC=\$OPENMPI_COMPILE_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS @@ -183,7 +183,7 @@ fi DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries @@ -210,7 +210,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags setenv PINC \`echo \$OPENMPI_COMPILE_FLAGS\` setenv PLIBS \`echo \$OPENMPI_LINK_FLAGS\` diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.3.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.3.spec index 89397246b..de39d614f 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.3.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.3.spec @@ -135,13 +135,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -164,7 +164,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags export PINC=\$OPENMPI_COMPILE_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS @@ -187,7 +187,7 @@ fi DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries @@ -214,7 +214,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS" diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec index c9d2c0938..d6be05d6e 100644 --- a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec +++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec @@ -135,13 +135,13 @@ Group: Development/Tools %install make install DESTDIR=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -164,7 +164,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags export PINC=\$OPENMPI_COMPILE_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS @@ -187,7 +187,7 @@ fi DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries @@ -214,7 +214,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" -# Set the OpenFOAM compilation flags +# Set the foam-extend compilation flags setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS" diff --git a/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec b/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec index c4e0ccebc..1f0dea975 100644 --- a/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec +++ b/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec @@ -118,13 +118,13 @@ Patch1: ParMetis-3.1.1.patch cp build/*/libparmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp build/*/libmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -143,7 +143,7 @@ export PARMETIS_INCLUDE_DIR=\$PARMETIS_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec index edd27e24c..513d85c16 100644 --- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec +++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec @@ -114,13 +114,13 @@ Group: Development/Tools # We need to use the INSTALL_ROOT= option instead make install INSTALL_ROOT=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -137,7 +137,7 @@ export QT_LIB_DIR=\$QT_DIR/lib DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec index 05157d86e..9505396a4 100644 --- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec +++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec @@ -114,13 +114,13 @@ Group: Development/Tools # We need to use the INSTALL_ROOT= option instead make install INSTALL_ROOT=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -137,7 +137,7 @@ export QT_LIB_DIR=\$QT_DIR/lib DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec index 4aa33686f..95309a2b3 100644 --- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec +++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec @@ -127,13 +127,13 @@ Group: Development/Tools make install INSTALL_ROOT=$RPM_BUILD_ROOT - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -150,7 +150,7 @@ export QT_LIB_DIR=\$QT_DIR/lib DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec index b6b6402ad..36606b50a 100644 --- a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec +++ b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec @@ -113,13 +113,13 @@ Patch0: scotch-5.1.10b_patch_0 mkdir -p $RPM_BUILD_ROOT%{_installPrefix} make install prefix=$RPM_BUILD_ROOT%{_installPrefix} - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -137,7 +137,7 @@ export SCOTCH_INCLUDE_DIR=\$SCOTCH_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec b/ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec index 4c857e81e..3276749d3 100644 --- a/ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec +++ b/ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec @@ -118,13 +118,13 @@ Patch1: scotch-6.0.0_patch_darwin mkdir -p $RPM_BUILD_ROOT%{_installPrefix} make install prefix=$RPM_BUILD_ROOT%{_installPrefix} - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -142,7 +142,7 @@ export SCOTCH_INCLUDE_DIR=\$SCOTCH_DIR/include DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/zoltan-3.5.spec b/ThirdParty/rpmBuild/SPECS/zoltan-3.5.spec index 9f4a48367..63e729995 100644 --- a/ThirdParty/rpmBuild/SPECS/zoltan-3.5.spec +++ b/ThirdParty/rpmBuild/SPECS/zoltan-3.5.spec @@ -101,13 +101,13 @@ Group: Development/Tools make install DESTDIR=$RPM_BUILD_ROOT cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -123,7 +123,7 @@ export ZOLTAN_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$W DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/ThirdParty/rpmBuild/SPECS/zoltan-3.6.spec b/ThirdParty/rpmBuild/SPECS/zoltan-3.6.spec index 7480e88fe..0afaa8665 100644 --- a/ThirdParty/rpmBuild/SPECS/zoltan-3.6.spec +++ b/ThirdParty/rpmBuild/SPECS/zoltan-3.6.spec @@ -113,13 +113,13 @@ Group: Development/Tools make install DESTDIR=$RPM_BUILD_ROOT cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include - # Creation of OpenFOAM specific .csh and .sh files" + # Creation of foam-extend specific .csh and .sh files" echo "" - echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" echo "" # - # Generate package specific .sh file for OpenFOAM + # Generate package specific .sh file for foam-extend # mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh @@ -135,7 +135,7 @@ export ZOLTAN_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$W DOT_SH_EOF # - # Generate package specific .csh file for OpenFOAM + # Generate package specific .csh file for foam-extend # cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh # Load %{name}-%{version} libraries and binaries if available diff --git a/doc/buildInstructions/Ubuntu/Ubuntu_14.04 b/doc/buildInstructions/Ubuntu/Ubuntu_14.04 index 48fc0037a..ccb856d13 100644 --- a/doc/buildInstructions/Ubuntu/Ubuntu_14.04 +++ b/doc/buildInstructions/Ubuntu/Ubuntu_14.04 @@ -21,25 +21,56 @@ Alternatively, you can download a snapshot (.tgz) of the source code from: http://sourceforge.net/projects/openfoam-extend/files/foam-extend-3.0/ +* Update your Ubuntu installation: + + sudo apt-get update + sudo apt-get upgrade + * Install required packages: - sudo apt-get install git-core build-essential binutils-dev flex bison \ + sudo apt-get install git-core build-essential binutils-dev flex \ zlib1g-dev qt4-dev-tools libqt4-dev libncurses5-dev libiberty-dev \ - libxt-dev rpm mercurial graphviz + libxt-dev rpm mercurial graphviz openmpi-bin libopenmpi-dev cmake + -Make an additional link: +* For Ubuntu 14.04, you need to customize some of the ThirdParty packages + in order to enable the usage of system-provided packages, and to enable + the compilation of other, like bison-2.7. + + Here is a list of sed commands that will do just that. You can copy/paste + the following block of commands in a control terminal in order to make + the necessary adjustments. You will need to be located at the root of your + foam-extend-3.0 installation for those commands to work. + + #################################################################### + # + # Create a prefs.sh file + cp etc/prefs.sh-EXAMPLE etc/prefs.sh + + # Use openmpi 1.6.5 as supplied by Ubuntu 14.04 + sed -i s/"#export WM_MPLIB=SYSTEMOPENMPI"/"export WM_MPLIB=SYSTEMOPENMPI"/g etc/prefs.sh + sed -i s/"#export OPENMPI_DIR=path_to_system_installed_openmpi"/"export OPENMPI_DIR=\/usr"/g etc/prefs.sh + sed -i s/"#export OPENMPI_BIN_DIR=\$OPENMPI_DIR\/bin"/"export OPENMPI_BIN_DIR=\$OPENMPI_DIR\/bin"/g etc/prefs.sh + + # Use Qt 4.8.6 as provided by Ubuntu 14.04 + sed -i s/"#export QT_DIR=path_to_system_installed_qt"/"export QT_DIR=\/usr"/g etc/prefs.sh + sed -i s/"#export QT_BIN_DIR=\$QT_DIR\/bin"/"export QT_BIN_DIR=\$QT_DIR\/bin"/g etc/prefs.sh + + # Use cmake 2.8.12.2 as provided by Ubuntu 14.04 + sed -i s/"( rpm_make -p cmake"/"#( rpm_make -p cmake"/g ThirdParty/AllMake.stage1 + + # Compile and install bison-2.7 from the ThirdParty packages. + sed -i 0,/"#( rpm_make -p bison-2.7"/s//"( rpm_make -p bison-2.7"/ ThirdParty/AllMake.stage1 + + # + #################################################################### - sudo ln -s /usr/bin/make /usr/bin/gmake * Set environment variables: cd ~/foam/foam-extend-3.0 . etc/bashrc -Optionally, set environment variable for Qt to compile ParaView: - - export QT_BIN_DIR=/usr/bin - Optionally, set environment variable for compiling Cuda solvers, for example (replace "sm_30" with value according to your GPU architecture): diff --git a/etc/settings.csh b/etc/settings.csh index f86fcabe6..e65cb47a3 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -486,6 +486,30 @@ if ( $?CMAKE_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-2.8.12/platf _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS/etc/cmake-2.8.12.csh endif +# m4 +# ~~~~~ +if ( $?M4_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/m4-1.4.16/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/m4-1.4.16/platforms/$WM_OPTIONS/etc/m4-1.4.16.csh +endif + +# bison +# ~~~~~ +if ( $?BISON_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/bison-2.7/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS/etc/bison-2.7.csh +endif + +# flex +# ~~~~~ +if ( $?FLEX_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/flex-2.5.35/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/flex-2.5.35/platforms/$WM_OPTIONS/etc/flex-2.5.35.csh +endif + +# zoltan +# ~~~~~ +if ( $?ZOLTAN_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/zoltan-3.5/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/zoltan-3.5/platforms/$WM_OPTIONS/etc/zoltan-3.5.csh +endif + # Python # ~~~~~ if ( $?PYTHON_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/Python-2.7/platforms/$WM_OPTIONS ) then diff --git a/etc/settings.sh b/etc/settings.sh index 735a3ae7a..ba8ff7ce3 100755 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -597,8 +597,8 @@ export MPI_BUFFER_SIZE # Load bison # ~~~~~~~~~~ -[ -z "$BISON_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/bison-2.4.3/platforms/$WM_OPTIONS ] && { - _foamSource $WM_THIRD_PARTY_DIR/packages/bison-2.4.3/platforms/$WM_OPTIONS/etc/bison-2.4.3.sh +[ -z "$BISON_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS/etc/bison-2.7.sh } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " BISON_DIR is initialized to: $BISON_DIR"