CONFIG: update versions

|       v2312       |       v2406       |   comment     |
|-------------------|-------------------|---------------|
| ADIOS2-2.9.2      | ADIOS2-2.10.1     | updates       |
| ParaView-v5.11.2  | ParaView-v5.12.1  | updates       |

.gitignore

@@ -12,9 +12,13 @@
 *.tgz
 *.gtgz
 
-# Ignore build and platforms folders
-build/
-platforms/
+# Ignore standard input/output folders
+/build/
+/download/
+/opt/
+/platforms/
+/sources/
+/unpack/
 
 # Generated files in the main directory
 /*.html

Allclean

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     Allclean
@@ -22,89 +22,179 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-# . etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printHelp() {
     cat<<USAGE
-Usage: ${0##*/} [OPTION] [<platform> [ ... <platformN> ]]
+Usage: ${0##*/} [OPTION]
 options:
-  -all              remove all platforms directories.
-  -current          clean the current platform ($WM_OPTIONS).
-  -help             print the usage
+  -build            Remove all 'build' directories
+  -current          Clean the current platform ($WM_OPTIONS)
+  -platform=NAME    Clean the named platform
+  -src | -sources   Clean sources (eg, with make distclean)
+  -full             Same as -build -src -current
+  -n | -dry-run     Do not perform actions
+  -help             Display usage help
 
 Cleanup intermediate build directories.
 Optionally remove specified platform(s) from the ThirdParty platforms
-directory $WM_THIRD_PARTY_DIR/platforms
+directory \$WM_THIRD_PARTY_DIR/platforms
 
 USAGE
-    exit 1
+    exit 0  # Clean exit
 }
 
-# Print help message
-if [ "$1" = "-h" -o "$1" = "-help" ]
-then
-    usage
-fi
+#------------------------------------------------------------------------------
+unset optDryRun optCleanType optPlatformName
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    --) shift; break;; # End option processing
+    (-h | -help*) printHelp ;;
+    (-n | -dry-run) optDryRun="(dry-run) " ;;
+
+    (-build)
+        optCleanType="${optCleanType}:build"
+        ;;
+
+    (-src | -source*)
+        optCleanType="${optCleanType}:sources"
+        ;;
+
+    (-full)
+        optCleanType="full"
+        ;;
+
+    (-current)
+        optCleanType="${optCleanType}:current"
+        ;;
+
+    (-platform=*)
+        optCleanType="${optCleanType}:platform"
+        optPlatformName="${1#*=}"
+        ;;
+
+    *) echo "Ignore unknown option/argument" 1>&2 ;;
+    esac
+    shift
+done
 
 #------------------------------------------------------------------------------
+[ -n "$optCleanType" ] || die "No clean operation specified"
 
-# Clean various packages via 'distclean'
-for i in \
-    openmpi-* metis-* adios-* ADIOS-* gperftools-* qt-* \
-    gmp-* mpfr-* mpc-* gcc-* llvm-* \
-;
-do
-    [ -d "$i" ] && (
-        echo
-        echo "${i%/*}"
-        echo "    make distclean"
-        echo
-        cd $i && make distclean
+# sources
+case "$optCleanType" in (*full* | *source*)
+
+    # Clean various packages via 'distclean'
+    for dir in \
+    $(etc/list-available -dirs \
+        gcc \
+        gmp \
+        gperftools \
+        llvm \
+        metis \
+        mpc \
+        mpfr \
+        openmpi \
+        qt \
     )
-done
+    do
+        if [ -n "$optDryRun" ]
+        then
+            echo "$dir : ${optDryRun}make distclean"
+        elif [ -d "$dir" ]
+        then
+        (
+            cd "$dir" 2>/dev/null || exit
+            echo
+            echo "$dir : make distclean"
+            echo
+            make distclean || true
+        )
+        fi
+    done
 
+    # Clean scotch (src) with 'realclean'
+    for dir in $(etc/list-available -dirs scotch)
+    do
+        dir="$dir/src"  # Within the src directory!
 
-# Clean various packages via 'realclean'
-for i in scotch*/src
-do
-    [ -d "$i" ] && (
+        if [ -n "$optDryRun" ]
+        then
+            echo "$dir : ${optDryRun}make realclean"
+        elif [ -d "$dir" ]
+        then
+        (
+            cd "$dir" 2>/dev/null || exit
+            echo
+            echo "$dir : make realclean"
+            echo
+            make realclean || true
+        )
+        fi
+    done
+
+    # Clean various packages via 'wclean'
+    for dir in $(etc/list-available -dirs ccmio libccmio)
+    do
+        if [ -n "$optDryRun" ]
+        then
+            echo "$dir : ${optDryRun}wclean"
+        elif [ -f "$dir/Make/files" ]
+        then
+        (
+            cd "$dir" 2>/dev/null || exit
+            echo
+            echo "${dir}: wclean"
+            echo
+            wclean || true
+        )
+        fi
+    done
+
+    # Clean various packages via 'wclean'
+    for dir in $(etc/list-available -dirs kahip)
+    do
+        dir="$dir/lib"
+        if [ -n "$optDryRun" ]
+        then
+            echo "$dir : ${optDryRun}wclean"
+        elif [ -f "$dir/Make/files" ]
+        then
+        (
+            cd "$dir" 2>/dev/null || exit
+            echo
+            echo "${dir}: wclean"
+            echo
+            wclean || true
+        )
+        fi
+    done
+esac
+
+# -----------------------------------------------------------------------------
+
+# build
+case "$optCleanType" in (*full* | *build*)
+    # Clean out-of-source build directories
+    if [ -d build ]
+    then
         echo
-        echo "${i%/*}"
-        echo "    make realclean"
-        echo
-        cd $i && make realclean
-    )
-done
+        echo "${optDryRun}Remove build/ directory contents"
+        [ -z "$optDryRun" ] && rm -rf build/*
+    fi
+esac
 
 
-# Clean various packages via 'wclean'
-for i in libccmio*/Make kahip*/lib/Make
-do
-    [ -d "$i" ] && (
-        echo
-        echo "${i%/Make}"
-        echo "    wclean"
-        echo
-        cd ${i%/Make} && wclean
-    )
-done
-
-
-# Clean out-of-source build directories
-if [ -d build ]
-then
-    echo
-    echo "Clean build/ directory"
-    rm -rf build/*
-fi
-
 # -----------------------------------------------------------------------------
 
 #
@@ -113,45 +203,31 @@ fi
 removePlatform()
 {
     local platform="$1"
-    if [ -n "$platform" -a -d "platforms/$platform" ]
+    if [ -n "$platform" ] && [ -d "platforms/$platform" ]
     then
         echo
-        echo "Cleaning platform '$platform'"
-        \rm -rf "platforms/$platform"
+        echo "${optDryRun}Cleaning platform '$platform'"
+        [ -z "$optDryRun" ] && "platforms/$platform"
     else
         echo
-        echo "Platform '$platform' not built"
+        echo "${optDryRun}Platform '$platform' not built"
     fi
 }
 
-if [ "$#" -ge 1 ]
-then
-    echo
-    echo "Clean platforms/sub-directories"
-fi
 
-# Optionally cleanup platforms specified from the arguments
-while [ "$#" -ge 1 ]
-do
-    case "$1" in
-    -all)
-        echo
-        echo "Removing all platforms/sub-directories"
-        echo
-        \rm -rf platforms/*
-        break
-        ;;
+# -----------------------------------------------------------------------------
 
-    -current)
-        echo "Current platform '$WM_OPTIONS'"
-        removePlatform "$WM_OPTIONS"
-        ;;
+# current platform
+case "$optCleanType" in (*full* | *current*)
+    echo "${optDryRun}Remove current platform: '$WM_OPTIONS'"
+    removePlatform "$WM_OPTIONS"
+esac
 
-    *)
-        removePlatform "$1"
-        ;;
-    esac
-    shift
-done
+
+# named platform
+case "$optCleanType" in (*platform*)
+    echo "${optDryRun}Remove platform: '$optPlatformName'"
+    removePlatform "$optPlatformName"
+esac
 
 #------------------------------------------------------------------------------

Allwmake

@@ -3,17 +3,17 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
-#     Allwmake
+#     ThirdParty Allwmake
 #
 # Description
 #     Build script for ThirdParty applications/libraries
@@ -22,17 +22,13 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set for ThirdParty"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 exportCompiler true     # Compiler info + flags for CMake/configure
 exportLinker            # Linker flags for CMake/configure
@@ -52,14 +48,18 @@ echo Build MPI libraries if required
 echo "    $MPI_ARCH_PATH"
 case "$WM_MPLIB" in
 (OPENMPI | MPICH)
-    ./make$WM_MPLIB -test "$MPI_ARCH_PATH" || ./make$WM_MPLIB
+    if ! ./make"$WM_MPLIB" -test "$MPI_ARCH_PATH"
+    then
+        ./make"$WM_MPLIB"
+    fi
     ;;
 esac
 
 
 #------------------------------------------------------------------------------
 
-./makeSCOTCH
+# Treat as optional, but really isn't if anyone wants parallel calculations
+./makeSCOTCH || warnBuildIssues SCOTCH
 
 #------------------------------------------------------------------------------
 echo
@@ -71,7 +71,7 @@ then
 fi
 if [ -n "$KAHIP_ARCH_PATH" ]
 then
-    echo KaHIP decomposition
+    echo KAHIP decomposition
     ./makeKAHIP -test "$KAHIP_ARCH_PATH" || \
     ./makeKAHIP || warnBuildIssues KAHIP
 else
@@ -88,7 +88,7 @@ then
 fi
 if [ -n "$METIS_ARCH_PATH" ]
 then
-    echo Metis decomposition
+    echo METIS decomposition
     ./makeMETIS -test "$METIS_ARCH_PATH" || \
     ./makeMETIS || warnBuildIssues METIS
 else
@@ -100,13 +100,14 @@ echo
 echo ========================================
 if [ -n "$CGAL_ARCH_PATH" ]
 then
-    echo "CGAL/boost"
+    echo "cgal/boost"
     ./makeCGAL -test "$CGAL_ARCH_PATH" "$BOOST_ARCH_PATH" || \
     ./makeCGAL || warnBuildIssues CGAL
 else
     warnNotFound CGAL   # is optional
 fi
 
+#------------------------------------------------------------------------------
 echo
 echo ========================================
 if [ -n "$FFTW_ARCH_PATH" ]
@@ -118,6 +119,26 @@ else
     warnNotFound FFTW   # is optional
 fi
 
+#------------------------------------------------------------------------------
+echo
+echo ========================================
+# Get ADIOS2_ARCH_PATH
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/adios2)
+then
+    . $settings
+fi
+if [ -n "$ADIOS2_ARCH_PATH" ]
+then
+    echo ADIOS2
+    ./makeAdios2 -test "$ADIOS2_ARCH_PATH" || \
+    ./makeAdios2 || warnBuildIssues ADIOS2
+else
+    warnNotFound ADIOS2   # is optional
+fi
+
+
+#------------------------------------------------------------------------------
+
 echo
 echo ========================================
 echo Done ThirdParty Allwmake

BUILD.md

@@ -6,7 +6,7 @@ OpenFOAM depends to a certain extent on third-party libraries
 scripts for building third-party packages. It will normally only be used in
 conjunction with the corresponding OpenFOAM version.
 
-## Organization
+## Directory Organization
 
 The ThirdParty directory contains a number of build scripts as well as
 some directories:
@@ -26,12 +26,12 @@ This approach avoids duplicate entries for the default versions and
 ensures the best overall consistency between the OpenFOAM installation
 and its corresponding third-party installation.
 
-Nonethess, the distributed make scripts can generally be used for a
+Nonetheless, the distributed make scripts can generally be used for a
 variety of versions of the third-party libraries, with the software
 version specified on the command-line. For example,
 ```
 $ ./makeFFTW -help
-usage: makeFFTW [OPTION] [fftw-VERSION]
+Usage: makeFFTW [OPTION] [fftw-VERSION]
 ```
 
 ---
@@ -54,13 +54,17 @@ usage: makeFFTW [OPTION] [fftw-VERSION]
 which mpicc
 ```
 2. Adjust the OpenFOAM `etc/bashrc`, `etc/config.sh/...` or equivalent
-   `prefs.sh` files to reflect your preferred configuration.
+   the `etc/prefs.{csh,sh}` files to reflect your preferred configuration.
    For many config files, there are several configuration possibilities:
    - Define a particular third-party version.
    - Use a system installation.
    - Disable use of an optional component.
    - Define an alternative site-wide central location.
-   - After making the desired changes, use `wmRefresh` or equivalent to use the configurations.
+
+See the [OpenFOAM configuration information][link openfoam-config]
+for more details.
+After making the desired changes, use the `wmRefresh` alias
+or equivalent to enable the configuration.
 
 
 ---
@@ -144,19 +148,15 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
    - Builds an mpi library (openmpi or mpich), scotch decomposition, boost, CGAL, FFTW.
    - If the optional kahip or metis  directories are found, they will also be compiled.
 2. `makeParaView`  *(optional)*
-   - This is optional, but extremely useful for visualization and for
-     run-time post-processing function objects.
-     You can build this at a later point in time, but then you should
-     remember to rebuild the post-processing function objects and the
-     reader module as well.
+   - Can be useful for visualization and for run-time post-processing function objects.
+     You can build this at a later point in time, and rebuild the visualization modules.
 3. Make any additional optional components
 
 
 #### Optional Components
 
-`makeADIOS`
-- Only required for [ADIOS](#parallel) support,
-  which is currently staged in the [add-ons repository][link AddOns].
+`makeAdios2`
+- Only required for [ADIOS](#parallel) support.
 
 `makeCGAL`
 - Builds [boost](#general-packages) and [CGAL](#general-packages).
@@ -173,11 +173,23 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
   Automatically invoked from the ThirdParty `Allwmake`,
   but can be invoked directly to resolve possible build errors.
 
+`makeOPENMPI`
+- Builds [OPENMPI](#parallel) library.
+
+`makePETSC`
+- Only required for [PETSC](#general-packages) support.
+
 `makeMETIS`
 - Builds [METIS](#parallel) decomposition library.
   Automatically invoked from the ThirdParty `Allwmake`,
   but can be invoked directly to resolve possible build errors.
 
+`makeSCOTCH`
+- Builds [scotch, ptscotch](#parallel) decomposition libraries.
+  Automatically invoked from the ThirdParty `Allwmake`,
+  but can be invoked directly for special configurations
+  or to resolve possible build errors.
+
 `makeMGridGen`
 - Optional agglomeration routines.
 
@@ -204,8 +216,8 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
   Report in sorted order.
 
 `Allclean`
-- After building, this script may be used to remove intermediate build information
-and save some disk space.
+- After building, this script may be used to remove intermediate build
+  information and save some disk space.
 
 
 ## Build Notes
@@ -263,6 +275,29 @@ use the ParaView-5.4 sources that were included in the ThirdParty-v1712
 source pack. This, however, has never been tested in combination with
 the OpenFOAM Catalyst insitu visualization.
 
+If you encounter problems starting paraview (eg, segmentation fault)
+it could be related to the graphics libraries not being properly found.
+The `LIBGL_DEBUG` environment variable can be used to obtain more
+detailed information:
+```
+$ export LIBGL_DEBUG=verbose
+```
+
+The call to paraview now emits this information:
+```
+libGL: screen 0 does not appear to be DRI2 capable
+libGL: OpenDriver: trying /usr/lib64/dri/tls/swrast_dri.so
+libGL: OpenDriver: trying /usr/lib64/dri/swrast_dri.so
+...
+libGL error: No matching fbConfigs or visuals found
+libGL error: failed to load driver: swrast
+```
+Indicating that the drivers are probably not correctly installed.
+The `/var/log/Xorg.0.log` file or the `dmesg` command may yield more
+information to the cause.
+In this particular case, the Nvidia drivers had a client/server
+version mismatch.
+
 
 #### 5.6.x, 5.5.x binary packages
 
@@ -292,15 +327,6 @@ may not be important for you):
 #### 5.3.0 and older are neither recommended nor supported
 - Various compilation issues and known bugs.
 
-### ADIOS
-- The github release currently requires GNU autoconf tools (eg,
-  autoconf, autoheader, automake) for its configuration.
-- Some inconsistency in directory names (ADIOS vs. adios) between releases.
-- Optionally uses bzip2, zlib development headers (eg, libbz2-devel, zlib-devel)
-  for the corresponding compression tranforms.
-- The [zfp floating point compression][page zfp] library is now included as
-  part of ADIOS.
-
 ### Making Qt <a name="makeQt"></a>
 - Building a third-party Qt installation (prior to building ParaView) requires
   some additional effort, but should nonetheless work smoothly.
@@ -393,6 +419,9 @@ you may have additional hurdles to using the newest versions of clang.
 | [boost][page boost]   | [download][link boost]
 | [CGAL][page CGAL]     | [download][link CGAL]
 | [FFTW][page FFTW]     | [download][link FFTW]
+| [HDF5][page HDF5]     | [download][link HDF5]
+| [PETSC][page PETSC]   | [download][link PETSC]
+| [HYPRE][page HYPRE]   | [repo][repo HYPRE] or [download][link HYPRE]
 | [ADF/CGNS][page CGNS], ccm | [link ccmio][link ccmio]
 | gperftools            | [repo][repo gperftools] or [download][link gperftools]
 
@@ -401,10 +430,10 @@ you may have additional hurdles to using the newest versions of clang.
 
 | Name                  | Location
 |-----------------------|------------------------
-| [openmpi][page openmpi] | [download][link openmpi]. The newer [openmpi][newer openmpi] make exhibit stability issues.
-| [adios][page adios]   | [repo][repo adios] or [github download][link adios] or [alt download][altlink adios]
-| [scotch, ptscotch][page scotch] | [download][link scotch] or [newer][newer scotch]
-| [kahip][page kahip] | [download][link kahip] or [newer][newer kahip]
+| [openmpi][page openmpi] | [download][link openmpi]. ***Some openmpi2/openmpi3 versions exhibit [stability issues](https://github.com/open-mpi/ompi/issues/5375)***
+| [adios][page adios]   | [repo][repo adios] or [github download][link adios]
+| [scotch, ptscotch][page scotch] | [repo][repo scotch] or [download][link scotch] or [older][older scotch]
+| [kahip][page kahip] | [download][link kahip] or [older][older kahip]
 | [metis][page metis] | [download][link metis]
 
 
@@ -413,7 +442,7 @@ you may have additional hurdles to using the newest versions of clang.
 | Name                  | Location
 |-----------------------|------------------------
 | [MESA][page mesa]     | [download][link mesa] or [older 13][link mesa13], [older 11][link mesa11]
-| [ParaView][page ParaView] | [download][link ParaView] or [older paraview-55][link ParaView55], [older paraview-54][link ParaView54] or [binaries][download ParaView]
+| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56] or [binaries][download ParaView]
 | [Qt][page Qt]         | [QT5][link Qt5] for ParaView-5.3.0 and later, or the [older qt-56][link Qt56] for older systems.
 
 
@@ -424,13 +453,16 @@ The minimum CMake requirements for building various components.
 2.8         llvm-3.4.2
 2.8.11      CGAL-4.9
 2.8.11      CGAL-4.11
+3.1         CGAL-4.12 -> CGAL-4.14.3
 2.8.12.2    llvm-3.7.0
 2.8.12.2    llvm-3.8.0
 2.8.4       cmake-3.6.0
-3.3         ParaView-5.6.0
+3.3         ParaView-5.6.3
+3.10        ParaView-5.7.0 - ParaView-5.8.0
+3.12 - 3.16 ParaView-5.9.0 - ParaView-5.10.1
 3.4.3       llvm-3.9.1
 3.4.3       llvm-4.0.0 - llvm-6.0.0
-3.6         ADIOS2
+3.12        ADIOS2
 ```
 
 ### GCC Minimum Requirements <a name="min-gcc"></a>
@@ -447,6 +479,24 @@ If your system gcc/g++ is too old to build the desired llvm/clang
 version, you may need to build a lower llvm/clang version and then use
 that clang compiler for building the newer llvm/clang version.
 
+<!-- OpenFOAM, Internal links -->
+
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
+
+
+## Software Links
+
+If you have access to this information file in its raw form, you will
+note that most of the software pages and download links are listed as
+a collection at the end of the file. This is designed to make it
+easier to use `grep` and find the relevant pages and links.
+
 
 <!-- gcc-related -->
 [page gcc]:       http://gcc.gnu.org/releases.html
@@ -455,8 +505,8 @@ that clang compiler for building the newer llvm/clang version.
 [page mpc]:       http://www.multiprecision.org/
 
 [link gcc]:       http://gcc.gnu.org/releases.html
-[link gmp]:       ftp://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
-[link mpfr]:      ftp://ftp.gnu.org/gnu/mpfr/mpfr-4.0.1.tar.xz
+[link gmp]:       ftp://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.xz
+[link mpfr]:      ftp://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
 [link mpc]:       ftp://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 
 
@@ -475,50 +525,66 @@ that clang compiler for building the newer llvm/clang version.
 
 
 <!-- parallel -->
-[page adios]:     https://www.olcf.ornl.gov/center-projects/adios/
-[repo adios]:     https://github.com/ornladios/ADIOS
-[link adios]:     https://github.com/ornladios/ADIOS/archive/v1.13.1.tar.gz
-[altlink adios]:  http://users.nccs.gov/~pnorbert/adios-1.13.1.tar.gz
+[page adios]:     https://csmd.ornl.gov/software/adios2
+[repo adios]:     https://github.com/ornladios/ADIOS2
+[link adios]:     https://github.com/ornladios/ADIOS2/archive/v2.10.1.tar.gz
+
+[page hdf5]:      https://www.hdfgroup.org
+[repo hdf5]:      https://github.com/HDFGroup/hdf5
+[link hdf5]:      https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.4.3.tar.gz
+
 [page zfp]:       http://computation.llnl.gov/projects/floating-point-compression/zfp-versions
 
 [page scotch]:    https://www.labri.fr/perso/pelegrin/scotch/
-[link scotch]:    https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
-[newer scotch]:   https://gforge.inria.fr/frs/download.php/file/38040/scotch_6.0.7.tar.gz
+[repo scotch]:    https://gitlab.inria.fr/scotch/scotch
+[link scotch]:    https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.3/scotch-v6.1.3.tar.gz
+[link scotch60_10]:  https://gforge.inria.fr/frs/download.php/file/38350/scotch_6.0.10.tar.gz
+[link scotch60_9]:   https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz
+[link scotch61_0]:   https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[link scotch61_3]:   https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.3/scotch-v6.1.3.tar.gz
+[older scotch]:   https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[newer scotch]:   https://gitlab.inria.fr/scotch/scotch/-/archive/v7.0.1/scotch-v7.0.1.tar.gz
 
 [page kahip]:     http://algo2.iti.kit.edu/documents/kahip/
-[link kahip]:     http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz
-[newer kahip]:    http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.10.tar.gz
+[older kahip]:    https://github.com/KaHIP/KaHIP/archive/v3.14.tar.gz
+[link kahip]:     https://github.com/KaHIP/KaHIP/archive/v3.15.tar.gz
 
 [page metis]:     http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 [link metis]:     http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
 
 [page openmpi]:   http://www.open-mpi.org/
-[link openmpi]:   https://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.7.tar.bz2
-[newer openmpi]:  https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.bz2
+[older openmpi]:  https://download.open-mpi.org/release/open-mpi/v1.10/openmpi-1.10.7.tar.bz2
+[link openmpi]:   https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.2.tar.bz2
 
 [page mpich]:     http://www.mpich.org/
-[link mpich]:     http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz
-
-[page mvpapich]:   http://mvapich.cse.ohio-state.edu/
-[link mvpapich]:   http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.tar.gz
+[link mpich]:     http://www.mpich.org/static/downloads/3.4.2/mpich-3.4.2.tar.gz
 
+[page mvpapich]:  http://mvapich.cse.ohio-state.edu/
+[link mvpapich]:  https://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.7-1.tar.gz
 
 <!-- general -->
 [page cmake]:     http://www.cmake.org/
-[link cmake]:     http://www.cmake.org/files/v3.5/cmake-3.5.2.tar.gz
+[link cmake]:     https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
 
 [page boost]:     http://boost.org
-[link boost]:     https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2
+[link boost]:     https://sourceforge.net/projects/boost/files/boost/1.74.0/boost_1_74_0.tar.bz2
 
 [page CGAL]:      http://cgal.org
-[link CGAL]:      https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9.1/CGAL-4.9.1.tar.xz
+[link CGAL]:      https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.14.3/CGAL-4.14.3.tar.xz
 
 [page FFTW]:      http://www.fftw.org/
-[link FFTW]:      http://www.fftw.org/fftw-3.3.7.tar.gz
+[link FFTW]:      http://www.fftw.org/fftw-3.3.10.tar.gz
+
+[page petsc]:     https://petsc.org/
+[link petsc]:     https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-lite-3.21.2.tar.gz
+
+[page hypre]:     https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/
+[repo hypre]:     https://github.com/hypre-space/hypre/
+[link hypre]:     https://github.com/hypre-space/hypre/archive/v2.31.0.tar.gz
 
 [page cgns]:      http://cgns.github.io/
 [link ccmio]:     http://portal.nersc.gov/project/visit/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
-[altlink ccmio]:  http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
+[altlink ccmio]:  https://sourceforge.net/projects/foam-extend/files/ThirdParty/libccmio-2.6.1.tar.gz (check usage conditions)
 
 [repo gperftools]: https://github.com/gperftools/gperftools
 [link gperftools]: https://github.com/gperftools/gperftools/releases/download/gperftools-2.5/gperftools-2.5.tar.gz
@@ -527,13 +593,24 @@ that clang compiler for building the newer llvm/clang version.
 [link zlib]:      https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.xz
 
 
+<!-- profilint -->
+
+[link extrae]:     https://github.com/bsc-performance-tools/extrae/archive/refs/tags/4.1.7.tar.gz
+[link libunwind]:  https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz
+[link papi]:       http://icl.utk.edu/projects/papi/downloads/papi-7.0.1.tar.gz
+
 <!-- Visualization -->
 
 [page ParaView]:  http://www.paraview.org/
 [download ParaView]: https://www.paraview.org/download/
-[link ParaView54]: http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz
-[link ParaView55]:   http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz
-[link ParaView]: http://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.gz
+[link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.xz
+[link ParaView57]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.xz
+[link ParaView58]: http://www.paraview.org/files/v5.8/ParaView-v5.8.1.tar.xz
+[link ParaView59]: http://www.paraview.org/files/v5.9/ParaView-v5.9.1.tar.xz
+[link ParaView510]: http://www.paraview.org/files/v5.10/ParaView-v5.10.1.tar.xz
+[link ParaView511]: http://www.paraview.org/files/v5.11/ParaView-v5.11.2.tar.xz
+[link ParaView512]: http://www.paraview.org/files/v5.12/ParaView-v5.12.1.tar.xz
+[link ParaView]:    http://www.paraview.org/files/v5.12/ParaView-v5.12.1.tar.xz
 
 [page mesa]:  http://mesa3d.org/
 [link mesa]:  ftp://ftp.freedesktop.org/pub/mesa/mesa-17.1.1.tar.xz
@@ -545,30 +622,6 @@ that clang compiler for building the newer llvm/clang version.
 [link Qt56]: http://download.qt.io/official_releases/qt/5.6/5.6.3/single/qt-everywhere-opensource-src-5.6.3.tar.xz
 [link Qt5]: http://download.qt.io/official_releases/qt/5.9/5.9.3/single/qt-everywhere-opensource-src-5.9.3.tar.xz
 
-<!-- OpenFOAM -->
-
-[link AddOns]: https://develop.openfoam.com/Community/OpenFOAM-addOns
-[link openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
-
-
 ---
 
-<!-- Standard Footer -->
-## Additional OpenFOAM Links
-
-- [Community AddOns][link AddOns] repository
-- [Download](http://www.openfoam.com/download) and
-  [installation instructions](http://www.openfoam.com/code/build-guide.php)
-- [Documentation](http://www.openfoam.com/documentation)
-- [Reporting bugs/issues](http://www.openfoam.com/code/bug-reporting.php) (including bugs/suggestions/feature requests) in OpenFOAM
-- [Contacting OpenCFD](http://www.openfoam.com/contact)
-
----
-
-Copyright 2016-2019 OpenCFD Ltd
+Copyright 2016-2024 OpenCFD Ltd

Environ.md

@@ -0,0 +1,77 @@
+## OpenFOAM® ThirdParty Environment Variables
+
+When using these scripts for building third-party libraries
+various environment variables are required or expected.
+
+### Mandatory
+
+- **WM_THIRD_PARTY_DIR** : Location of third-party library sources etc
+- **WM_PROJECT_DIR** : The OpenFOAM project directory. <br>
+  Used for `wmake` information, config files, etc
+- **WM_ARCH** : The target architecture (eg, Linux64)
+- **WM_OSTYPE** : The operating system type (eg, POSIX, MSwindows) <br>
+  Used as fallback for determining the ending for dynamic libraries.
+  Used for Windows-specific handling in scotch builds.
+- **WM_COMPILER** : The compiler name (eg, Gcc, Clang)
+- **WM_COMPILER_LIB_ARCH** : The target library ending (eg, 64). <br>
+  Typically used as `lib$WM_COMPILER_LIB_ARCH` to generate the name
+  `lib64`, for example.
+- **WM_LABEL_SIZE** : The OpenFOAM size for `label` (eg, 32 for int32)
+- **WM_PRECISION_OPTION** : The OpenFOAM representation for `scalar`
+  (eg, DP for double-precision)
+- **FOAM_EXT_LIBBIN** : Common _pool_ for the library targets.
+
+
+### MPI-related
+
+- **FOAM_MPI** : The OpenFOAM MPI sub-directory name (eg, sys-openmpi)
+- **WM_MPLIB** : The canonical OpenFOAM MPI name (eg, SYSTEMOPENMPI)
+- **MPI_ARCH_PATH** : Location of the current MPI implementation.
+  Used for additional linkage, but primarily to set MPI_ROOT
+  for a cmake hint.
+
+
+### Other
+
+- **WM_CONTINUE_ON_ERROR** : Ignore build errors.
+  Mostly set internally from `wmake -k`.
+- **WM_NCOMPPROCS** : The number of build processes to launch.
+  Often set internally from `wmake -j`.
+- **WM_COMPILER_TYPE** : Used internally for a few build scripts.
+  Has values of `system` or `ThirdParty`.
+
+
+## Output
+
+Similar to OpenFOAM itself, the build and final output are separated
+into different directories that contain a non-colliding hierarchy of
+target names. However, in contrast to the OpenFOAM target names,
+there are several different types of output targets:
+
+- *ARCH* : (eg, `linux64`) <br>
+  Base infrastructure such as compiler and base libraries.
+- *ARCH+COMPILER* : (eg, `linux64Gcc`) <br>
+  Compiler-specific libraries and applications.
+- *ARCH+COMPILER+SIZING* : (eg, `linux64GccDPInt32`) <br>
+  Libraries and applications specific to a particular combination
+  of OpenFOAM scalar/label sizes. This is the same as the
+  ***WM_OPTIONS*** value.
+
+By default, the locations of the build and final targets are hard-coded
+relative to the WM_THIRD_PARTY_DIR:
+
+- WM_THIRD_PARTY_DIR<b>/build/</b> : intermediate build artifacts
+- WM_THIRD_PARTY_DIR<b>/platforms/</b> : installation root
+
+The expert user or sys-admin can influence these locations with the
+following environment variables
+
+- **FOAM_THIRD_PARTY_BUILDROOT** :
+  Replaces WM_THIRD_PARTY_DIR as the root for build/ and platforms/.<br>
+  ***!! The specified build-root directory must exist !!***
+
+- **FOAM_THIRD_PARTY_SOURCES** :
+  Provide alternative location to WM_THIRD_PARTY_DIR/sources
+  for finding source bundles.<br>
+
+---

README.md

@@ -108,30 +108,15 @@ wmake -show-compile-cxx
 
 [download ParaView]: https://www.paraview.org/download/
 
-
 <!-- OpenFOAM -->
 
-[link AddOns]: https://develop.openfoam.com/Community/OpenFOAM-addOns
-[link openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
 
 ---
-
-<!-- Standard Footer -->
-## Additional OpenFOAM Links
-
-- [Community AddOns][link AddOns] repository
-- [Download](http://www.openfoam.com/download) and
-  [installation instructions](http://www.openfoam.com/code/build-guide.php)
-- [Documentation](http://www.openfoam.com/documentation)
-- [Reporting bugs/issues](http://www.openfoam.com/code/bug-reporting.php) (including bugs/suggestions/feature requests) in OpenFOAM
-- [Contacting OpenCFD](http://www.openfoam.com/contact)
-
----
-
 Copyright 2016-2019 OpenCFD Ltd

Requirements.md

@@ -2,50 +2,85 @@
 
 For building some particular third-party libraries from source,
 the normal [OpenFOAM System Requirements][link openfoam-require]
-will be insufficient.
+may not be sufficient.
 
 This is most notably the case for ParaView and/or QT compilation.
-As duly noted in [BUILD][link third-build] and [README][link third-readme] and information,
+As duly noted in [BUILD][link third-build] and [README][link third-readme] information,
 building ParaView from source tends to be the most difficult part of
 any third-party compilation.
 
 For general functionality, the paraview version distributed with
 the operating system or a [binary package][download ParaView]
-may be sufficient for your needs.
+is likely [fully adequate for your needs][FAQ ParaView].
 
 
-**Please help us with keeping the information here up-to-date and accurate.**
+***Please help us with keeping the information here up-to-date and accurate.***
 
 ### Ubuntu
 
-Dependencies:
+The full dependency list for building ParaView can be found from the
+corresponding [debian/control][debian control] file.
+
+A ***quick*** way to get these dependencies on to your system is to
+use the paraview development package:
 ```
-sudo apt-get install qt4-dev-tools libqt4-dev libqt4-opengl-dev freeglut3-dev libqtwebkit-dev  libxt-dev
+sudo apt install paraview-dev
+```
+Depending on your setup, the following subset may also be enough:
+```
+sudo apt install cmake qtbase5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev
 ```
 
-### openSUSE
 
-Dependencies:
+### openSUSE (eg, Leap-15.3)
 
+The full dependency list for building ParaView can be found from the
+corresponding [rpm spec][suse spec] file.
+
+A ***quick*** way to get these dependencies on to your system is to
+use the paraview development package:
 ```
-sudo zypper install glu-devel
-sudo zypper install libQtWebKit-devel libqt4-devel qt4-assistant-adp-devel qt4-x11-tools
+sudo zypper install paraview-devel
 ```
 
+Depending on your setup, the following subset may also be enough:
+```
+sudo zypper install Mesa-libEGL-devel
+sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras-devel
+sudo zypper install libxcb-devel libXt-devel
+```
+
+For building paraview with ffmpeg support (components: avformat
+avcodec avutil swscale), the packman repository may be required, with a
+variety of additional packages:
+```
+sudo zypper install ffmpeg-3
+sudo zypper install ffmpeg-3-libavcodec-devel
+sudo zypper install ffmpeg-3-libavformat-devel
+sudo zypper install ffmpeg-3-libavresample-devel
+sudo zypper install ffmpeg-3-libavutil-devel
+sudo zypper install ffmpeg-3-libswresample-devel
+sudo zypper install ffmpeg-3-libswscale-devel
+```
+
+
 <!-- Quick links -->
 
 [download ParaView]: https://www.paraview.org/download/
+[debian control]: https://salsa.debian.org/science-team/paraview/-/blob/master/debian/control
+[suse spec]: https://build.opensuse.org/package/view_file/science/paraview/paraview.spec
+[FAQ ParaView]: https://discourse.paraview.org/t/i-want-to-visualize-my-openfoam-simulation-results-with-paraview-but-im-confused-which-version-should-i-use
 
 
 <!-- OpenFOAM -->
 
-[link openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
 
 ---
-Copyright 2019 OpenCFD Ltd
+Copyright 2019-2022 OpenCFD Ltd

SOURCES.md

@@ -0,0 +1,221 @@
+Third-party software (shipped) versions according to OpenFOAM version
+
+# OpenFOAM-2406
+
+- ADIOS2-2.10.1      *update*
+- CGAL-4.14.3
+- ParaView-v5.12.1   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.15
+
+
+# OpenFOAM-2312
+
+- ADIOS2-2.9.2       *update*
+- CGAL-4.14.3
+- ParaView-v5.11.2   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.15
+
+
+# OpenFOAM-2306
+
+- ADIOS2-2.8.3
+- CGAL-4.14.3
+- ParaView-v5.11.1   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.15         *update*
+
+
+# OpenFOAM-2212
+
+- ADIOS2-2.8.3       *new*
+- CGAL-4.14.3
+- ParaView-v5.11.0   *new*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.14
+
+
+# OpenFOAM-2206
+
+- ADIOS2-2.7.1
+- CGAL-4.14.3
+- ParaView-v5.10.1   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.14
+
+
+# OpenFOAM-2112
+
+- ADIOS2-2.7.1       *new*
+- CGAL-4.14.3        *new*
+- ParaView-v5.10.0   *new*
+- boost_1_74_0       *new*
+- fftw-3.3.10        *update*
+- openmpi-4.1.2      *new*
+- scotch_6.1.0
+- kahip-3.14         *new*
+
+
+# OpenFOAM-2106
+
+- ADIOS2-2.6.0
+- CGAL-4.12.2
+- ParaView-v5.9.1    *update*
+- boost_1_66_0
+- fftw-3.3.7
+- openmpi-4.0.3
+- scotch_6.1.0       *update*
+- kahip-2.12
+
+
+# OpenFOAM-2012
+
+- ADIOS2-2.6.0       *update*
+- CGAL-4.12.2
+- ParaView-v5.6.3
+- boost_1_66_0
+- fftw-3.3.7
+- openmpi-4.0.3
+- scotch_6.0.9
+- kahip-2.12
+
+
+# OpenFOAM-2006
+
+- ADIOS2-2.4.0
+- CGAL-4.12.2        *update*
+- ParaView-v5.6.3
+- boost_1_66_0       *update*
+- fftw-3.3.7
+- openmpi-4.0.3      *update*
+- scotch_6.0.9
+- kahip-2.12
+
+
+# OpenFOAM-1912
+
+- ADIOS2-2.4.0        *new*
+- CGAL-4.9.1
+- ParaView-v5.6.3     *minor*
+- boost_1_64_0
+- fftw-3.3.7
+- openmpi-1.10.7      *minor*
+- scotch_6.0.9        *minor*
+- kahip-2.12          *update*
+
+
+# OpenFOAM-1906
+
+- CGAL-4.9.1
+- ParaView-v5.6.0
+- boost_1_64_0
+- fftw-3.3.7
+- openmpi-1.10.7      *minor*
+- scotch_6.0.6
+- kahip-2.00d
+
+
+# OpenFOAM-1812
+
+- CGAL-4.9.1
+- ParaView-v5.6.0     *update*
+- boost_1_64_0
+- fftw-3.3.7
+- openmpi-1.10.4
+- scotch_6.0.6        *minor*
+- kahip-2.00d
+
+
+# OpenFOAM-1806
+
+- CGAL-4.9.1
+- ParaView-v5.5.2     *update*
+- boost_1_64_0
+- fftw-3.3.7
+- openmpi-1.10.4
+- scotch_6.0.3
+- kahip-2.00d
+
+
+# OpenFOAM-1712
+
+- CGAL-4.9.1
+- ParaView-v5.4.1     *minor*
+- boost_1_64_0
+- fftw-3.3.7          *minor*
+- openmpi-1.10.4
+- scotch_6.0.3
+- kahip-2.00d         *new*
+
+
+# OpenFOAM-1706
+
+- CGAL-4.9.1          *minor*
+- ParaView-v5.4.0     *update*
+- boost_1_64_0        *update*
+- fftw-3.3.6-pl1      *minor*
+- openmpi-1.10.4
+- scotch_6.0.3
+
+
+# OpenFOAM-1612
+
+- CGAL-4.9            *update*
+- ParaView-v5.0.1     *update*
+- boost_1_62_0        *update*
+- fftw-3.3.5          *minor*
+- openmpi-1.10.4      *minor*
+- scotch_6.0.3
+
+
+# OpenFOAM-1606
+
+- CGAL-4.8            *update*
+- ParaView-v5.0.1     *update*
+- boost_1_61_0        *new*
+- fftw-3.3.4          *new*
+- openmpi-1.10.2      *minor*
+- scotch_6.0.3
+
+
+# OpenFOAM-1601 (3.0+)
+
+- CGAL-4.7            *update*
+- ParaView-v4.4.0     *update*
+- openmpi-1.10.0      *update*
+- scotch_6.0.3
+
+
+# OpenFOAM-2.4
+
+- CGAL-4.6            *update*
+- ParaView-v4.1.0
+- openmpi-1.8.5       *update*
+- scotch_6.0.3        *update*
+
+
+# OpenFOAM-2.3
+
+- CGAL-4.3
+- ParaView-v4.1.0
+- openmpi-1.6.5
+- scotch_6.0.0
+
+
+---

SOURCES.txt

@@ -1,104 +0,0 @@
-Short summary of third-party software versions for recent OpenFOAM versions.
-
-OpenFOAM-1906
----------------
-
-CGAL-4.9.1
-ParaView-5.6.0
-boost_1_64_0
-fftw-3.3.7
-openmpi-1.10.7      *minor*
-scotch_6.0.6
-kahip-2.00d
-
-
-OpenFOAM-1812
----------------
-
-CGAL-4.9.1
-ParaView-5.6.0      *update*
-boost_1_64_0
-fftw-3.3.7
-openmpi-1.10.4
-scotch_6.0.6        *minor*
-kahip-2.00d
-
-
-OpenFOAM-1806
----------------
-CGAL-4.9.1
-ParaView-5.5.2      *update*
-boost_1_64_0
-fftw-3.3.7
-openmpi-1.10.4
-scotch_6.0.3
-kahip-2.00d
-
-
-OpenFOAM-1712
----------------
-CGAL-4.9.1
-ParaView-5.4.1      *minor*
-boost_1_64_0
-fftw-3.3.7          *minor*
-openmpi-1.10.4
-scotch_6.0.3
-kahip-2.00d         *new*
-
-
-OpenFOAM-1706
----------------
-CGAL-4.9.1          *minor*
-ParaView-5.4.0      *update*
-boost_1_64_0        *update*
-fftw-3.3.6-pl1      *minor*
-openmpi-1.10.4
-scotch_6.0.3
-
-
-OpenFOAM-1612
----------------
-CGAL-4.9            *update*
-ParaView-5.0.1      *update*
-boost_1_62_0        *update*
-fftw-3.3.5          *minor*
-openmpi-1.10.4      *minor*
-scotch_6.0.3
-
-
-OpenFOAM-1606
----------------
-CGAL-4.8            *update*
-ParaView-5.0.1      *update*
-boost_1_61_0        *new*
-fftw-3.3.4          *new*
-openmpi-1.10.2      *minor*
-scotch_6.0.3
-
-
-OpenFOAM-3.0+
----------------
-CGAL-4.7            *update*
-ParaView-4.4.0      *update*
-openmpi-1.10.0      *update*
-scotch_6.0.3
-
-
-OpenFOAM-2.4
----------------
-CGAL-4.6            *update*
-ParaView-4.1.0
-openmpi-1.8.5       *update*
-scotch_6.0.3        *update*
-
-
----------------
-OpenFOAM-2.3
----------------
-CGAL-4.3
-ParaView-4.1.0
-openmpi-1.6.5
-scotch_6.0.0
-
-
----------------

etc/list-available

@@ -0,0 +1,86 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# Script
+#     etc/list-available
+#
+# Description
+#     List available unpacked source versions
+#
+#     checks:
+#     - ThirdParty/PACKAGE
+#     - ThirdParty/sources/PACKAGE
+#     - ThirdParty/sources/canonical/PACKAGE
+#
+# Example usage
+#     etc/list-available paraview
+#
+#------------------------------------------------------------------------------
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+
+#------------------------------------------------------------------------------
+printHelp() {
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [package1 .. [packageN]]
+Options:
+  -dirs    List with relative source directories
+  -names   List names only [default]
+  -full    List with absolute source directories
+  -help    Display usage help
+
+List available (unpacked) source packages.
+
+USAGE
+    exit 0  # Clean exit
+}
+#------------------------------------------------------------------------------
+optOutput="-names"
+
+# Process options/arguments
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help*) printHelp;;
+
+    # Resolve with (relative) dirs
+    -dir*)
+        optOutput="-dirs"
+        ;;
+
+    # Resolve packages names only (without directory)
+    -name*)
+        optOutput="-names"
+        ;;
+
+    # Resolve with full (absolute) dirs
+    -full | -long)
+        optOutput="-long"
+        ;;
+
+    -*) echo "Ignore unknown option" 1>&2 ;;
+    *)  break ;;
+    esac
+    shift
+done
+
+if [ "$#" -gt 0 ]
+then
+    listPackageVersions $optOutput "$@"
+else
+    die "Did not specify any package(s)"
+fi
+
+
+#------------------------------------------------------------------------------

etc/list-download

@@ -0,0 +1,62 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# Script
+#     etc/list-download
+#
+# Description
+#     List known download hints. Required BUILD.md
+#
+# Example usage
+#     etc/list-download paraview
+#
+#------------------------------------------------------------------------------
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+
+#------------------------------------------------------------------------------
+printHelp() {
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [package1 .. [packageN]]
+Options:
+  -help    Display usage help
+
+List known download hints.
+
+USAGE
+    exit 0  # Clean exit
+}
+#------------------------------------------------------------------------------
+
+# Process options/arguments
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help*) printHelp;;
+
+    -*) echo "Ignore unknown option" 1>&2 ;;
+    *)  break ;;
+    esac
+    shift
+done
+
+if [ "$#" -gt 0 ]
+then
+    showDownloadHint "$@"
+else
+    die "Did not specify any package(s)"
+fi
+
+
+#------------------------------------------------------------------------------

etc/list-sources

@@ -0,0 +1,167 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# Script
+#     etc/list-sources
+#
+# Description
+#     Extract package names from SOURCES.md and resolve their respective
+#     (unpacked) directory paths.
+#
+#     The input source file is assumed to be Markdown formatted with
+#     sections for each OpenFOAM version, followed by a '-' bulleted
+#     list of the software package/versions.
+#
+# Example,
+#     # OpenFOAM-2106
+#
+#     - ADIOS2-2.6.0
+#     - CGAL-4.12.2
+#     ...
+#
+#------------------------------------------------------------------------------
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+
+#------------------------------------------------------------------------------
+printHelp() {
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION]
+Options:
+  -dirs         Resolve source directories (relative dir names)
+  -full         Resolve source directories (absolute dir names)
+  -file=FILE    Alternative file to process (default: SOURCES.md)
+  -vDIGITS | -DIGITS
+                OpenFOAM version (eg, -v2106, -2106) to process.
+                The default is to process the first (latest) section.
+  -help
+
+Extract package names from SOURCES.md and optionally
+resolve their respective (unpacked) directory paths.
+
+USAGE
+    exit 0  # Clean exit
+}
+#------------------------------------------------------------------------------
+
+inputFile="SOURCES.md"
+unset version optResolve
+
+# Process options/arguments
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help*) printHelp;;
+
+    # Resolve (relative) directories
+    -dir*)
+        : "${optResolve:=-relative}"
+        ;;
+
+    # Resolve (full) directories
+    -full)
+        optResolve="-absolute"
+        ;;
+    -file=*)
+        inputFile="${1#*=}"
+        ;;
+
+    -[0-9]*)  version="${1#*-}" ;;
+    -v[0-9]*) version="${1#*-v}" ;;
+
+    -*) echo "Ignore unknown option" 1>&2 ;;
+    esac
+    shift
+done
+
+# Resolve file (if necessary)
+file="$inputFile"
+
+if [ ! -f "$file" ]
+then
+    file="$WM_THIRD_PARTY_DIR/$inputFile"
+    [ -f "$file" ] || die "No such file: $inputFile"
+fi
+
+## echo "processing: $file" 1>&2
+
+# Parse this type of input:
+#
+#  # OpenFOAM-2106
+#
+#  - ADIOS2-2.6.0
+#  - CGAL-4.12.2
+#  - ParaView-v5.9.1    *update*
+#  - boost_1_66_0
+#  - fftw-3.3.7
+#  - openmpi-4.0.3
+#  - scotch_6.1.0       *update*
+#  - kahip-2.12
+
+# By default use the top section, unless '$version' is specified
+
+unset active section
+while read -r line
+do
+    case "$line" in
+    ('#'*)
+        # A markdown section
+        if [ -n "$active" ]
+        then
+            break  # Done
+        elif [ -z "$version" ]
+        then
+            active=true   # No version: take the first section
+        else
+            # Match version (eg, '2106') vs these types of input:
+            # - '## OpenFOAM-2106'
+            # - '## OpenFOAM-v2106 update1'
+
+            item="$(echo "$line" | sed 's/^#*.*-v*//')"
+            case "$item" in
+            ("$version"*) active=true;;
+            esac
+        fi
+        continue
+        ;;
+    esac
+
+    # Strip leading space
+    line="$(echo "$line" | sed 's/^ *//')"
+
+    case "$line" in
+    ([-*]' '*)
+        # A markdown list item. Extract first after the bullet
+        item="$(echo "$line" | sed 's/^[-*] *//;s/ .*$//')"
+        if [ "$active" != true ] || [ -z "$item" ]
+        then
+            continue
+        elif [ -n "$optResolve" ]
+        then
+            dir="$(findSourceDir "$optResolve" "$item" 2>/dev/null)"
+            if [ -n "$dir" ]
+            then
+                echo "$dir"
+            else
+                echo "missing: $item" 1>&2
+            fi
+        else
+            echo "$item"  # Report item without resolving
+        fi
+        ;;
+    esac
+done < "$file"
+
+
+#------------------------------------------------------------------------------

etc/makeFiles/kahip/files

@@ -1,4 +1,6 @@
-/* NOTE: make any changes to this file in etc/wmakeFiles/ */
+/*
+ * NOTE: make any changes to this file in ThirdParty etc/wmakeFiles/
+ */
 
 interface/kaHIP_interface.cpp
 
@@ -66,5 +68,4 @@ algorithms/cycle_search.cpp
 partition/uncoarsening/refinement/cycle_improvements/cycle_refinement.cpp
 partition/uncoarsening/refinement/tabu_search/tabu_search.cpp
 
-
-LIB = $(FOAM_EXT_LIBBIN)/libkahip
+LIB = $(KAHIP_LIB_DIR)/libkahip

etc/makeFiles/kahip/options

@@ -1,5 +1,5 @@
 /*
- * NOTE: make any changes to this file in etc/wmakeFiles/
+ * NOTE: make any changes to this file in ThirdParty etc/wmakeFiles/
  * Must use -DNDEBUG to disable kahip debug mode.
  * Using -DMODE_NODESEP is not strictly required for building the library.
 */
@@ -8,10 +8,14 @@ EXE_INC = \
     ${c++LESSWARN} \
     ${COMP_OPENMP} \
     -DNDEBUG -DMODE_NODESEP \
-    -I$(KAHIP_LIB_SRC) \
-    -I$(KAHIP_LIB_SRC)/partition \
-    -I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement
+    -I. \
+    -I./partition \
+    -I./partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement
 
 LIB_LIBS =
-
 PROJECT_LIBS =
+
+/* failsafe location */
+ifeq (,$(strip $(KAHIP_LIB_DIR)))
+KAHIP_LIB_DIR = $(FOAM_EXT_LIBBIN)
+endif

etc/makeFiles/libccmio/files

@@ -1,4 +1,6 @@
-/* NOTE: make any changes to this file in etc/makeFiles/ */
+/*
+ * NOTE: make any changes to this file in ThirdParty etc/makeFiles/
+*/
 
 libadf/ADF_interface.c
 libadf/ADF_internals.c
@@ -19,4 +21,4 @@ libccmio/ccmioversion.c
  libcgns/cgnslib.c
 */
 
-LIB = $(FOAM_EXT_LIBBIN)/libccmio
+LIB = $(CCMIO_LIB_DIR)/libccmio

etc/makeFiles/libccmio/options

@@ -1,7 +1,10 @@
-/* NOTE: make any changes to this file in etc/makeFiles/ */
-
-EXE_INC =
+/* NOTE: make any changes to this file in ThirdParty etc/wmakeFiles/ */
 
+EXE_INC = -I.
 LIB_LIBS =
-
 PROJECT_LIBS =
+
+/* failsafe location */
+ifeq (,$(strip $(CCMIO_LIB_DIR)))
+CCMIO_LIB_DIR = $(FOAM_EXT_LIBBIN)
+endif

etc/makeFiles/scotch/Makefile.inc.Darwin.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -29,19 +29,28 @@ CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
-    -DCOMMON_FILE_COMPRESS_GZ \
+    -UCOMMON_FILE_COMPRESS \
     -DCOMMON_RANDOM_FIXED_SEED \
     -DSCOTCH_DETERMINISTIC \
     -DSCOTCH_RENAME \
+    -DIDXSIZE64 \
     -Drestrict=__restrict
 
-# 32-bit vs. 64-bit labels
+# Use 32/64-bit integers
+# ---------------
+# Unfortunately -DINT32 seems to fail when openmpi is build without
+# Fortran! The MPI_INT32_T is interpreted as MPI_INTEGER4 which does
+# not exist
+# ---------------
+# ifeq ($(WM_LABEL_SIZE),32)
+# CFLAGS     += -DINTSIZE32
+# endif
 ifeq ($(WM_LABEL_SIZE),64)
 CFLAGS     += -DINTSIZE64
 endif
 
 CLIBFLAGS   =
-LDFLAGS     = $(WM_LDFLAGS) -lz -lm
+LDFLAGS     = $(WM_LDFLAGS) -lm
 
 MAKE        = make
 CP          = cp
@@ -50,7 +59,10 @@ LN          = ln
 MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
-LEX         = flex -Pscotchyy -olex.yy.c
-YACC        = bison -pscotchyy -y -b y
+
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

etc/makeFiles/scotch/Makefile.inc.Linux-Mingw.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -26,28 +26,46 @@ OBJ         = .o
 # Separate the cross-compilation flags from regular CFLAGS to ensure that
 # system gcc does not use them for the scotch build toolchain
 
-CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
+# cross-compile broken for scotch-v7
+CFLAGS_CROSS = -DCOMMON_STUB_FORK -DCOMMON_WINDOWS
+
+# Flags for including windows MPI information (MSMPI)
+CFLAGS_WINMPI = -I$(MPI_ARCH_PATH)/include \
+    -DMSMPI_NO_SAL -DMSMPI_NO_DEPRECATE_20 \
+    -D_MPICH_DLL_
 
 AR          = x86_64-w64-mingw32-gcc
 ARFLAGS     = $(CFLAGS) -shared -Wl,--output-def,libscotch.def,--out-implib,libscotch.a,--enable-auto-import,--strip-all -o
 CC          = x86_64-w64-mingw32-gcc $(CFLAGS_CROSS)
-CCS         = x86_64-w64-mingw32-gcc
-CCP         = x86_64-w64-mingw32-gcc
-CCD         = gcc
+CCS         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCP         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCD         = gcc $(CFLAGS_WINMPI)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
-    -DCOMMON_PTHREAD_FILE \
+    -DCOMMON_PTHREAD_FILE -DSCOTCH_PTHREAD \
     -UCOMMON_FILE_COMPRESS \
     -DCOMMON_RANDOM_FIXED_SEED \
     -DSCOTCH_DETERMINISTIC \
     -DSCOTCH_RENAME \
-    -DSCOTCH_PTHREAD \
+    -DIDXSIZE64 \
     -Drestrict=__restrict
 
-# 32-bit vs. 64-bit labels
+# Use 32/64-bit integers
+# ---------------
+# Unfortunately -DINT32 seems to fail when openmpi is build without
+# Fortran! The MPI_INT32_T is interpreted as MPI_INTEGER4 which does
+# not exist
+# ---------------
+# ifeq ($(WM_LABEL_SIZE),32)
+# CFLAGS     += -DINTSIZE32
+# endif
 ifeq ($(WM_LABEL_SIZE),64)
 CFLAGS     += -DINTSIZE64
 endif
 
+# Non-standard "__stdcall" in MSMPI <mpi.h>
+CCDFLAGS    = $(CFLAGS) -D__stdcall=''
+
+
 CLIBFLAGS   = -shared
 LDFLAGS     =
 
@@ -58,7 +76,10 @@ LN          = ln
 MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
-LEX         = flex -Pscotchyy -olex.yy.c
-YACC        = bison -pscotchyy -y -b y
+
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

etc/makeFiles/scotch/Makefile.inc.Linux.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -29,19 +29,28 @@ CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
-    -DCOMMON_FILE_COMPRESS_GZ \
+    -UCOMMON_FILE_COMPRESS \
     -DCOMMON_RANDOM_FIXED_SEED \
     -DSCOTCH_DETERMINISTIC \
     -DSCOTCH_RENAME \
+    -DIDXSIZE64 \
     -Drestrict=__restrict
 
-# 32-bit vs. 64-bit labels
+# Use 32/64-bit integers
+# ---------------
+# Unfortunately -DINT32 seems to fail when openmpi is build without
+# Fortran! The MPI_INT32_T is interpreted as MPI_INTEGER4 which does
+# not exist
+# ---------------
+# ifeq ($(WM_LABEL_SIZE),32)
+# CFLAGS     += -DINTSIZE32
+# endif
 ifeq ($(WM_LABEL_SIZE),64)
 CFLAGS     += -DINTSIZE64
 endif
 
 CLIBFLAGS   = -shared
-LDFLAGS     = -Xlinker --no-as-needed $(WM_LDFLAGS) -lz -lm -lrt
+LDFLAGS     = -Xlinker --no-as-needed $(WM_LDFLAGS) -lm -lrt
 
 MAKE        = make
 CP          = cp
@@ -50,7 +59,10 @@ LN          = ln
 MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
-LEX         = flex -Pscotchyy -olex.yy.c
-YACC        = bison -pscotchyy -y -b y
+
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

etc/patches/scotch-v7.0.1

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/patches/scotch_6.0.7

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/patches/scotch_6.0.8

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/patches/scotch_6.0.9

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/patches/scotch_6.1.0

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/pkgconfigAdjust

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/pkgconfigAdjust
@@ -33,29 +34,27 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-. etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [directory1 [... directoryN]]
+Usage: ${0##*/} [OPTION] [dir1 [... dirN]]
 options:
   -help
 
 Adjust pkgconfig files after relocating third-party files.
 Locates pkgconfig files under the lib/ or lib64/ directories and adjusts them
-to use '${prefix}' instead of absolute directory paths where possible.
+to use '\${prefix}' instead of absolute directory paths where possible.
 
 USAGE
-    exit 1
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 
@@ -64,7 +63,8 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -*) echo "Ignore unknown option" 1>&2 ;;
 
     *)
         pkgconfigAdjust "$1"

etc/pkgconfigPrefix

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/pkgconfigPrefix
@@ -26,25 +27,23 @@
 #
 #     This allows this type of shell command
 #
-#        etc/pkgconfigPrefix $(find platforms -type d -name pkgconfig)
+#        etc/pkgconfigPrefix $(find platforms -name pkgconfig -type d)
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-. etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [directory1 [... directoryN]]
+Usage: ${0##*/} [OPTION] [dir1 [... dirN]]
 options:
   -help
 
@@ -52,7 +51,7 @@ Set the 'prefix=' entry for pkgconfig files.
 The pkgconfig files are located under lib/pkgconfig or lib64/pkgconfig.
 
 USAGE
-    exit 1
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 
@@ -61,7 +60,7 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
 
     *)
         pkgconfigNewPrefix "$1"

etc/relocateQt

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/relocateQt
@@ -21,21 +21,19 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-. etc/tools/ThirdPartyFunctions
-. etc/tools/QtFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/QtFunctions
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [qt-VERSION]
+Usage: ${0##*/} [OPTION] [qt-VERSION]
 options:
   -force            Create qt.conf and edit pkgconfig to use \${prefix}
   -help
@@ -46,7 +44,7 @@ with a QT installation.
 * adjust relocation prefix for $qtVERSION
 
 USAGE
-    exit 1
+    exit 0 # Clean exit
 }
 #------------------------------------------------------------------------------
 unset optForce
@@ -56,12 +54,12 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
 
     -f | -force)
         optForce=true
         ;;
-    -qt-[1-9]* | [1-9]* | qt-*)
+    -qt-[0-9]* | [0-9]* | qt-*)
         # -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
         qtVERSION="${1%%/}";
         qtVERSION="${qtVERSION##*-}"
@@ -74,16 +72,17 @@ do
 done
 
 #------------------------------------------------------------------------------
-QT_ARCH_PATH=$installBASE/qt-$qtVERSION
 
-[ -n "$qtVERSION" ]    || die "No QT version specified"
-[ -d "$QT_ARCH_PATH" ] || die "No QT installation"
+PKG_PREFIX="$installBASE/qt-$qtVERSION"
+
+[ -n "$qtVERSION" ]  || die "No QT version specified"
+[ -d "$PKG_PREFIX" ] || die "No QT installation"
 
 if [ "${optForce:-false}" = true ]
 then
     # Create qt.conf and adjust locations to use '${prefix}' internally
-    finalizeQt
+    finalizeQt "$PKG_PREFIX"
 fi
-pkgconfigNewPrefix $QT_ARCH_PATH
+pkgconfigNewPrefix "$PKG_PREFIX"
 
 # -----------------------------------------------------------------------------

etc/testThirdPartyFunctions

@@ -3,15 +3,16 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
-#     testThirdPartyFunctions
+#     etc/testThirdPartyFunctions
 #
 # Description
 #     Simple ad hoc tests of etc/tools/ThirdPartyFunctions
@@ -25,7 +26,7 @@ echo "CXX=$CXX"
 echo
 echo ========================================
 
-. "$WM_THIRD_PARTY_DIR/etc/tools/ThirdPartyFunctions"
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 
 #------------------------------------------------------------------------------
 

etc/tools/CMakeFunctions

@@ -0,0 +1,57 @@
+#---------------------------------*- sh -*-------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# File
+#     etc/tools/CMakeFunction
+#
+# Description
+#     CMake make/install helper functions
+#
+#------------------------------------------------------------------------------
+
+# Variables referenced by the functions. Initialization at the end of the file.
+unset CMAKE_VARIABLES
+unset withVERBOSE
+BUILD_TYPE=Release  # The cmake build type
+
+#------------------------------------------------------------------------------
+
+#
+# Set CMake cache variables.
+# Automatically adds -D prefix it needed
+#
+addCMakeVariable()
+{
+    local i
+    for i
+    do
+        case "$i" in
+        ('') ;;  # empty
+        (-*) CMAKE_VARIABLES="${CMAKE_VARIABLES} ${i}" ;;
+        (*)  CMAKE_VARIABLES="${CMAKE_VARIABLES} -D${i}" ;;
+        esac
+    done
+}
+
+#
+# Verbose makefiles
+#
+addVerbosity()
+{
+    if [ "${withVERBOSE:=false}" = true ]
+    then
+        addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
+    fi
+}
+
+
+#------------------------------------------------------------------------------

etc/tools/ParaViewFunctions

@@ -2,24 +2,24 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/ParaViewFunctions
 #
 # Description
 #     ParaView make/install helper functions
+#     To be loaded *after* etc/tools/CMakeFunctions
 #
 # Note
-#     Obtaining paths via 'python-config' is possible, but may not always
-#     resolve properly:
+#     Obtaining paths via 'python-config' may not always resolve properly:
 #
 #         python-config --includes
 #         >>
@@ -38,6 +38,7 @@ unset withMPI     MPI_MAX_PROCS
 unset withQT      QT_VERSION      QMAKE_PATH
 unset withMESA    MESA_INCLUDE    MESA_LIBRARY    withOSMESA
 unset withPYTHON  PYTHON_INCLUDE  PYTHON_LIBRARY
+unset withPYTHON3
 unset withGL2
 BUILD_TYPE=Release  # The cmake build type
 
@@ -49,43 +50,62 @@ BUILD_TYPE=Release  # The cmake build type
 # Where things are or should be put
 #   ParaView_VERSION and ParaView_MAJOR should already have been set
 #
-#   ParaView_SOURCE_DIR : location of the original sources
-#   ParaView_BUILD_DIR  : location of the build
-#   ParaView_DIR        : location of the installed program
+#   PARAVIEW_SOURCEDIR : location of the original sources
+#   PARAVIEW_BUILDDIR  : location of the build
+#   ParaView_DIR       : location of the installed program
 #
 setParaViewDirs()
 {
     set -- "ParaView-$ParaView_VERSION" "ParaView-v$ParaView_VERSION"
+    unset PARAVIEW_SOURCEDIR PARAVIEW_BUILDDIR
 
-    unset ParaView_SOURCE_DIR
-    for i
+    # search
+    # - ThirdParty/PACKAGE
+    # - ThirdParty/sources/PACKAGE
+    # - ThirdParty/sources/paraview/PACKAGE
+    # - ThirdParty/sources/vtk/PACKAGE
+    for package in "$@"
     do
-        ParaView_SOURCE_DIR="$sourceBASE/$i"
-        [ -d "$ParaView_SOURCE_DIR" ] && break
+        for check in \
+            "$package" \
+            "sources/$package" \
+            "sources/paraview/$package" \
+            "sources/vtk/$package" \
+        ;
+        do
+            if [ -d "$sourceBASE/$check" ]
+            then
+                echo "Found sources: $check" 1>&2
+                PARAVIEW_SOURCEDIR="$sourceBASE/$check"
+                break 2
+            fi
+        done
     done
 
-    [ -d "$ParaView_SOURCE_DIR" ] || {
+    [ -d "$PARAVIEW_SOURCEDIR" ] || {
         echo "Did not locate ParaView version:"
         while [ "$#" -ge 1 ]; do echo "    $1"; shift; done
         echo
         echo "In the directory:"
         echo "    $sourceBASE"
+        echo "    \-- sources/paraview"
+        echo "       |-- paraview"
+        echo "       \\-- vtk"
         echo
         echo "abort build"
         exit 1
     }
 
-    ParaView_BUILD_DIR=$buildBASE/ParaView-$ParaView_VERSION$BUILD_SUFFIX
-    ParaView_DIR=$installBASE/ParaView-$ParaView_VERSION$BUILD_SUFFIX
+    PARAVIEW_BUILDDIR="$buildBASE/ParaView-$ParaView_VERSION$BUILD_SUFFIX"
+    ParaView_DIR="$installBASE/ParaView-$ParaView_VERSION$BUILD_SUFFIX"
+    export GIT_DIR="$PARAVIEW_SOURCEDIR/.git"  # Avoid seeing our own git-repo
 
-    export ParaView_SOURCE_DIR ParaView_BUILD_DIR ParaView_DIR
+    export PARAVIEW_SOURCEDIR PARAVIEW_BUILDDIR ParaView_DIR
 
     echo
-    echo "ParaView_SOURCE_DIR=$ParaView_SOURCE_DIR"
-    echo "ParaView_BUILD_DIR=$ParaView_BUILD_DIR"
     echo "ParaView_DIR=$ParaView_DIR"
-
-    export GIT_DIR=$ParaView_SOURCE_DIR/.git # Mask seeing our own git-repo
+    echo "PARAVIEW_SOURCEDIR=$PARAVIEW_SOURCEDIR"
+    echo "PARAVIEW_BUILDDIR=$PARAVIEW_BUILDDIR"
 }
 
 
@@ -113,27 +133,20 @@ setParaViewVersion()
 
 #------------------------------------------------------------------------------
 
-#
-# Set CMake cache variables
-#
-addCMakeVariable()
-{
-    local i
-    for i
-    do
-        [ -n "$i" ] && CMAKE_VARIABLES="$CMAKE_VARIABLES -D$i"
-    done
-}
-
+# addCMakeVariable : defined in etc/tools/CMakeFunctions
+# addVerbosity : defined in etc/tools/CMakeFunctions
 
 #
-# Verbose makefiles
+# General settings (version-dependent)
 #
-addVerbosity()
+addGeneral()
 {
-    if [ "${withVERBOSE:=false}" = true ]
+    if printf "${ParaView_MAJOR}"'\n%s\n' 5.6 | sort -V -C
     then
-        addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
+        # Paraview 5.6 and older
+        addCMakeVariable "BUILD_SHARED_LIBS=ON"
+    else
+        addCMakeVariable "PARAVIEW_BUILD_SHARED_LIBS=ON"
     fi
 }
 
@@ -153,6 +166,10 @@ addMpiSupport()
     then
         addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
     fi
+
+    echo "----"
+    echo "MPI information:"
+    echo "    home           : $MPI_HOME"
 }
 
 
@@ -166,9 +183,17 @@ addPythonSupport()
         return
     fi
 
-    local pythonBin pythonConfig pythonMajor
+    local pythonBin="python"
+    local pythonConfig="python-config"
+    local pythonMajor
 
-    pythonBin=$(which python 2>/dev/null) || {
+    if [ "$withPYTHON3" = true ]
+    then
+        pythonBin="python3"
+        pythonConfig="python3-config"
+    fi
+
+    pythonBin=$(which "$pythonBin" 2>/dev/null) || {
         echo "*** Error: python not found"
         echo "***        Deactivate python support by not using the -python "
         echo "***        option"
@@ -187,7 +212,7 @@ addPythonSupport()
 
         # Fallback: get PYTHON_LIBRARY from dynamically linked binary
 
-        PYTHON_LIBRARY=$(ldd $pythonBin | \
+        PYTHON_LIBRARY=$(ldd "$pythonBin" | \
             sed -ne '/libpython/s/^.* => \(.*\) (.*/\1/p')
 
         [ -e "$PYTHON_LIBRARY" ] || {
@@ -205,7 +230,7 @@ addPythonSupport()
     }
 
     # Guess major from library
-    pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
+    pythonMajor=$(echo "$PYTHON_LIBRARY" | sed 's/.*libpython\(.*\)\.so.*/\1/')
 
     if [ -n "$PYTHON_INCLUDE" ]
     then
@@ -215,12 +240,12 @@ addPythonSupport()
             echo "*** Error: Python.h not found at location specified " \
                  "by -python-include : PYTHON_INCLUDE=$PYTHON_INCLUDE"
 
-    elif pythonConfig=$(which python-config 2>/dev/null)
+    elif pythonConfig=$(which "$pythonConfig" 2>/dev/null)
     then
         # Guess from python-config
         # parse '-I/usr/include/python2.7 -I/usr/include/python2.7'
         # -> '/usr/include/python2.7'
-        PYTHON_INCLUDE=$(python-config --includes | sed -ne 's/^-I\([^ ][^ ]*\).*$/\1/p')
+        PYTHON_INCLUDE=$("$pythonConfig" --includes | sed -ne 's/^-I\([^ ][^ ]*\).*$/\1/p')
 
     else
 
@@ -236,7 +261,13 @@ addPythonSupport()
         exit 1
     }
 
-    addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON"
+    if printf "${ParaView_MAJOR}"'\n%s\n' 5.7 | sort -V -C
+    then
+        # Paraview 5.7 and older
+        addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON"
+    else
+        addCMakeVariable "PARAVIEW_USE_PYTHON=ON"
+    fi
     addCMakeVariable "PYTHON_INCLUDE_DIRS=$PYTHON_INCLUDE"
     addCMakeVariable "PYTHON_LIBRARY=$PYTHON_LIBRARY"
 
@@ -259,7 +290,7 @@ addMesaSupport()
         return
     fi
 
-    if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
+    if [ -d "$MESA_INCLUDE" ] && [ -f "$MESA_LIBRARY" ]
     then
         addCMakeVariable "VTK_OPENGL_HAS_OSMESA=ON"
         addCMakeVariable "OSMESA_INCLUDE_DIR=$MESA_INCLUDE"
@@ -296,20 +327,27 @@ addQtSupport()
     QT_VERSION=none
     : ${withQT:=true}  # default is on
 
+    local qmake qtLib
+    local cmakeVarName="PARAVIEW_USE_QT"
+
+    if printf "${ParaView_MAJOR}"'\n%s\n' 5.7 | sort -V -C
+    then
+        # Paraview 5.7 and older
+        cmakeVarName="PARAVIEW_BUILD_QT_GUI"
+    fi
+
     if [ "$withQT" = false ]
     then
         # Explicitly disabled
-        addCMakeVariable "PARAVIEW_BUILD_QT_GUI=OFF"
+        addCMakeVariable "$cmakeVarName=OFF"
         return
     fi
 
-    local qmake qtLib
-
     # Check qmake can be found and handle version differences
     qmake=$(findQMake)
     if QT_VERSION=$($qmake -query QT_VERSION 2>/dev/null)
     then
-        addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
+        addCMakeVariable "$cmakeVarName=ON"
 
         case "$QT_VERSION" in
         (3.* | 4.[0-4]*)
@@ -366,7 +404,7 @@ ERROR
 #
 patchParaView()
 {
-    applyPatch "paraview-$ParaView_VERSION" "$ParaView_SOURCE_DIR"
+    applyPatch "paraview-$ParaView_VERSION" "$PARAVIEW_SOURCEDIR"
 }
 
 
@@ -378,17 +416,17 @@ configParaView()
     local cmake=$(findCMake)
 
     # Remove any existing build folder and recreate
-    if [ -d $ParaView_BUILD_DIR ]
+    if [ -d "$PARAVIEW_BUILDDIR" ]
     then
         echo "removing old build directory"
-        echo "    $ParaView_BUILD_DIR"
-        rm -rf $ParaView_BUILD_DIR
+        echo "    $PARAVIEW_BUILDDIR"
+        rm -rf "$PARAVIEW_BUILDDIR"
     fi
-    mkdir -p $ParaView_BUILD_DIR
+    mkdir -p "$PARAVIEW_BUILDDIR"
 
     addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"
 
-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$PARAVIEW_BUILDDIR" || exit  # Change to build folder
 
     echo "----"
     echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR)"
@@ -397,26 +435,26 @@ configParaView()
     echo "    MESA   support : ${withMESA:-false}"
     echo "    GL2  rendering : ${withGL2:-false}"
     echo "    QT dev support : ${withQT:-true}"
-    echo "    Source         : $ParaView_SOURCE_DIR"
-    echo "    Build          : $ParaView_BUILD_DIR"
+    echo "    Source         : $PARAVIEW_SOURCEDIR"
+    echo "    Build          : $PARAVIEW_BUILDDIR"
     echo "    Target         : $ParaView_DIR"
     echo "    cmake          : $cmake"
     echo "    Build suffix   : ${BUILD_SUFFIX:-none}"
     echo "----"
     echo
     echo "$cmake" \
-        -DCMAKE_INSTALL_PREFIX=$ParaView_DIR \
+        -DCMAKE_INSTALL_PREFIX="$ParaView_DIR" \
         $CMAKE_VARIABLES \
-        $ParaView_SOURCE_DIR
+        "$PARAVIEW_SOURCEDIR"
     echo
     echo "----"
     echo
 
     # Run cmake to create Makefiles
     $cmake \
-        -DCMAKE_INSTALL_PREFIX=$ParaView_DIR \
+        -DCMAKE_INSTALL_PREFIX="$ParaView_DIR" \
         $CMAKE_VARIABLES \
-        $ParaView_SOURCE_DIR
+        "$PARAVIEW_SOURCEDIR"
 }
 
 
@@ -426,7 +464,7 @@ configParaView()
 #
 makeParaView()
 {
-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$PARAVIEW_BUILDDIR" || exit  # Change to build folder
     echo "    Starting make"
     time make -j $WM_NCOMPPROCS
     echo "    Done make"
@@ -445,7 +483,7 @@ makeParaView()
 #
 installParaView()
 {
-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$PARAVIEW_BUILDDIR" || exit  # Change to build folder
     echo "    Installing ParaView to $ParaView_DIR"
 
     make install
@@ -471,7 +509,7 @@ INFO
     # Non-system installation of QT?
     case "$qtLib" in (/usr/lib | /usr/lib64) unset qtLib ;; esac
 
-    if [ "${qmake%/*}" != /usr/bin -a -d "$qtLib" ]
+    if [ "${qmake%/*}" != /usr/bin ] && [ -d "$qtLib" ]
     then
         /bin/cat<<INFO
 
@@ -487,7 +525,9 @@ INFO
 #------------------------------------------------------------------------------
 
 # Start with these general settings
-addCMakeVariable "BUILD_SHARED_LIBS=ON" "BUILD_TESTING=OFF"
+
+# No testing
+addCMakeVariable "BUILD_TESTING=OFF"
 
 # Include development files in "make install"
 addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"

etc/tools/QtFunctions

@@ -2,14 +2,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/QtFunction
@@ -33,18 +33,17 @@ unset qtVERSION # No default version
 #
 createQtConf()
 {
-    local confFile="$QT_ARCH_PATH/bin/qt.conf"
-
-    if [ -n "$QT_ARCH_PATH" -a -d "$QT_ARCH_PATH/bin" ]
+    local prefix="$1"
+    if [ -n "$prefix" ] && [ -d "$prefix/bin" ]
     then
-        /bin/cat << QT_CONF > $confFile
+        /bin/cat << QT_CONF > "$prefix/bin/qt.conf"
 [Paths]
-Prefix=$QT_ARCH_PATH
+Prefix="$prefix"
 QT_CONF
         echo "    created qt.conf"
 
     else
-        echo "Error: QT_ARCH_PATH not correctly set"
+        echo "Error: qt-prefix <$prefix> not correctly set"
     fi
 }
 
@@ -56,9 +55,10 @@ QT_CONF
 #
 finalizeQt()
 {
+    local prefix="$1"
     echo "Create/Edit files to ease later relocation of a QT installation"
-    createQtConf
-    pkgconfigAdjust $QT_ARCH_PATH
+    createQtConf "$prefix"
+    pkgconfigAdjust "$prefix"
 }
 
 

etc/tools/ThirdPartyFunctions

@@ -2,14 +2,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/ThirdPartyFunctions
@@ -23,7 +23,12 @@
 #     Compiler and flags are managed via the 'wmake -show-c, -show-cflags, ..'
 #     but also with WM_CC, WM_CFLAGS,... env variables
 #
+# Files
+#     Uses OpenFOAM/etc/config.sh/cmake (if it exists) for the
+#     CMAKE_ARCH_PATH that may specify a possible cmake/bin directory.
+#
 #------------------------------------------------------------------------------
+umask 0022  # Created files to be readable by all
 
 # The normal locations for source, build and installation (prefix-dir)
 sourceBASE="$WM_THIRD_PARTY_DIR"
@@ -33,13 +38,107 @@ installBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 # Synthetic value combining precision and label size (Eg, DPInt32)
 WM_SIZE_OPTIONS="${WM_PRECISION_OPTION}Int${WM_LABEL_SIZE}"
 
+#------------------------------------------------------------------------------
+# Make adjustments for non-standard build locations
+
+# Specified a build-root
+if [ -n "$FOAM_THIRD_PARTY_BUILDROOT" ]
+then
+    if [ ! -d "$FOAM_THIRD_PARTY_BUILDROOT" ]
+    then
+        dir="$(dirname "$FOAM_THIRD_PARTY_BUILDROOT")"
+        if [ -d "$dir" ] && [ -w "$dir" ]
+        then
+            mkdir -m 0755 -p "$FOAM_THIRD_PARTY_BUILDROOT"
+        fi
+        # Also checks for failure of previous mkdir
+        if [ ! -d "$FOAM_THIRD_PARTY_BUILDROOT" ]
+        then
+            echo "Build-root: $FOAM_THIRD_PARTY_BUILDROOT" 1>&2
+            echo "Has invalid parent: $dir" 1>&2
+            exit 2
+        fi
+    fi
+    echo "Using build-root: $FOAM_THIRD_PARTY_BUILDROOT" 1>&2
+
+    # build/
+    _buildDir="${FOAM_THIRD_PARTY_BUILDROOT}/build"
+    mkdir -m 0755 -p "$_buildDir"
+
+    # Fully resolved
+    dir="$(cd "$_buildDir" 2>/dev/null && pwd -L)"
+    if [ -n "$dir" ]
+    then
+        buildBASE="$dir/$WM_ARCH$WM_COMPILER"
+        echo "Using build-dir: $dir" 1>&2
+    else
+        echo "Invalid build-dir: $_buildDir" 1>&2
+        exit 2
+    fi
+
+    # platforms/
+    _platformsDir="${FOAM_THIRD_PARTY_BUILDROOT}/platforms"
+    mkdir -m 0755 -p "$_platformsDir"
+
+    # Fully resolved
+    dir="$(cd "$_platformsDir" 2>/dev/null && pwd -L)"
+    if [ -n "$dir" ]
+    then
+        installBASE="$dir/$WM_ARCH$WM_COMPILER"
+        echo "Using platforms-dir: $dir" 1>&2
+    else
+        echo "Invalid platforms-dir: $_platformsDir" 1>&2
+        exit 2
+    fi
+
+    # Installation with non-standard platforms location
+    nonStandardPlatforms() { true; }
+else
+    # Installation with standard platforms location
+    nonStandardPlatforms() { false; }
+fi
+
+
+# sources/
+if [ -n "$FOAM_THIRD_PARTY_SOURCES" ]
+then
+    # Fully resolved
+    dir="$(cd "$FOAM_THIRD_PARTY_SOURCES" 2>/dev/null && pwd -L)"
+    if [ -n "$dir" ]
+    then
+        sourceBASE="$dir"
+        echo "Using sources-dir: $dir" 1>&2
+    else
+        echo "Invalid sources-dir: $FOAM_THIRD_PARTY_SOURCES" 1>&2
+        exit 2
+    fi
+fi
+
+
+#------------------------------------------------------------------------------
+
 # Dynamic library ending (default is .so)
 EXT_SO="$(wmake -show-ext-so 2>/dev/null)"
 if [ -z "$EXT_SO" ]
 then
-    [ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+    EXT_SO=.so
+    case "$WM_OSTYPE" in
+    *windows)
+        EXT_SO=.dll
+        ;;
+    *)
+        [ Darwin = "$(uname -s 2>/dev/null)" ] && EXT_SO=.dylib
+        ;;
+    esac
 fi
 
+# True if OS is <darwin>.
+# Test EXT_SO for ".dylib" - avoid repeated uname system call
+isDarwin()
+{
+    [ "$EXT_SO" = .dylib ]
+}
+
 
 # Fallback values, needed for our scotch Makefile which uses
 # WM_CFLAGS and WM_LDFLAGS for arch information
@@ -54,49 +153,127 @@ then
 fi
 
 unset BUILD_SUFFIX
+
+
 #------------------------------------------------------------------------------
+# Check for existence of shared library (without .so extension)
+#
+# $1 = The path and library stem
+#
+haveLibso()
+{
+    if [ -z "$1" ]
+    then
+        return 1
+    elif [ -r "$1$EXT_SO" ]
+    then
+        return 0
+    elif [ "$EXT_SO" = .dll ] && [ -r "$1.dll.a" ]
+    then
+        # Including cross-compiling
+        return 0
+    fi
+
+    return 2
+}
+
+
+#------------------------------------------------------------------------------
+# Service routine to strip out OpenFOAM-specific portions from the compiler
+# flags (ie, everything after and including "-DOPENFOAM=...")
+# while retaining '-fPIC'
+#
+# $1 = all flags concatenated as a single string
+#
+stripCompilerFlags()
+{
+    local flags="${1%-DOPENFOAM=*}"      # Strip out OpenFOAM-specific
+    flags="${flags## }"                  # Trim leading space
+    flags="${flags%% }"                  # Trim trailing space
+
+    # Retain -fPIC though
+    case "$flags" in
+    (*-fPIC*)
+        # -fPIC already included
+        ;;
+
+    (*)
+        case "$1" in
+        (*-fPIC*)
+            # Add -fPIC back in (was after -DOPENFOAM=... content)
+            flags="$flags${flags+ }-fPIC"
+            ;;
+        esac
+        ;;
+    esac
+
+    echo "$flags"
+}
+
+
 # Export compiler settings (and flags) for CMake/configure
 # based on the values from wmake -show-compile-*
 #
 # Since "wmake -show-XX" is only available after 1904, continue to support
 # the previous env variables method (WM_CC, WM_CFLAGS, WM_CXX, WM_CXXFLAGS)
+#
+# $1 = "basic|minimal|strip" (optional)
+#
+# If the option 'basic' is provided, the OpenFOAM-specific portions of
+# the flags are stripped out. Ie, everything after "-DOPENFOAM=..."
+# but retaining '-fPIC'
+#
 exportCompiler()
 {
+    local option="$1"
     local comp flag
 
     # C compiler and flags
-    comp="$(wmake -show-c 2>/dev/null)" && \
-    flag="$(wmake -show-cflags 2>/dev/null)" || {
+    if ! comp="$(wmake -show-c 2>/dev/null)" \
+    || ! flag="$(wmake -show-cflags 2>/dev/null)"
+    then
         comp="$WM_CC"
         flag="$WM_CFLAGS"
-    }
+    fi
 
     if test -n "$comp" && command -v "$comp" >/dev/null
     then
         export CC="$comp"
         if [ -n "$flag" ]
         then
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags "$flag")"
+                    ;;
+            esac
             export CFLAGS="$flag"
         fi
     fi
 
     # C++ compiler and flags
-    comp="$(wmake -show-cxx 2>/dev/null)" && \
-    flag="$(wmake -show-cxxflags 2>/dev/null)" || {
+    if ! comp="$(wmake -show-cxx 2>/dev/null)" \
+    || ! flag="$(wmake -show-cxxflags 2>/dev/null)"
+    then
         comp="$WM_CXX"
         flag="$WM_CXXFLAGS"
-    }
+    fi
 
     if test -n "$comp" && command -v "$comp" >/dev/null
     then
         export CXX="$comp"
         if [ -n "$flag" ]
         then
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags "$flag")"
+                    ;;
+            esac
             export CXXFLAGS="$flag"
         fi
     fi
 }
 
+
 # Export linker settings for CMake/configure
 exportLinker()
 {
@@ -119,6 +296,16 @@ useGcc()
     export CXX=g++
 }
 
+
+# Force use of system gcc/g++ (wmake compilation) without changing the
+# WM_OPTIONS or output directories
+useGccWmake()
+{
+    export WM_COMPILER=Gcc
+    export WM_COMPILER_TYPE=system
+}
+
+
 # Scan arguments for a '-gcc' option, forcing gcc/g++ when found
 useGccFlag()
 {
@@ -137,15 +324,29 @@ useGccFlag()
 # Final fallback is <gcc>
 whichCC()
 {
+    local fallback='gcc'
     local comp="$CC"
+    local warn
 
     if [ -z "$comp" ]
     then
         comp="$(wmake -show-c 2>/dev/null)" || comp="$WM_CC"
-        test -n "$comp" && command -v "$comp" >/dev/null || unset comp
+        if [ -n "$comp" ]
+        then
+            if ! command -v "$comp" >/dev/null
+            then
+                warn="C compiler '$comp' not found in path."
+                unset comp
+            fi
+        else
+            warn="No C compiler found via wmake."
+        fi
+        if [ -n "$warn" ]
+        then
+            echo "${warn} Defaulting to '${fallback}'" 1>&2
+        fi
     fi
-
-    echo "${comp:-gcc}"
+    echo "${comp:-$fallback}"
 }
 
 
@@ -154,25 +355,47 @@ whichCC()
 # Final fallback is <g++>
 whichCXX()
 {
+    local fallback='g++'
     local comp="$CXX"
+    local warn
 
     if [ -z "$comp" ]
     then
         comp="$(wmake -show-cxx 2>/dev/null)" || comp="$WM_CXX"
-        test -n "$comp" && command -v "$comp" >/dev/null || unset comp
+        if [ -n "$comp" ]
+        then
+            if ! command -v "$comp" >/dev/null
+            then
+                warn="CXX compiler '$comp' not found in path."
+                unset comp
+            fi
+        else
+            warn="No CXX compiler found via wmake."
+        fi
+        if [ -n "$warn" ]
+        then
+            echo "${warn} Defaulting to '${fallback}'" 1>&2
+        fi
     fi
-
-    echo "${comp:-g++}"
+    echo "${comp:-$fallback}"
 }
 
 
-# Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
+# Return
+#   <mpicc> by default
+#   <mpifcc> for FJMPI (if possible)
+#   <mpiicc> for INTELMPI (if possible)
+#
 # Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
 # NOTE: could further refine based on "wmake -show-c", but not yet needed
 whichMpicc()
 {
-    local comp="$(command -v mpicc)"
+    local fallback='mpicc'
+    local comp="$(command -v $fallback)"
     case "$WM_MPLIB" in
+    (FJMPI)
+        comp="$(command -v mpifcc)"     # Fujitsu <mpifcc> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicc)"     # Intel <mpiicc> available?
         ;;
@@ -180,46 +403,61 @@ whichMpicc()
         : "${comp:=cc}"                 # Cray <cc> if there is no <mpicc>
         ;;
     esac
-    echo "${comp:-mpicc}"
+    echo "${comp:-$fallback}"
 }
 
 
-# Return <mpicxx> by default or <mpiicpc> if possible for INTELMPI.
+# Return
+#   <mpicxx> by default
+#   <mpiFCC> for FJMPI (if possible)
+#   <mpiicpc> for INTELMPI (if possible)
+#
 # Cray doesn't have <mpicxx>, but its <CC> manages mpi paths directly.
 # NOTE: could further refine based on "wmake -show-cxx", but not yet needed
 whichMpicxx()
 {
-    local comp="$(command -v mpicxx)"
+    local fallback='mpicxx'
+    local comp="$(command -v $fallback)"
     case "$WM_MPLIB" in
+    (FJMPI)
+        comp="$(command -v mpiFCC)"     # Fujitsu <mpiFCC> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicpc)"    # Intel <mpiicpc> available?
         ;;
     (CRAY-MPI*)
-        : "${comp:=CC}"                 # Cray <CC> if there is no <mpicc>
+        : "${comp:=CC}"                 # Cray <CC> if there is no <mpicxx>
         ;;
     esac
-    echo "${comp:-mpicxx}"
+    echo "${comp:-$fallback}"
 }
 
 # Require wmkdepend etc when building with wmake
+# before 2020-04-03: wmake/platforms/linux64Gcc
+# after  2020-04-03: platforms/tools/linux64Gcc
 requireWMakeToolchain()
 {
+    local archName="$WM_ARCH$WM_COMPILER"
     local wmDir="${WM_DIR:-$WM_PROJECT_DIR/wmake}"
-    local archDir="$wmDir/platforms/$WM_ARCH$WM_COMPILER"
+    local archDir1="$wmDir/platforms/$archName"
+    local archDir2="$WM_PROJECT_DIR/platforms/tools/$archName"
 
-    if [ -x "$archDir/wmkdepend" ] || [ -x "$archDir/wmkdep" ]
+    if [ -x "$archDir1/wmkdepend" ] || [ -x "$archDir1/wmkdep" ] || \
+       [ -x "$archDir2/wmkdepend" ] || [ -x "$archDir2/wmkdep" ]
     then
         echo "Appear to have {wmkdepend,wmkdep} binary" 1>&2
     else
         echo "Warning: appear to be missing {wmkdepend,wmkdep} binary ... building" 1>&2
         ( cd "$wmDir/src" && make -s )
 
-        [ -x "$archDir/wmkdepend" ] || [ -x "$archDir/wmkdep" ] || {
+        [ -x "$archDir1/wmkdepend" ] || [ -x "$archDir1/wmkdep" ] || \
+        [ -x "$archDir2/wmkdepend" ] || [ -x "$archDir2/wmkdep" ] || {
             exec 1>&2
             echo
             echo "Error: cannot use wmake build for '${0##*/}"
             echo "    Missing {wmkdepend,wmkdep} binary"
-            echo "    Please try run the top-level OpenFOAM Allwmake first"
+            echo "    Please run the top-level OpenFOAM Allwmake first"
+            echo "    or top-level wmake/src/Allmake"
             echo
             exit 1
         }
@@ -227,6 +465,186 @@ requireWMakeToolchain()
 }
 
 
+# Require FOAM_EXT_LIBBIN for some compilations
+requireExtLibBin()
+{
+    [ -n "$FOAM_EXT_LIBBIN" ] || {
+        exec 1>&2
+        echo
+        echo "Error: \$FOAM_EXT_LIBBIN not set for '${0##*/}"
+        echo "    Check your OpenFOAM environment and installation"
+        echo
+        exit 1
+    }
+}
+
+
+# grep for package http or ftp entries in BUILD.md
+# Should be of the form "[link xx]:  http://..."
+showDownloadHint()
+{
+    local package
+
+    if [ -f "$WM_THIRD_PARTY_DIR/BUILD.md" ]
+    then
+        for package in "$@"
+        do
+            echo "Possible download locations for $package :" 1>&2
+
+            if [ -f "$WM_THIRD_PARTY_DIR/BUILD.md" ]
+            then
+                grep -i "$package" "$WM_THIRD_PARTY_DIR/BUILD.md" | \
+                grep -E '(http|ftp)' | sed -ne 's/^ *\[.*\]: */    /p' | \
+                uniq
+            fi
+        done
+    else
+        echo "No BUILD.md available" 1>&2
+    fi
+}
+
+
+#
+# Resolve the appropriate source directory for the given PACKAGE
+#
+# checks:
+# - ThirdParty/PACKAGE
+# - ThirdParty/sources/PACKAGE
+# - ThirdParty/sources/canonical/PACKAGE
+#
+# Where the 'canonical' name is simply the lowercase version of PACKAGE
+# without any version information.
+# Eg, "ParaView-5.9.0" -> "paraview"
+# but also accept "0config-v1.2" -> "0config"
+#
+# Optional flags:
+#   -absolute : report absolute path [default]
+#   -relative : report path relative to sourceBASE (ThirdParty)
+#
+findSourceDir()
+{
+    local package subdir optRelative
+
+    case "$1" in
+    (-abs*)
+        optRelative=false
+        shift
+        ;;
+    (-rel*)
+        optRelative=true
+        shift
+        ;;
+    esac
+
+    for package in "$@"
+    do
+        subdir="$(basename "$package" | tr '[:upper:]' '[:lower:]' |\
+            sed -ne 's#^\([0-9]*[a-z]*\).*#\1#p')"
+
+        for check in \
+            "$package" \
+            "$subdir/$package" \
+            "sources/$package" \
+            "sources/$subdir/$package" \
+        ;
+        do
+            if [ -d "$sourceBASE/$check" ]
+            then
+                echo "Found sources: $check" 1>&2
+
+                if [ "${optRelative:-false}" = true ]
+                then
+                    echo "$check"
+                else
+                    echo "$sourceBASE/$check"
+                fi
+                return 0
+            fi
+        done
+    done
+
+    # Fallback. Report if missing (unless none or system)
+    case "${1##*-}" in
+    (none | system)
+        ;;
+    (*)
+        echo "Did not find ... $@" 1>&2
+    esac
+
+    echo "$sourceBASE/${1:-missing-package-name}"
+}
+
+
+# List available unpacked source versions
+#
+# checks:
+# - ThirdParty/PACKAGE
+# - ThirdParty/sources/PACKAGE
+# - ThirdParty/sources/canonical/PACKAGE
+#
+# Output style
+#  -dirs  : report the names with relative directory
+#  -names : report the names only (without directory)
+#  -long  : report the names with full (absolute) directory
+listPackageVersions()
+{
+    local package
+
+    local optOutput=short
+    case "$1" in
+    (-long | -full)
+        optOutput=long
+        shift
+        ;;
+    (-dirs | -short)
+        optOutput=dirs
+        shift
+        ;;
+    (-names)
+        optOutput=names
+        shift
+        ;;
+    esac
+
+    if [ "$#" -gt 0 ]
+    then
+    (
+        cd "$sourceBASE" 2>/dev/null || exit
+
+        for package in "$@"
+        do
+            # Canonical short name
+            package="$(basename "$package" | tr '[:upper:]' '[:lower:]' |\
+                sed -ne 's#^\([0-9]*[a-z]*\).*$#\1#p')"
+
+            [ -n "$package" ] || continue
+
+            for dir in . ./"$package" sources sources/"$package"
+            do
+                # Find package-version (ie, when it has separators)
+                find "$dir" -maxdepth 1 \
+                -iname "${package}*[-_]*" -type d 2>/dev/null | \
+                sed -e 's#^[./]*##' | sort
+            done | \
+            case "$optOutput" in
+            (long)
+                sed -e "s#^#$sourceBASE/#"  # Add source-dir prefix
+                ;;
+            (names)
+                # Basenames only. Squash out potential duplicates
+                sed -e 's#^.*/##' | sort | uniq
+                ;;
+            (*)
+                # Relative - no change
+                sed -e ''
+                ;;
+            esac
+        done
+    )
+    fi
+}
+
+
 #------------------------------------------------------------------------------
 # Some functions as per OpenFOAM etc/config.sh/functions
 
@@ -273,12 +691,15 @@ setBuildSuffix()
 #
 # Mostly building without wmake
 # - disable wmakeScheduler variables
-# - use max number of cores for building
+# - use max number of cores for building, unless already defined
 #
 unset WM_HOSTS WM_SCHEDULER
 
-WM_NCOMPPROCS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) || WM_NCOMPPROCS=1
-: ${WM_NCOMPPROCS:=1}
+if [ -z "$WM_NCOMPPROCS" ]
+then
+    WM_NCOMPPROCS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
+    : "${WM_NCOMPPROCS:=1}"
+fi
 export WM_NCOMPPROCS
 
 
@@ -342,6 +763,7 @@ _foamIsSystem()
 unset CMAKE_PATH # clear when first loaded
 findCMake()
 {
+    local config="config.sh/cmake"
     local candidate foundExe
 
     if [ -n "$CMAKE_PATH" ]
@@ -350,13 +772,13 @@ findCMake()
         if [ -d "$CMAKE_PATH" ]
         then
             for candidate in \
-                $CMAKE_PATH/cmake \
-                $CMAKE_PATH/bin/cmake \
+                "$CMAKE_PATH"/cmake \
+                "$CMAKE_PATH"/bin/cmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -366,14 +788,14 @@ findCMake()
         if [ -z "$foundExe" ]
         then
             for candidate in \
-                $CMAKE_PATH \
-                $installBASE/$CMAKE_PATH/bin/cmake \
-                $installBASE/cmake-$CMAKE_PATH/bin/cmake \
+                "$CMAKE_PATH" \
+                "$installBASE/$CMAKE_PATH"/bin/cmake \
+                "$installBASE/cmake-$CMAKE_PATH"/bin/cmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -387,26 +809,45 @@ findCMake()
                 foundExe="$(cd ${foundExe%/cmake} 2>/dev/null && pwd)/cmake"
             fi
             echo "Using cmake=$foundExe" 1>&2
-            echo $foundExe
+            echo "$foundExe"
             return 0
         else
             cat << NOT_FOUND 1>&2
 'cmake' not found under specified CMAKE_PATH
     CMAKE_PATH=$CMAKE_PATH
-reverting to using command from path
+reverting to using command from $config or from PATH
 NOT_FOUND
         fi
     fi
 
+    unset cmake_version CMAKE_ARCH_PATH
+    if candidate="$("$WM_PROJECT_DIR"/bin/foamEtcFile "$config" 2>/dev/null)"
+    then
+        . "$candidate"
+
+        for candidate in \
+            "$CMAKE_ARCH_PATH"/bin/cmake \
+            "$installBASE/$cmake_version"/bin/cmake \
+        ;
+        do
+            if [ -f "$candidate" ] && [ -x "$candidate" ]
+            then
+                echo "Using cmake=$candidate" 1>&2
+                echo "$candidate"
+                return 0
+            fi
+        done
+    fi
+
     # Default to use the path, try resolving (so we know what we are using).
     for candidate in cmake
     do
-        foundExe=$(command -v $candidate 2>/dev/null) && break
+        foundExe="$(command -v "$candidate" 2>/dev/null)" && break
     done
-    : ${foundExe:=false}
+    : "${foundExe:=false}"
 
     echo "Using cmake=$foundExe" 1>&2
-    echo $foundExe
+    echo "$foundExe"
 }
 
 
@@ -427,13 +868,13 @@ findQMake()
         if [ -d "$QMAKE_PATH" ]
         then
             for candidate in \
-                $QMAKE_PATH/qmake \
-                $QMAKE_PATH/bin/qmake \
+                "$QMAKE_PATH"/qmake \
+                "$QMAKE_PATH"/bin/qmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -443,14 +884,14 @@ findQMake()
         if [ -z "$foundExe" ]
         then
             for candidate in \
-                $QMAKE_PATH \
-                $installBASE/$QMAKE_PATH/bin/qmake \
-                $installBASE/qt-$QMAKE_PATH/bin/qmake \
+                "$QMAKE_PATH" \
+                "$installBASE/$QMAKE_PATH"/bin/qmake \
+                "$installBASE/qt-$QMAKE_PATH"/bin/qmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -464,13 +905,13 @@ findQMake()
                 foundExe="$(cd ${foundExe%/qmake} 2>/dev/null && pwd)/qmake"
             fi
             echo "Using qmake=$foundExe" 1>&2
-            echo $foundExe
+            echo "$foundExe"
             return 0
         else
             cat << NOT_FOUND 1>&2
 'qmake' not found under specified QMAKE_PATH
     QMAKE_PATH=$QMAKE_PATH
-reverting to using command from path
+reverting to using command from PATH
 NOT_FOUND
         fi
     fi
@@ -479,9 +920,9 @@ NOT_FOUND
     # Some systems have qmake-qt5 as well as qmake
     for candidate in qmake-qt5 qmake
     do
-        foundExe=$(command -v $candidate 2>/dev/null) && break
+        foundExe="$(command -v "$candidate" 2>/dev/null)" && break
     done
-    : ${foundExe:=false}
+    : "${foundExe:=false}"
 
     echo "Using qmake=$foundExe" 1>&2
     echo $foundExe
@@ -495,7 +936,7 @@ pkgconfigNewPrefix()
 {
     local dir="${1%%/}"
 
-    if [ -n "$dir" -a -d "$dir" ]
+    if [ -n "$dir" ] && [ -d "$dir" ]
     then
         # Require absolute path, but use logical (not physical) location
         [ "${dir}" != "${dir#/}" ] || dir=$(cd $dir 2>/dev/null && /bin/pwd -L)
@@ -521,7 +962,7 @@ pkgconfigNewPrefix()
         [ -d "$dir/$libdir" ] || continue
         for i in $dir/$libdir/*.pc
         do
-            if [ -f "$i" -a ! -L "$i" ]
+            if [ -f "$i" ] && [ ! -L "$i" ]
             then
                 nfiles="x$nfiles"
                 sed -i~ -e 's@^\(prefix=\).*$@\1'"$dir@" $i
@@ -543,7 +984,7 @@ pkgconfigAdjust()
 {
     local dir="${1%%/}"
 
-    if [ -n "$dir" -a -d "$dir" ]
+    if [ -n "$dir" ] && [ -d "$dir" ]
     then
         # Require absolute path, but use logical (not physical) location
         [ "${dir}" != "${dir#/}" ] || dir=$(cd $dir 2>/dev/null && /bin/pwd -L)
@@ -569,7 +1010,7 @@ pkgconfigAdjust()
         [ -d "$dir/$libdir" ] || continue
         for i in $dir/$libdir/*.pc
         do
-            if [ -f "$i" -a ! -L "$i" ]
+            if [ -f "$i" ] && [ ! -L "$i" ]
             then
                 nfiles="x$nfiles"
                 sed -i~ \
@@ -614,23 +1055,23 @@ downloadFile()
 # $2 = TARGET DIRECTORY (optional)
 cpMakeFiles()
 {
-    [ "$#" -eq 1 -o "$#" -eq 2 ] || {
+    [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || {
         echo "cpMakeFiles called with incorrect number of arguments $@"
         return 1
     }
 
-    local pkg=$1
+    local pkg="$1"
     local dst="${2:-.}"
-    echo "cpMakeFiles" $pkg $dst
+    echo "cpMakeFiles" "$pkg" "$dst"
 
-    wmakeFiles=$WM_THIRD_PARTY_DIR/etc/makeFiles/$pkg
+    wmakeFiles="$WM_THIRD_PARTY_DIR/etc/makeFiles/$pkg"
 
     for i in $(cd $wmakeFiles && find . -type f)
     do
-        d=${i%/*}   # dirname
-        b=${i##*/}   # basename
+        d="${i%/*}"   # dirname
+        b="${i##*/}"   # basename
 
-        mkdir -p $dst/$d/Make 2>/dev/null
+        mkdir -p "$dst/$d"/Make 2>/dev/null
 
         # NOTE the behaviour of '-nt' can cause problems
         #
@@ -640,9 +1081,9 @@ cpMakeFiles()
         # - dash, zsh (and maybe others)
         #   False, if file1 or file2 does not exist
         #
-        if [ ! -e $dst/$d/Make/$b -o $wmakeFiles/$i -nt $dst/$d/Make/$b ]
+        if [ ! -e "$dst/$d/Make/$b" -o "$wmakeFiles/$i" -nt "$dst/$d/Make/$b" ]
         then
-            cp $wmakeFiles/$i $dst/$d/Make/$b
+            cp "$wmakeFiles/$i" "$dst/$d/Make/$b"
         fi
     done
 }
@@ -670,7 +1111,7 @@ applyPatch()
     if [ -r "$patch" ]
     then
     (
-        cd $dst || exit 1
+        cd "$dst" || exit
         if [ -f "$sentinel" ]
         then
             echo "patch for $pkg was already applied"

etc/tools/vtkFunctions

@@ -2,19 +2,20 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/vtkFunctions
 #
 # Description
 #     VTK (library) make/install helper functions.
-#     To be loaded *after* etc/tools/ParaViewFunctions
+#     To be loaded *after* etc/tools/CMakeFunctions, ParaViewFunctions
 #
 #------------------------------------------------------------------------------
 
@@ -29,43 +30,62 @@ unset CMAKE_VARIABLES
 # Where things are or should be put
 #   VTK_VERSION and VTK_MAJOR should already have been set
 #
-#   VTK_SOURCE_DIR : location of the original sources
-#   VTK_BUILD_DIR  : location of the build
-#   VTK_DIR        : location of the installed program
+#   VTK_SOURCEDIR : location of the original sources
+#   VTK_BUILDDIR  : location of the build
+#   VTK_DIR       : location of the installed program
 #
 setVtkDirs()
 {
     set -- "VTK-$VTK_VERSION" "VTK-v$VTK_VERSION"
-    unset VTK_SOURCE_DIR
+    unset VTK_SOURCEDIR VTK_BUILDDIR
 
-    for i
+    # search
+    # - ThirdParty/PACKAGE
+    # - ThirdParty/sources/PACKAGE
+    # - ThirdParty/sources/vtk/PACKAGE
+    # - ThirdParty/sources/paraview/PACKAGE
+    for package in "$@"
     do
-        VTK_SOURCE_DIR="$sourceBASE/$i"
-        [ -d "$VTK_SOURCE_DIR" ] && break
+        for check in \
+            "$package" \
+            "sources/$package" \
+            "sources/vtk/$package" \
+            "sources/paraview/$package" \
+        ;
+        do
+            if [ -d "$sourceBASE/$check" ]
+            then
+                echo "Found sources: $check" 1>&2
+                VTK_SOURCEDIR="$sourceBASE/$check"
+                break 2
+            fi
+        done
     done
 
-    [ -d "$VTK_SOURCE_DIR" ] || {
+    [ -d "$VTK_SOURCEDIR" ] || {
         echo "Did not locate VTK version:"
         while [ "$#" -ge 1 ]; do echo "    $1"; shift; done
         echo
         echo "In the directory:"
         echo "    $sourceBASE"
+        echo "    \-- sources/paraview"
+        echo "       |-- vtk"
+        echo "       \\-- paraview"
         echo
         echo "abort build"
         exit 1
     }
 
-    VTK_BUILD_DIR=$buildBASE/VTK-$VTK_VERSION$BUILD_SUFFIX
-    VTK_DIR=$installBASE/VTK-$VTK_VERSION$BUILD_SUFFIX
+    VTK_BUILDDIR="$buildBASE/VTK-$VTK_VERSION$BUILD_SUFFIX"
+    VTK_DIR="$installBASE/VTK-$VTK_VERSION$BUILD_SUFFIX"
+    export GIT_DIR="$VTK_SOURCEDIR/.git"   # Avoid seeing our own git-repo
 
-    export VTK_SOURCE_DIR VTK_BUILD_DIR VTK_DIR
+    export VTK_SOURCEDIR VTK_BUILDDIR VTK_DIR
 
     echo
-    echo "VTK_SOURCE_DIR=$VTK_SOURCE_DIR"
-    echo "VTK_BUILD_DIR=$VTK_BUILD_DIR"
     echo "VTK_DIR=$VTK_DIR"
-
-    export GIT_DIR=$VTK_SOURCE_DIR/.git # Mask seeing our own git-repo
+    echo "VTK_SOURCEDIR=$VTK_SOURCEDIR"
+    echo "VTK_BUILDDIR=$VTK_BUILDDIR"
 }
 
 
@@ -98,7 +118,7 @@ setVtkVersion()
 #
 patchVTK()
 {
-    applyPatch "vtk-$VTK_VERSION" "$VTK_SOURCE_DIR"
+    applyPatch "vtk-$VTK_VERSION" "$VTK_SOURCEDIR"
 }
 
 
@@ -110,41 +130,41 @@ configVTK()
     local cmake=$(findCMake)
 
     # Remove any existing build folder and recreate
-    if [ -d $VTK_BUILD_DIR ]
+    if [ -d "$VTK_BUILDDIR" ]
     then
         echo "removing old build directory"
-        echo "    $VTK_BUILD_DIR"
-        rm -rf $VTK_BUILD_DIR
+        echo "    $VTK_BUILDDIR"
+        rm -rf "$VTK_BUILDDIR"
     fi
-    mkdir -p $VTK_BUILD_DIR
+    mkdir -p "$VTK_BUILDDIR"
 
     addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"
 
-    cd $VTK_BUILD_DIR || exit 1  # change to build folder
+    cd "$VTK_BUILDDIR" || exit  # Change to build folder
 
     echo "----"
     echo "Configuring VTK-$VTK_VERSION"
     echo "    MESA   support : ${withMESA:-false}"
-    echo "    Source         : $VTK_SOURCE_DIR"
-    echo "    Build          : $VTK_BUILD_DIR"
+    echo "    Source         : $VTK_SOURCEDIR"
+    echo "    Build          : $VTK_BUILDDIR"
     echo "    Target         : $VTK_DIR"
     echo "    cmake          : $cmake"
     echo "    Build suffix   : ${BUILD_SUFFIX:-none}"
     echo "----"
     echo
     echo "$cmake" \
-        -DCMAKE_INSTALL_PREFIX=$VTK_DIR \
+        -DCMAKE_INSTALL_PREFIX="$VTK_DIR" \
         $CMAKE_VARIABLES \
-        $VTK_SOURCE_DIR
+        "$VTK_SOURCEDIR"
     echo
     echo "----"
     echo
 
     # Run cmake to create Makefiles
     $cmake \
-        -DCMAKE_INSTALL_PREFIX=$VTK_DIR \
+        -DCMAKE_INSTALL_PREFIX="$VTK_DIR" \
         $CMAKE_VARIABLES \
-        $VTK_SOURCE_DIR
+        "$VTK_SOURCEDIR"
 }
 
 
@@ -167,6 +187,10 @@ addMpiSupport()
     then
         addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
     fi
+
+    echo "----"
+    echo "MPI information:"
+    echo "    home           : $MPI_HOME"
 }
 
 
@@ -176,7 +200,7 @@ addMpiSupport()
 #
 makeVTK()
 {
-    cd $VTK_BUILD_DIR || exit 1  # Change to build folder
+    cd "$VTK_BUILDDIR" || exit  # Change to build folder
     echo "    Starting make"
     time make -j $WM_NCOMPPROCS
 
@@ -193,7 +217,7 @@ makeVTK()
 #
 installVTK()
 {
-    cd $VTK_BUILD_DIR || exit 1  # Change to build folder
+    cd "$VTK_BUILDDIR" || exit  # Change to build folder
     echo "    Installing VTK to $VTK_DIR"
 
     make install

makeADIOS

@@ -1,358 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
-#
-# Script
-#     makeADIOS
-#
-# Description
-#     Build script for ADIOS
-#
-# ----------------------------------------------
-# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
-#------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-#------------------------------------------------------------------------------
-
-# ADIOS version from OpenFOAM etc/config.sh file:
-_foamConfig ADIOS
-
-adiosPACKAGE=${adios_version:-adios-none}
-
-#------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: ${0##*/} [OPTION] [adios-VERSION] [-- configure-options]
-options:
-  -gcc          Force use of gcc/g++
-  -cmake PATH   With cmake from the given path
-  -help
-
-* Build ADIOS
-      $adiosPACKAGE
-
-USAGE
-    exit 1
-}
-#------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags for CMake/configure
-
-# Parse options
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    '') ;;      # Ignore empty
-    --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
-
-    -cmake)
-        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
-        CMAKE_PATH="${2%%/}"
-        shift
-        ;;
-    ADIOS-[1-9]* | adios-[1-9]* | ADIOS-git* | adios-git*)
-        adiosPACKAGE="${1%%/}"
-        ;;
-
-    *)
-        die "unknown option/argument: '$1'"
-        ;;
-    esac
-    shift
-done
-
-[ -n "$adiosPACKAGE" ] || die "The adios-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$adiosPACKAGE"
-then
-    echo "Using adios-none (skip ThirdParty build of ADIOS)"
-    exit 0
-elif _foamIsSystem "$adiosPACKAGE"
-then
-    echo "Using adios-system"
-    exit 0
-fi
-
-#------------------------------------------------------------------------------
-#
-# Build ADIOS
-#   ADIOS_SOURCE_DIR : location of the original sources
-#   ADIOS_ARCH_PATH  : installation directory
-
-ADIOS_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
-ADIOS_ARCH_PATH=$installBASE/$adiosPACKAGE
-
-: ${FOAM_MPI:=dummy}
-
-echo
-echo ========================================
-echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
-echo
-
-
-#
-# Manual adjustments to adios config
-#
-adjustADIOS()
-{
-    # Rename libraries according to FOAM_MPI
-    (
-        cd $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH || exit 1
-
-        if [ "$FOAM_MPI" != dummy ]
-        then
-            \mv -f libadios.a       libadios_$FOAM_MPI.a
-            \mv -f libadiosread.a   libadiosread_$FOAM_MPI.a
-        fi
-        \mv -f libadios_nompi.a     libadios_dummy.a
-        \mv -f libadiosread_nompi.a libadiosread_dummy.a
-
-        echo
-        echo "ADIOS library renamed to libadios_$FOAM_MPI"
-        echo
-    )
-
-    # We don't need/use XML things
-    \rm -f $ADIOS_ARCH_PATH/bin/adios_lint
-
-    # Replace resolved paths with variables
-    echo "Adjust prefix for ADIOS"
-    for i in \
-        $ADIOS_ARCH_PATH/bin/adios_config \
-        $ADIOS_ARCH_PATH/etc/adios_config.flags \
-    ;
-    do
-        [ -f "$i" ] || {
-            echo "    no such file - '$i'"
-            continue
-        }
-        if sed -i -e 's|'"$WM_THIRD_PARTY_DIR"'|$WM_THIRD_PARTY_DIR|g' $i
-        then
-            echo "    '$i'"
-        else
-            echo "    problems with '$i'"
-        fi
-    done
-
-    # Adjust the config flags file:
-    # * Remove references to Fortran libraries (disabled in configure)
-    # * Remove references to deprecated version 1 API
-    # * Cleanup excessive whitespace
-    # * Handle renamed libraries:
-    #   - libadios       -> libadios_$FOAM_MPI
-    #   - libadios_nompi -> libadios_dummy
-    #
-    echo "Adjust library names for ADIOS"
-    for i in \
-        $ADIOS_ARCH_PATH/etc/adios_config.flags \
-    ;
-    do
-        [ -f "$i" ] || {
-            echo "    no such file - '$i'"
-            continue
-        }
-
-        if sed -i \
-            -e '/_FLIB=/d' \
-            -e '/_V1_INC=/d' \
-            -e 's|  *| |g' \
-            -e 's|\(-ladios[a-z]*_\)nompi |\1dummy |g' \
-            $i
-        then
-            echo "    '$i'"
-        else
-            echo "    problems with '$i'"
-        fi
-
-        if [ "$FOAM_MPI" != dummy ]
-        then
-            sed -i -e 's|\(-ladios[a-z]*\) |\1_'"$FOAM_MPI |g" $i || \
-            echo "    problems with '$i'"
-        fi
-    done
-}
-
-#
-# List ADIOS methods/configuration
-#
-listMethods()
-{
-    [ -f $ADIOS_ARCH_PATH/bin/adios_config ] || {
-        echo "Warning: no adios_config"
-        return 1
-    }
-
-    echo "==============="
-
-    # May have problems listing parallel methods (eg, transport key missing)
-    if $ADIOS_ARCH_PATH/bin/adios_config -m >/dev/null 2>&1
-    then
-        $ADIOS_ARCH_PATH/bin/adios_config -m 2>/dev/null
-    else
-        echo "Warning: could not list parallel methods"
-        # Fallback to serial methods
-        $ADIOS_ARCH_PATH/bin/adios_config -s -m 2>/dev/null
-    fi || echo "Warning: could not list configured methods"
-    echo "==============="
-
-}
-
-
-# Needs future adjustment
-# - for shared library
-# - for mpi-specific library locations
-if [ -f $ADIOS_ARCH_PATH/include/adios.h \
-  -a -r $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
-then
-    echo "    ADIOS header in $ADIOS_ARCH_PATH/include"
-    ### echo "    ADIOS libs   in $FOAM_EXT_LIBBIN"           # dynamic
-    echo "    ADIOS libs   in $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
-    listMethods
-elif [ -z "$CMAKE_PATH" ]
-then
-    echo "Starting build: $adiosPACKAGE (using configure)"
-    echo
-    (
-        # Configuration options:
-        unset configOpt
-
-        # Add InfiniBand support
-        ibDir=/usr/local/ofed
-        if [ -d "$ibDir" -a "$FOAM_MPI" != dummy ]
-        then
-            configOpt="$configOpt --with-infiniband=$ibDir"
-        fi
-
-        # Transport layers
-        if [ -f /usr/include/bzlib.h ]
-        then
-            configOpt="$configOpt --with-bzip2"
-        fi
-
-        if [ -f /usr/include/zlib.h ]
-        then
-            configOpt="$configOpt --with-zlib"
-        fi
-
-        # Other types of support
-        ## configOpt="$configOpt --with-hdf5=..."
-        ## configOpt="$configOpt --with-lustre=..."
-        ## configOpt="$configOpt --enable-research-transports"
-
-        # Additional configure options
-        if [ "$1" = "--" ]
-        then
-            shift
-            configOpt="$configOpt $@"
-        fi
-
-        # End of configuration options
-        # ----------------------------
-        buildDIR=$buildBASE/$adiosPACKAGE
-
-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        [ -e Makefile ] && make distclean 2>/dev/null
-
-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
-
-        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
-
-        [ -f configure ] || {
-            echo "no configure for $adiosPACKAGE ... trying autogen"
-            ./autogen.sh
-        }
-
-        # May not work properly with FOAM_MPI = dummy
-        if [ "$FOAM_MPI" = dummy ]
-        then
-            configOpt="$configOpt --without-mpi"
-        else
-            CC=mpicc
-            CXX=mpicxx
-        fi
-
-        # Install into lib64/
-        cd $buildDIR && $ADIOS_SOURCE_DIR/configure \
-            --prefix=$ADIOS_ARCH_PATH \
-            --libdir=$ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
-            --disable-fortran \
-            --with-pic \
-            --without-fastbit \
-            $configOpt \
-        && make -j $WM_NCOMPPROCS all \
-        && make install \
-        && echo "Built: $adiosPACKAGE" \
-        && adjustADIOS \
-        && listMethods
-    ) || {
-        echo "Error building: $adiosPACKAGE"
-    }
-else
-    # CMake options often lag the configure ones
-    echo "Starting build: $adiosPACKAGE (using cmake)"
-    echo
-    (
-        buildDIR=$buildBASE/$adiosPACKAGE
-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
-
-        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
-
-        # May not work properly with FOAM_MPI = dummy
-        if [ "$FOAM_MPI" = dummy ]
-        then
-            configOpt="$configOpt --without-mpi"
-        else
-            CC=mpicc
-            CXX=mpicxx
-        fi
-
-        cmake=$(findCMake)
-
-        # Install into lib64/
-        cd $buildDIR && $cmake \
-            -DCMAKE_INSTALL_PREFIX=$ADIOS_ARCH_PATH \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_FORTRAN=FALSE \
-            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
-            $ADIOS_SOURCE_DIR \
-        && make -j $WM_NCOMPPROCS all \
-        && make install \
-        && echo "Built: $adiosPACKAGE" \
-        && adjustADIOS \
-        && listMethods
-    ) || {
-        echo "Error building: $adiosPACKAGE"
-    }
-fi
-
-# -----------------------------------------------------------------------------

makeADIOS2

@@ -1,172 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
-#
-# Script
-#     makeADIOS2
-#
-# Description
-#     Build script for ADIOS2
-#
-# ----------------------------------------------
-# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
-#------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-#------------------------------------------------------------------------------
-# ADIOS2 version from OpenFOAM etc/config.sh file:
-_foamConfig ADIOS2
-
-adios2PACKAGE=${adios2_version:-adios-none}
-
-#------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: ${0##*/} [OPTION] [adios-VERSION]
-options:
-  -gcc          Force use of gcc/g++
-  -cmake PATH   With cmake from the given path
-  -help
-
-* Build ADIOS2
-      $adios2PACKAGE
-
-USAGE
-    exit 1
-}
-#------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags for CMake/configure
-
-# Parse options
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    '') ;;      # Ignore empty
-    -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
-
-    -cmake)
-        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
-        CMAKE_PATH="${2%%/}"
-        shift
-        ;;
-    ADIOS2-[1-9]* | adios2-[1-9]* | ADIOS2-git* | adios2-git*)
-        adios2PACKAGE="${1%%/}"
-        ;;
-    *)
-        die "unknown option/argument: '$1'"
-        ;;
-    esac
-    shift
-done
-
-[ -n "$adios2PACKAGE" ] || die "The adios2-VERSION was not specified"
-
-# nothing to build
-if _foamIsNone "$adios2PACKAGE"
-then
-    echo "Using adios-none (skip ThirdParty build of ADIOS)"
-    exit 0
-elif _foamIsSystem "$adios2PACKAGE"
-then
-    echo "Using adios-system"
-    exit 0
-fi
-
-#------------------------------------------------------------------------------
-#
-# Build ADIOS
-#   ADIOS2_SOURCE_DIR : location of the original sources
-#   ADIOS2_ARCH_PATH  : installation directory
-
-ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE
-ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE
-
-# Some hacked in value, for binding in ADIOS1 as well (for the reader)
-# Don't know if this is still needed
-if [ -n "$ADIOS1_ARCH_PATH" ]
-then
-    ADIOS1_ARCH_PATH=$installBASE/ADIOS-1.13.0
-fi
-if [ -d "$ADIOS1_ARCH_PATH" ]
-then
-    export ADIOS1_ROOT="$ADIOS1_ARCH_PATH"
-fi
-
-
-: ${FOAM_MPI:=dummy}
-
-echo
-echo ========================================
-echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
-echo
-
-
-# Needs future adjustment
-# - for shared library
-# - for mpi-specific library locations
-if [ -f $ADIOS2_ARCH_PATH/include/adios.h \
-  -a -r $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
-then
-    echo "    ADIOS2 header in $ADIOS2_ARCH_PATH/include"
-    ### echo "    ADIOS2 libs   in $FOAM_EXT_LIBBIN"           # dynamic
-    echo "    ADIOS2 libs   in $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
-else
-    # CMake options often lag the configure ones
-    echo "Starting build: $adios2PACKAGE (using cmake)"
-    echo
-    (
-        buildDIR=$buildBASE/$adios2PACKAGE
-        cd $ADIOS2_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        applyPatch $adios2PACKAGE $ADIOS2_SOURCE_DIR
-
-        # Remove any existing build folder and recreate
-        rm -rf $ADIOS2_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
-
-        # May not work properly with FOAM_MPI = dummy
-        if [ "$FOAM_MPI" = dummy ]
-        then
-            configOpt="$configOpt --without-mpi"
-        else
-            CC=mpicc
-            CXX=mpicxx
-        fi
-
-        cmake=$(findCMake)
-
-        # Install into lib64/
-        cd $buildDIR && $cmake \
-            -DCMAKE_INSTALL_PREFIX=$ADIOS2_ARCH_PATH \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DADIOS2_USE_Fortran=FALSE \
-            -DADIOS1_USE_STATIC_LIBS=TRUE \
-            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
-            $ADIOS2_SOURCE_DIR \
-        && make -j $WM_NCOMPPROCS all \
-        && make install \
-        && echo "Built: $adios2PACKAGE"
-    ) || {
-        echo "Error building: $adios2PACKAGE"
-    }
-fi
-
-# -----------------------------------------------------------------------------

makeAdios2

@@ -0,0 +1,232 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# Script
+#     makeAdios2
+#
+# Description
+#     Build script for ADIOS2
+#
+# ----------------------------------------------
+# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
+#------------------------------------------------------------------------------
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+
+# Short-circuit test for an installation
+if [ "$1" = "-test" ]
+then
+    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="adios2"
+    libName="libadios2"
+    libName2="libadios2_cxx11_mpi"
+    for lib in \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        "$dir/lib/$libName2$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName2$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
+    exit 2
+fi
+#------------------------------------------------------------------------------
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
+#------------------------------------------------------------------------------
+# Obtain version from OpenFOAM etc/config.sh file:
+_foamConfig adios2
+
+PACKAGE="${adios2_version:-none}"
+
+# Hint for cmake findMPI
+if [ -d "$MPI_ARCH_PATH" ]
+then
+    export MPI_HOME="$MPI_ARCH_PATH"
+fi
+
+#------------------------------------------------------------------------------
+printVersions() { listPackageVersions adios; exit 0; }
+printHelp() {
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [adios-VERSION]
+options:
+  -force            Force compilation, even if include/library already exists
+  -gcc              Force use of gcc/g++
+  -cmake PATH       With cmake from the given path
+  -mpi-home PATH    With hint for MPI_HOME
+  -DNAME=VALUE      add cmake variable
+  -list             List available unpacked source versions
+  -help             Display usage help
+
+* Build ADIOS2
+      ${PACKAGE:-[unspecified]}
+
+USAGE
+    showDownloadHint adios2
+    exit 0  # Clean exit
+}
+#------------------------------------------------------------------------------
+exportCompiler minimal  # Minimal compiler info for CMake/configure
+
+unset optForce
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
+    -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+
+    -cmake)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        CMAKE_PATH="${2%%/}"
+        shift
+        ;;
+    -mpi-home) # mpi with hint
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        export MPI_HOME="${2%%/}"
+        case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
+        shift
+        ;;
+
+    adios/* | sources/ADIOS* | sources/adios* | \
+    ADIOS2-[0-9]* | ADIOS2-git* | ADIOS-[0-9]* | ADIOS-git* | \
+    adios2-[0-9]* | adios2-git* | adios-[0-9]* | adios-git*)
+        PACKAGE="${1%%/}"
+        ;;
+    -D[A-Z]*=* | [A-Z]*=*)  # cmake variables
+        addCMakeVariable "$1"
+        ;;
+    *)
+        die "unknown option/argument: '$1'"
+        ;;
+    esac
+    shift
+done
+
+if [ -z "$PACKAGE" ]
+then
+    die "The ADIOS package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
+then
+    echo "Using none/system (skip ThirdParty build of ADIOS)"
+    exit 0
+fi
+
+# Known build issues for mingw (various things)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ "$optForce" = true ]
+    then
+        echo "Warning: adios2 - known compilation issues with $WM_COMPILER"
+    else
+        echo "Skipping adios2 - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
+#------------------------------------------------------------------------------
+#
+# Build ADIOS
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
+
+: "${FOAM_MPI:=dummy}"
+
+echo
+echo ========================================
+echo "Build adios library $PACKAGE for $FOAM_MPI"
+echo
+
+# Needs future adjustment
+# - for mpi-specific library locations
+if [ -z "$optForce" ] \
+&& [ -f "$PKG_PREFIX/include/adios2.h" ] \
+&& {
+    [ -r "$PKG_PREFIX/lib/libadios2$EXT_SO" ] \
+ || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libadios2$EXT_SO" ]
+}
+then
+    echo "    ADIOS2 already built : $PKG_PREFIX"
+else
+    # CMake options often lag the configure ones
+    echo "Starting build: $PACKAGE (using cmake)"
+    echo
+    (
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
+
+        applyPatch "$PACKAGE" "$PKG_SOURCE"
+
+        # Remove any existing build folder and recreate
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
+
+        # May not work properly with FOAM_MPI = dummy
+        if [ "$FOAM_MPI" != dummy ]
+        then
+            CC=mpicc
+            CXX=mpicxx
+        fi
+
+        cmake=$(findCMake)
+
+        # Installs into lib64/
+        cd "$PKG_BUILD" && set -x && \
+        ${cmake:?} \
+            -DCMAKE_INSTALL_PREFIX="$PKG_PREFIX" \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DADIOS2_USE_Fortran=FALSE \
+            -DADIOS2_BUILD_EXAMPLES=FALSE \
+            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
+            "$PKG_SOURCE" \
+        && make -j $WM_NCOMPPROCS all \
+        && make install \
+        && echo "Built: $PACKAGE"
+    ) || {
+        echo "Error building: $PACKAGE"
+        exit 1
+    }
+fi
+
+# -----------------------------------------------------------------------------

makeCCMIO

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCCMIO
@@ -21,55 +21,51 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library ending (default is .so)
-[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
-
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 
 # libccmio version from OpenFOAM etc/config.sh file:
 _foamConfig ccmio
 
-ccmioPACKAGE=${ccmio_version:-libccmio-2.6.1}
+PACKAGE="${ccmio_version:-libccmio-2.6.1}"
 targetType=lib  # Default is static linkage
 
 #------------------------------------------------------------------------------
-usage()
-{
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    /bin/cat<<USAGE
+printVersions() { listPackageVersions ccmio libccmio; exit 0; }
+printHelp() {
+    cat<<USAGE
 
 Usage: ${0##*/} [OPTION] [lib|libso] [libccmio-VERSION]
 options:
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * Compile the proprietary libccmio library
-      $ccmioPACKAGE
+      $PACKAGE
 
   Users wishing to obtain the library should contact Siemens PLM (cd-adapco)
   for terms of use.
 
-  After obtaining the $ccmioPACKAGE library, place in folder
+  After obtaining the $PACKAGE library, place in folder
 
-      $WM_THIRD_PARTY_DIR/$ccmioPACKAGE/
+      $sourceBASE/$PACKAGE/
+  or  $sourceBASE/sources/$PACKAGE/
 
   prior to running this script.
 
 USAGE
-    exit 1
+    showDownloadHint ccmio
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 
@@ -78,14 +74,17 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
+    -gcc)       useGccWmake ;;
 
     lib|libso)
         targetType="$1"
         ;;
-    libccmio-[1-9]*)
-        ccmioPACKAGE="${1%%/}"
+
+    libccmio/* | sources/libccmio* | \
+    libccmio-[0-9]*)
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -95,58 +94,67 @@ do
 done
 
 requireWMakeToolchain
+requireExtLibBin
 
 #------------------------------------------------------------------------------
 #
 # Build LIBCCMIO
-#
-CCMIO_SOURCE_DIR=$sourceBASE/$ccmioPACKAGE
-CCMIO_ARCH_PATH=$installBASE/$ccmioPACKAGE
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
 # Sources must be available
-[ -d "$CCMIO_SOURCE_DIR" ] || die "Missing sources: '$ccmioPACKAGE'"
+[ -d "$PKG_SOURCE" ] || die "Missing sources: '$PACKAGE'"
 
 #
 # Manual installation
 #
 install()
 {
-    # Ensure a clean build next time
+    local incdir="$PKG_PREFIX"/include/libccmio
+
+    # Remove build artifacts from the source directory
+    # (for a clean build next time)
     wclean
 
-    local incdir=$CCMIO_ARCH_PATH/include/libccmio
+    echo
+    echo "Adjusting installation"
+    echo "Installing headers: $incdir"
 
-    # Make headers available:
-    mkdir -m 0755 -p $incdir
-
-    /bin/cp -pv libccmio/ccmio*.h $incdir
+    # Make headers available
+    mkdir -m 0755 -p "$incdir"
+    /bin/cp -pv "$PKG_SOURCE"/libccmio/ccmio*.h "$incdir"
 }
 
-echo "Starting build: $ccmioPACKAGE ($targetType)"
+echo "Starting build: $PACKAGE ($targetType)"
 echo
 (
-    cd $CCMIO_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-    rm -rf $CCMIO_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libccmio$EXT_SO
-
-    libdir=$CCMIO_ARCH_PATH/lib
+    cd "$PKG_SOURCE" || exit
+    rm -rf "$PKG_PREFIX"
+    rm -f "$FOAM_EXT_LIBBIN/libccmio$EXT_SO"
 
     cpMakeFiles libccmio 2>/dev/null
 
-    # Place static libraries in sub-directory:
-    if [ "$targetType" = lib ]
+    # Static libraries in sub-directory
+    export CCMIO_LIB_DIR="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH"
+
+    # Dynamic libraries directly into FOAM_EXT_LIBBIN
+    if [ "$targetType" = libso ]
     then
-        mkdir -m 0755 -p $libdir 2>/dev/null
-        export FOAM_EXT_LIBBIN=$libdir
+        CCMIO_LIB_DIR="$FOAM_EXT_LIBBIN"
     fi
+    mkdir -m 0755 -p "$CCMIO_LIB_DIR" 2>/dev/null
 
     wmake -j $WM_NCOMPPROCS -s $targetType \
-    && echo "Built: ccmio" \
+    && echo "Built: $PACKAGE" \
     && install
 ) || {
-    echo "Error building: ccmio"
+    echo "Error building: $PACKAGE"
     exit 1
 }
 

makeCGAL

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2012-2016 OpenFOAM Foundation
+#     Copyright (C) 2012-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCGAL
@@ -34,69 +34,112 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 3 ] || { echo "${0##*/} -test : needs 2 argument"; exit 1; }
-    dir="${2%/}" # <- CGAL_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libCGAL$EXT_SO" ]
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    # CGAL
+    [ -f "$dir"/include/CGAL/version.h ] || exit 2
+
+    unset _my_cgal_libdir
+    _cacheinfo="$dir"/share/openfoam-build
+    if [ -f "$_cacheinfo" ]
     then
-        echo "    CGAL  include: $dir/include"
-        echo "    CGAL  library: $dir/lib$WM_COMPILER_LIB_ARCH"
-        # Additional information about boost
-        dir="${3%/}" # <- BOOST_ARCH_PATH
-        for root in "$dir" /usr
+         _my_cgal_libdir="$(sed -ne 's#^CGAL_HEADER_ONLY=##p' "$_cacheinfo" 2>/dev/null)"
+         if [ "$_my_cgal_libdir" = true ]
+         then
+             _my_cgal_libdir=header
+         fi
+    fi
+
+    if [ "$_my_cgal_libdir" != header ]
+    then
+        unset _my_cgal_libdir
+        libName="libCGAL"
+        for libdirName in "lib$WM_COMPILER_LIB_ARCH" lib
         do
-            if [ -d "$root/include/boost" \
-              -a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system$EXT_SO" ]
+            if [ -r "$dir/$libdirName/$libName$EXT_SO" ]
             then
-                echo "    boost include: $root/include"
-                echo "    boost library: $root/lib$WM_COMPILER_LIB_ARCH"
+                _my_cgal_libdir="$dir/$libdirName"
                 break
             fi
         done
-        exit 0
-    else
-        exit 2
     fi
+    [ -n "$_my_cgal_libdir" ] || exit 2
+
+    echo "    CGAL  include: $dir/include"
+    echo "    CGAL  library: $_my_cgal_libdir"
+
+    # Additional information about boost
+    dir="${3%/}" # <- BOOST_ARCH_PATH
+    libName="libboost_system"
+    for root in "$dir" /usr
+    do
+        [ -d "$root/include/boost" ] || continue
+        for libdirName in "lib$WM_COMPILER_LIB_ARCH" lib
+        do
+            if [ -r "$root/$libdirName/$libName$EXT_SO" ]
+            then
+                echo "    boost include: $root/include"
+                echo "    boost library: $root/$libdirName"
+                exit 0  # Success
+                break 2
+            fi
+        done
+    done
+    exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 unset BOOST_ARCH_PATH CGAL_ARCH_PATH GMP_ARCH_PATH MPFR_ARCH_PATH   # Purge old
+unset GMP_DIR MPFR_DIR  # Purge hints used by CGAL cmake
 
 # CGAL, boost and gmp/mpfr versions from OpenFOAM etc/config.sh files.
 # Get compiler first and let CGAL config override GMP and MPFR
 _foamConfig compiler
 _foamConfig CGAL
 
-boostPACKAGE=${boost_version:-boost-system}
-gmpPACKAGE=${gmp_version:-gmp-system}
-mpfrPACKAGE=${mpfr_version:-mpfr-system}
-cgalPACKAGE=$cgal_version
+BOOST_PACKAGE="${boost_version:-boost-system}"
+GMP_PACKAGE="${gmp_version:-gmp-system}"
+MPFR_PACKAGE="${mpfr_version:-mpfr-system}"
+CGAL_PACKAGE="$cgal_version"
+
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset BOOST_ARCH_PATH CGAL_ARCH_PATH
+fi
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions boost cgal; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERSION]
+Usage: ${0##*/} [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERSION]
 options:
   -gcc          Force use of gcc/g++
   -cmake PATH   Use cmake from the given path
-  -no-lib       Compile CGAL for use in headers only mode (since CGAL 4.9)
+  -no-lib       Configure CGAL for headers-only mode (default OpenFOAM >= 2006)
+  -with-lib     Configure CGAL with library
   -toolset=NAME Use named toolset in bootstrap
+                (use 'none' to let boost determine everything).
   -system       Use system versions for boost/gmp/mpfr
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build CGAL with
-      ${cgalPACKAGE:-'unspecified CGAL version'}
-      $boostPACKAGE
-      $gmpPACKAGE
-      $mpfrPACKAGE
+      ${CGAL_PACKAGE:-[cgal unspecified]}
+      ${BOOST_PACKAGE:-[boost unspecified]}
+      ${GMP_PACKAGE:-[gmp unspecified]}
+      ${MPFR_PACKAGE:-[mpfr unspecified]}
 
 Normally builds against ThirdParty boost and gmp/mpfr when possible.
 To override this behaviour (and use the system boost and/or gmp/mpfr),
@@ -106,19 +149,24 @@ simply specify a 'system' version. For example,
 Use gmp-none to disable use of gmp/mpfr (eg, not available)
 
 USAGE
-    exit 1
+    showDownloadHint boost
+    showDownloadHint cgal
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optHeadersOnly optToolset
+unset optForce optHeadersOnly optToolset
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     -cmake)
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
@@ -126,31 +174,38 @@ do
         shift
         ;;
     -toolset=*)
-        optToolset="${1*=}"
+        optToolset="${1#*=}"
         ;;
     -sys*)
-        gmpPACKAGE="gmp-system"
-        mpfrPACKAGE="mpfr-system"
-        boostPACKAGE="boost-system"
+        GMP_PACKAGE="gmp-system"
+        MPFR_PACKAGE="mpfr-system"
+        BOOST_PACKAGE="boost-system"
         unset BOOST_ARCH_PATH GMP_ARCH_PATH MPFR_ARCH_PATH
         ;;
     -no-lib)
         optHeadersOnly=true
         ;;
-    gmp-[4-9]* | gmp-system | gmp-none)
-        gmpPACKAGE="${1%%/}"
+    -with-lib)
+        optHeadersOnly=false
+        ;;
+    gmp-[0-9]* | gmp-system | gmp-none)
+        GMP_PACKAGE="${1%%/}"
         unset GMP_ARCH_PATH
         ;;
-    mpfr-[2-9]* | mpfr-system | mpfr-none)
-        mpfrPACKAGE="${1%%/}"
+    mpfr-[0-9]* | mpfr-system | mpfr-none)
+        MPFR_PACKAGE="${1%%/}"
         unset MPFR_ARCH_PATH
         ;;
+
+    boost/* | sources/boost* | \
     boost-[0-9]* | boost_[0-9]* | boost-system )
-        boostPACKAGE="${1%%/}"
+        BOOST_PACKAGE="${1%%/}"
         unset BOOST_ARCH_PATH
         ;;
+
+    cgal/* | sources/cgal* | \
     CGAL-[0-9]*)
-        cgalPACKAGE="${1%%/}"
+        CGAL_PACKAGE="${1%%/}"
         unset CGAL_ARCH_PATH
         ;;
     *)
@@ -160,38 +215,64 @@ do
     shift
 done
 
-[ -n "$cgalPACKAGE" ] || die "The cgal-VERSION was not specified"
+[ -n "$CGAL_PACKAGE" ] || die "The cgal-VERSION was not specified"
 
 # Nothing to build
-if _foamIsNone $boostPACKAGE
+if _foamIsNone "$BOOST_PACKAGE"
 then
     echo "Using boost-none (skip ThirdParty build of BOOST/CGAL)"
     exit 0
 fi
-if _foamIsNone $cgalPACKAGE
+if _foamIsNone "$CGAL_PACKAGE"
 then
     echo "Using cgal-none (skip ThirdParty build of CGAL)"
     exit 0
 fi
 
+
+# For OpenFOAM 1912 and earlier, no predefined default.
+# Force headers-only *after* starting with OpenFOAM-v2006
+if [ -z "$optHeadersOnly" ] && foamVersion=$(wmake -version 2>/dev/null)
+then
+    if [ "${foamVersion:-0}" -gt 1912 ]
+    then
+        optHeadersOnly=true
+    fi
+fi
+
+# Headers-only - might be able to avoid gmp/mpfr?
+## if [ "${optHeadersOnly:-false}" = true ]
+## then
+##     GMP_PACKAGE=none
+##     MPFR_PACKAGE=none
+##     unset GMP_ARCH_PATH MPFR_ARCH_PATH
+## fi
+
 #------------------------------------------------------------------------------
 #
 # Build Boost
+#   BOOST_ARCH_PATH : installation directory (as per config file)
+#
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+#
 # For 64-bit:
 # - system is normally built into 'lib64'
 # - use Third-Party 'lib64' for consistency.
 # Boost 1_62_0 and older normally build into 'lib'.
-#
-#   BOOST_ARCH_PATH  : installation directory
-#   BOOST_SOURCE_DIR : location of the original sources
 
-BOOST_SOURCE_DIR=$sourceBASE/$boostPACKAGE
-: ${BOOST_ARCH_PATH:=$installBASE/$boostPACKAGE}    # Fallback
+BOOST_SOURCE="$(findSourceDir "$BOOST_PACKAGE")"
+BOOST_PACKAGE="$(basename "$BOOST_PACKAGE")"
+BOOST_PREFIX="$installBASE/$BOOST_PACKAGE"
 
-boostInc="$BOOST_ARCH_PATH/include"
-boostLib="$BOOST_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
+# Override as per config file (if any)
+[ -n "$BOOST_ARCH_PATH" ] && BOOST_PREFIX="$BOOST_ARCH_PATH"
 
-if _foamIsSystem $boostPACKAGE
+boostInc="$BOOST_PREFIX/include"
+boostLib="$BOOST_PREFIX/lib$WM_COMPILER_LIB_ARCH"
+
+if _foamIsSystem "$BOOST_PACKAGE"
 then
     echo "Using boost-system (skip ThirdParty build of BOOST)"
 
@@ -199,16 +280,16 @@ then
 
     if [ -d "$boostInc" ]
     then
-        if BOOST_ARCH_PATH=$(cd $BOOST_ARCH_PATH 2>/dev/null && pwd -P)
+        if BOOST_PREFIX=$(cd "$BOOST_PREFIX" 2>/dev/null && pwd -P)
         then
-            boostPACKAGE=${BOOST_ARCH_PATH##*/}
+            BOOST_PACKAGE="$(basename "$BOOST_PREFIX")"
         else
-            echo "ERROR: bad path for BOOST_ARCH_PATH"
+            echo "ERROR: bad path for BOOST_PREFIX"
             echo "stopping build"
             exit 1
         fi
 
-        libdir="$BOOST_ARCH_PATH/lib"
+        libdir="$BOOST_PREFIX/lib"
     else
         boostInc="/usr/include"
         boostLib="/usr/lib$WM_COMPILER_LIB_ARCH"
@@ -216,77 +297,147 @@ then
     fi
 
     # Use lib/ when lib64/ does not exist
-    [ ! -d "$boostLib" -a -d "$libdir" ] && boostLib="$libdir"
+    [ -d "$libdir" -a ! -d "$boostLib" ] && boostLib="$libdir"
 
-elif [ -f "$boostInc/boost/version.hpp" ]
+elif [ -z "$optForce" ] \
+  && [ -f "$boostInc/boost/version.hpp" ]
 then
-    echo "Using $boostPACKAGE"
+    echo "Using $BOOST_PACKAGE"
 
-    libdir="$BOOST_ARCH_PATH/lib"
+    libdir="$BOOST_PREFIX/lib"
 
     # Use lib when lib64 does not exist
-    [ ! -d "$boostLib" -a -d "$libdir" ] && boostLib="$libdir"
+    [ -d "$libdir" -a ! -d "$boostLib" ] && boostLib="$libdir"
 
 else
-    echo "Starting build: $boostPACKAGE"
+    echo "Starting build: $BOOST_PACKAGE"
     echo
     # Absolute path for --libdir
 
     (
+        # Write user-config.jam into source directory
+        # this is not great, but project-config.jam is written there too
+        cd "$BOOST_SOURCE" || exit
+        export GIT_DIR="$PWD/.git"    # Avoid seeing our own git-repo
+
         # Configuration options:
         unset buildOpt
 
-        cd $BOOST_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        if [ "$optToolset" = none ]
+        then
+            # Let boost determine everything
+            unset optToolset
 
-        rm -rf $BOOST_ARCH_PATH
-
-        case "$WM_COMPILER" in
-        (Arm*)
-            # Toolset for bootstrap
-            optToolset="gcc"
-
-            echo "using clang : arm : $(whichCC) ;" > user-config.jam
-            echo "using mpi ;" >> user-config.jam
-
-            # Toolset for build
-            buildOpt="--user-config=user-config.jam toolset=clang"
-            ;;
-
-        (Mingw*)
-            # Toolset for bootstrap
-            optToolset="gcc"
-
-            echo "using gcc : mingw : $(whichCC) ;" > user-config.jam
-
-            # Toolset for build
-            buildOpt="--user-config=user-config.jam toolset=gcc"
-            buildOpt="$buildOpt target-os=windows release"
-            ;;
-
-        (*)
-            # Toolset for bootstrap and build
-            [ -n "$optToolset" ] || optToolset="$(whichCC)"
+        elif [ -n "$optToolset" ]
+        then
+            # Assume same toolset for bootstrap and build
             buildOpt="toolset=$optToolset"
-            ;;
-        esac
+
+        else
+            # No toolset specified, attempt some guesses
+            c_compiler="$(whichCC)"
+
+            # Compiler-specific adjustments
+            case "$WM_COMPILER" in
+            (Arm*)
+                optToolset=gcc      # For boostrap
+
+                # For build
+                echo "using clang : arm : ${c_compiler} ;" > user-config.jam
+                echo "using mpi ;" >> user-config.jam
+                buildOpt="--user-config=user-config.jam toolset=clang"
+                ;;
+
+            (Mingw*)
+                optToolset=gcc      # For boostrap
+
+                # For build
+                echo "using gcc : mingw : ${c_compiler} ;" > user-config.jam
+                buildOpt="--user-config=user-config.jam toolset=gcc"
+                buildOpt="$buildOpt address-model=64 target-os=windows release"
+                ;;
+
+            (*)
+                # For gcc-8, clang-9 etc.
+
+                case "${c_compiler}" in
+                (clang*)
+                    optToolset=clang    # For boostrap
+
+                    # For build
+                    echo "using clang : : ${c_compiler} ;" > user-config.jam
+                    buildOpt="--user-config=user-config.jam toolset=clang"
+                    ;;
+                (gcc* | g++*)
+                    optToolset=gcc      # For boostrap
+
+                    # For build
+                    echo "using gcc : : ${c_compiler} ;" > user-config.jam
+                    buildOpt="--user-config=user-config.jam toolset=gcc"
+                    ;;
+                (ic[cx]* | icp[cx]*)    # intel
+                    optToolset=gcc      # For boostrap
+
+                    # For build
+                    echo "using intel : : ${c_compiler} ;" > user-config.jam
+                    buildOpt="--user-config=user-config.jam toolset=intel"
+                    ;;
+                esac
+                ;;
+            esac
+        fi
+
+        # End of configuration options
+        # ----------------------------
+
+        rm -rf "$BOOST_PREFIX"
 
         ./bootstrap.sh \
-            --prefix=$BOOST_ARCH_PATH \
-            --libdir=$boostLib \
+            --prefix="$BOOST_PREFIX" \
+            --libdir="$boostLib" \
             --with-libraries=thread \
             --with-libraries=system \
-            --with-toolset="$optToolset" \
+            ${optToolset:+--with-toolset="$optToolset"} \
         && ./b2 $buildOpt -j $WM_NCOMPPROCS install \
-        && echo "Built: boost"
+        && echo "Built: $BOOST_PACKAGE"
     ) || {
-        echo "Error building: boost"
+        echo "Error building: $BOOST_PACKAGE"
         exit 1
     }
+
+    # Cleanup in-source build artifacts
+    (
+        set +e  # Ignore errors
+        cd "$BOOST_SOURCE" 2>/dev/null || exit 0
+
+        echo "Cleanup in-source build artifacts: $BOOST_PACKAGE"
+        rm -f project-config.jam* user-config.jam*
+        rm -f b2 bjam bootstrap.log
+        rm -rf \
+            bin.v2 stage \
+            libs/config/checks/architecture/bin \
+            tools/build/src/engine/bootstrap \
+            tools/build/src/engine/bin.* \
+            ;
+        true
+    )
+
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$BOOST_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $BOOST_PACKAGE"
+            rm -rf "$BOOST_PREFIX/$dir"
+        fi
+    done
+    rmdir "$BOOST_PREFIX"/share 2>/dev/null || true
+
 fi
 
+
 # Nothing left to build
-if _foamIsSystem $cgalPACKAGE
+if _foamIsSystem "$CGAL_PACKAGE"
 then
     echo "Using cgal-system (skip ThirdParty build of CGAL)"
     exit 0
@@ -314,32 +465,37 @@ fi
 # - use Third-Party 'lib64' for consistency.
 # CGAL-4.9 normally builds into 'lib64', older versions into 'lib'.
 #
-#   CGAL_SOURCE_DIR : location of the original sources
-#   CGAL_BUILD_DIR  : location of the build
-#   CGAL_ARCH_PATH  : installation directory
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+#   CGAL_ARCH_PATH : installation directory (as per config file)
+
+CGAL_SOURCE="$(findSourceDir "$CGAL_PACKAGE")"
+CGAL_PACKAGE="$(basename "$CGAL_PACKAGE")"
+CGAL_PREFIX="$installBASE/$CGAL_PACKAGE"
+
+# Override as per config file (if any)
+[ -n "$CGAL_ARCH_PATH" ] && CGAL_PREFIX="$CGAL_ARCH_PATH"
 
-CGAL_SOURCE_DIR=$sourceBASE/$cgalPACKAGE
-CGAL_BUILD_DIR=$buildBASE/$cgalPACKAGE
-: ${CGAL_ARCH_PATH:=$installBASE/$cgalPACKAGE}      # Fallback
 
 # gmp/mpfr are installed without compiler name
-mpfrBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
+archBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH"
 
 # Enable/disable gmp/mpfr together
-if _foamIsNone $gmpPACKAGE || _foamIsNone $mpfrPACKAGE
+if _foamIsNone "$GMP_PACKAGE" || _foamIsNone "$MPFR_PACKAGE"
 then
     GMP_ARCH_PATH=none
     MPFR_ARCH_PATH=none
-elif _foamIsSystem $gmpPACKAGE || _foamIsSystem $mpfrPACKAGE
+elif _foamIsSystem "$GMP_PACKAGE" || _foamIsSystem "$MPFR_PACKAGE"
 then
     # May really be system, but could also by a central installation
     # Ensure everything is accurately recorded. Resolve paths etc.
 
     if [ -d "$GMP_ARCH_PATH" ]
     then
-        if GMP_ARCH_PATH=$(cd $GMP_ARCH_PATH 2>/dev/null && pwd -P)
+        if GMP_ARCH_PATH=$(cd "$GMP_ARCH_PATH" 2>/dev/null && pwd -P)
         then
-            gmpPACKAGE=${GMP_ARCH_PATH##*/}
+            GMP_PACKAGE="${GMP_ARCH_PATH##*/}"
         else
             echo "ERROR: bad path for GMP_ARCH_PATH"
             echo "stopping build"
@@ -351,9 +507,9 @@ then
 
     if [ -d "$MPFR_ARCH_PATH" ]
     then
-        if MPFR_ARCH_PATH=$(cd $MPFR_ARCH_PATH 2>/dev/null && pwd -P)
+        if MPFR_ARCH_PATH=$(cd "$MPFR_ARCH_PATH" 2>/dev/null && pwd -P)
         then
-            mpfrPACKAGE=${MPFR_ARCH_PATH##*/}
+            MPFR_PACKAGE="${MPFR_ARCH_PATH##*/}"
         else
             echo "ERROR: bad path for MPFR_ARCH_PATH"
             echo "stopping build"
@@ -363,8 +519,10 @@ then
         MPFR_ARCH_PATH=system
     fi
 else
-    GMP_ARCH_PATH=$mpfrBASE/$gmpPACKAGE
-    MPFR_ARCH_PATH=$mpfrBASE/$mpfrPACKAGE
+
+    # Respect the *ARCH_PATH if set
+    [ -d "$GMP_ARCH_PATH" ]  || GMP_ARCH_PATH="$archBASE/$GMP_PACKAGE"
+    [ -d "$MPFR_ARCH_PATH" ] || MPFR_ARCH_PATH="$archBASE/$MPFR_PACKAGE"
 fi
 
 #------------------------------------------------------------------------------
@@ -372,35 +530,57 @@ fi
 cat<<SUMMARY
 CGAL configuration
 ------------------
-    CGAL    = $cgalPACKAGE
-    BOOST   = $boostPACKAGE
-    GMP     = $gmpPACKAGE
-    MPFR    = $mpfrPACKAGE
+    CGAL    = $CGAL_PACKAGE
+    BOOST   = $BOOST_PACKAGE
+    GMP     = $GMP_PACKAGE
+    MPFR    = $MPFR_PACKAGE
 ------------------
 SUMMARY
 
 #
 # build information recorded for later use
 #
-buildInfoFile=$CGAL_ARCH_PATH/share/openfoam-build
+buildInfoFile="$CGAL_PREFIX"/share/openfoam-build
 
 recordCGALinfo()
 {
-    CGAL_VERSION=$(sed -ne 's/^ *# *define *CGAL_VERSION_NR *\([0-9][0-9]*\).*$/\1/p' $CGAL_ARCH_PATH/include/CGAL/version.h 2>/dev/null)
+    CGAL_VERSION=$(sed -ne 's/^ *# *define *CGAL_VERSION_NR *\([0-9][0-9]*\).*$/\1/p' $CGAL_PREFIX/include/CGAL/version.h 2>/dev/null)
 
-    cat<<BUILD_INFO > $buildInfoFile
+    # which libdirName?
+    _my_cgal_libdir=unknown
+    for libdirName in "lib$WM_COMPILER_LIB_ARCH" lib
+    do
+        if [ -d "$CGAL_PREFIX/$libdirName" ]
+        then
+            _my_cgal_libdir="$libdirName"
+            break
+        fi
+    done
+
+    # which libdirName?
+    _my_boost_libdir=unknown
+    for libdirName in "lib$WM_COMPILER_LIB_ARCH" lib
+    do
+        if [ -d "$BOOST_PREFIX/$libdirName" ]
+        then
+            _my_boost_libdir="$libdirName"
+            break
+        fi
+    done
+
+    cat<<BUILD_INFO > "$buildInfoFile"
 # Information from OpenFOAM build on '$(date)'
 #
-CGAL=${CGAL_ARCH_PATH##*/}
-BOOST=${BOOST_ARCH_PATH##*/}
+CGAL=${CGAL_PREFIX##*/}
+BOOST=${BOOST_PREFIX##*/}
 GMP=${GMP_ARCH_PATH##*/}
 MPFR=${MPFR_ARCH_PATH##*/}
 CGAL_VERSION=$CGAL_VERSION
 BOOST_VERSION=$BOOST_VERSION
 
-CGAL_lib=lib$WM_COMPILER_LIB_ARCH
-BOOST_lib=lib$WM_COMPILER_LIB_ARCH
-CGAL_HEADER_ONLY=${optHeadersOnly:-false}
+CGAL_lib=$_my_cgal_libdir
+BOOST_lib=$_my_boost_libdir
+CGAL_HEADER_ONLY=${optHeadersOnly:-default}
 BUILD_INFO
 }
 
@@ -428,13 +608,16 @@ cgalIsCurrent()
     local info=$(sed -n -e '/^[A-Z]/p' $buildInfoFile 2>/dev/null)
     [ -n "$info" ] || return 1
 
+    # Check of lib/ vs lib64/ could be spurious...
     local libDirName="lib$WM_COMPILER_LIB_ARCH"
 
     echo "checking information from existing build ..."
-    echo "  ${CGAL_ARCH_PATH}"
+    echo "  ${CGAL_PREFIX}"
 
-    infoValueEq CGAL  "${CGAL_ARCH_PATH##*/}"     "$info" || return 1
-    infoValueEq BOOST "${BOOST_ARCH_PATH##*/}"    "$info" || return 1
+    [ -f "$CGAL_PREFIX"/include/CGAL/version.h ] || return 1
+
+    infoValueEq CGAL  "${CGAL_PREFIX##*/}"     "$info" || return 1
+    infoValueEq BOOST "${BOOST_PREFIX##*/}"    "$info" || return 1
     infoValueEq GMP   "${GMP_ARCH_PATH##*/}"      "$info" || return 1
     infoValueEq MPFR  "${MPFR_ARCH_PATH##*/}"     "$info" || return 1
     infoValueEq BOOST_VERSION "${BOOST_VERSION}"  "$info" || return 1
@@ -445,51 +628,47 @@ cgalIsCurrent()
 }
 
 
-if cgalIsCurrent
+if [ -z "$optForce" ] \
+ && cgalIsCurrent
 then
-    echo "    ${CGAL_ARCH_PATH##*/} build appears to be up-to-date - skipping"
+    echo "    ${CGAL_PREFIX##*/} build appears to be up-to-date - skipping"
     echo
     exit 0
-fi
-
+else
 (
-    # Remove any existing build folder and recreate
-    if [ -d $CGAL_BUILD_DIR ]
-    then
-        echo "removing old build directory"
-        echo "    $CGAL_BUILD_DIR"
-        rm -rf $CGAL_BUILD_DIR
-    fi
-    mkdir -p $CGAL_BUILD_DIR
+    export GIT_DIR="$CGAL_SOURCE/.git"
+    PKG_BUILD="$buildBASE/$CGAL_PACKAGE"
 
-    cd $CGAL_BUILD_DIR || exit 1
-    export GIT_DIR=$CGAL_SOURCE_DIR/.git # Mask seeing our own git-repo
+    # Remove existing build
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
+    cd "$PKG_BUILD" || exit
 
     unset configBoost configGmp configMpfr
     echo "----"
-    echo "Configuring $cgalPACKAGE with boost $BOOST_VERSION"
-    echo "    Source         : $CGAL_SOURCE_DIR"
-    echo "    Build          : $CGAL_BUILD_DIR"
-    echo "    Target         : $CGAL_ARCH_PATH"
+    echo "Configuring $CGAL_PACKAGE with boost $BOOST_VERSION"
+    echo "    Source         : $CGAL_SOURCE"
+    echo "    Build          : $CGAL_BUILD"
+    echo "    Target         : $CGAL_PREFIX"
 
 
     # See http://doc.cgal.org/latest/Manual/installation.html
-    if _foamIsSystem $boostPACKAGE
+    if _foamIsSystem "$BOOST_PACKAGE"
     then
         # Tagged as 'system' but could actually point to a central location
-        if [ -d "$BOOST_ARCH_PATH/include" ]
+        if [ -d "$BOOST_PREFIX/include" ]
         then
-            echo "    boost          : ${BOOST_ARCH_PATH##*/}"
-            configBoost="-DBOOST_ROOT=$BOOST_ARCH_PATH"
+            echo "    boost          : ${BOOST_PREFIX##*/}"
+            configBoost="-DBOOST_ROOT=$BOOST_PREFIX"
         else
             echo "    boost          : system"
         fi
 
         ## For system - possible that /usr/lib64 not being found?
         ## configBoost="-DBoost_LIBRARY_DIRS=$boostLib"
-    elif [ -d "$BOOST_ARCH_PATH" ]
+    elif [ -d "$BOOST_PREFIX" ]
     then
-        echo "    boost          : $boostPACKAGE"
+        echo "    boost          : $BOOST_PACKAGE"
         configBoost=$(cat <<CMAKE_OPTIONS
  -DBoost_INCLUDE_DIR=$boostInc
  -DBoost_LIBRARY_DIRS=$boostLib
@@ -502,20 +681,21 @@ CMAKE_OPTIONS
 )
     fi
 
-    if _foamIsSystem $GMP_ARCH_PATH
+    if _foamIsSystem "$GMP_ARCH_PATH"
     then
         echo "    gmp            : system"
-    elif _foamIsNone $GMP_ARCH_PATH
+    elif _foamIsNone "$GMP_ARCH_PATH"
     then
         echo "    gmp            : disabled"
         configGmp="-DCGAL_DISABLE_GMP=TRUE"  # Also used for mpfr
     elif [ -d "$GMP_ARCH_PATH" ]
     then
-        echo "    gmp            : $gmpPACKAGE"
+        echo "    gmp            : $GMP_PACKAGE"
 
+        # Alternative: export GMP_DIR=...  hint
         for libdir in \
-            $GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
-            $GMP_ARCH_PATH/lib \
+            "$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" \
+            "$GMP_ARCH_PATH"/lib \
         ;
         do
             if [ -f "$libdir/libgmp$EXT_SO" ]
@@ -533,20 +713,21 @@ CMAKE_OPTIONS
         echo "    system         : gmp (did not find $GMP_ARCH_PATH)"
     fi
 
-    if _foamIsSystem $MPFR_ARCH_PATH
+    if _foamIsSystem "$MPFR_ARCH_PATH"
     then
         echo "    mpfr           : system"
-    elif _foamIsNone $MPFR_ARCH_PATH
+    elif _foamIsNone "$MPFR_ARCH_PATH"
     then
         echo "    mpfr           : disabled"
         configGmp="-DCGAL_DISABLE_GMP=TRUE"  # Also used for mpfr
     elif [ -d "$MPFR_ARCH_PATH" ]
     then
-        echo "    mpfr           : $mpfrPACKAGE"
+        echo "    mpfr           : $MPFR_PACKAGE"
 
+        # Alternative: export MPFR_DIR=...  hint
         for libdir in \
-            $MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
-            $MPFR_ARCH_PATH/lib \
+            "$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" \
+            "$MPFR_ARCH_PATH/lib" \
         ;
         do
             if [ -f "$libdir/libmpfr$EXT_SO" ]
@@ -568,6 +749,7 @@ CMAKE_OPTIONS
 
     unset cmakeDefs
 
+    # Compiler-specific adjustments
     case "$WM_COMPILER" in
     (Mingw*)
         cmakeDefs="$cmakeDefs -DCMAKE_SYSTEM_NAME=Windows"
@@ -576,45 +758,64 @@ CMAKE_OPTIONS
         ;;
     esac
 
+    # Headers/library decision
+    case "$optHeadersOnly" in
+    (true | false)
+        cmakeDefs="$cmakeDefs -DCGAL_HEADER_ONLY=${optHeadersOnly}"
+        ;;
+    esac
+
     # For CGAL < 4.9, for installation into lib64/, not lib/
     # Name only (not path) for CGAL_INSTALL_LIB_DIR
     echo "----"
-    set -x
-    $cmake \
-        -DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
-        -DCGAL_INSTALL_LIB_DIR=lib$WM_COMPILER_LIB_ARCH \
+    rm -rf "$CGAL_PREFIX"
+    set -x && \
+    ${cmake:?} \
+        -DCMAKE_INSTALL_PREFIX="$CGAL_PREFIX" \
+        -DCGAL_INSTALL_LIB_DIR="lib$WM_COMPILER_LIB_ARCH" \
         -DCMAKE_BUILD_TYPE=Release \
         -DWITH_CGAL_Core=OFF \
         -DWITH_CGAL_ImageIO=OFF \
         -DWITH_CGAL_Qt5=OFF \
         $cmakeDefs \
-        ${optHeadersOnly:+-DCGAL_HEADER_ONLY=TRUE} \
         $configBoost $configGmp $configMpfr \
         ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
-        $CGAL_SOURCE_DIR \
-    && set +x \
+        "$CGAL_SOURCE" \
     && make -j $WM_NCOMPPROCS \
+    && set +x \
     && make install || exit 1
 
     echo "----"
     echo "create '\$CGAL_ARCH_PATH/share/files'"
     echo "----"
-    mkdir -p $CGAL_ARCH_PATH/share/src
-    rm -f $CGAL_ARCH_PATH/share/files
+    mkdir -p "$CGAL_PREFIX"/share/src
+    rm -f "$CGAL_PREFIX"/share/files
 
     for i in assertions.cpp io.cpp MP_Float.cpp Random.cpp
     do
-        if [ -e "$CGAL_SOURCE_DIR/src/CGAL/$i" ]
+        if [ -e "$CGAL_SOURCE/src/CGAL/$i" ]
         then
-            \cp $CGAL_SOURCE_DIR/src/CGAL/$i $CGAL_ARCH_PATH/share/src/
-            echo "\${CGAL_ARCH_PATH}/share/src/$i" >> $CGAL_ARCH_PATH/share/files
+            \cp "$CGAL_SOURCE/src/CGAL/$i" "$CGAL_PREFIX"/share/src/
+            echo "\${CGAL_PREFIX}/share/src/$i" >> "$CGAL_PREFIX"/share/files
         fi
     done
 
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$CGAL_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $CGAL_PACKAGE"
+            rm -rf "$CGAL_PREFIX/$dir"
+        fi
+    done
+    ## Leave:  rmdir "$CGAL_PREFIX"/share 2>/dev/null || true
+
     # Record our build-status
     recordCGALinfo
 
     echo "Done CGAL"
 )
+fi
 
 #------------------------------------------------------------------------------

makeCmake

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCmake
@@ -24,53 +24,60 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 
-# Special purpose script - no default version.
-unset cmakePACKAGE
+# Special purpose script - no default version
+unset PACKAGE
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions cmake; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] cmake-VERSION
+Usage: ${0##*/} [OPTION] cmake-VERSION
 options:
+  -force        Force compilation, even if binary already exists
   -gcc          Force use of gcc/g++
   -link         Create additional symlink as 'cmake-system'
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build cmake
-      ${cmakePACKAGE:-'unspecified'}
+* Build cmake
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint cmake
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optLink
+unset optForce optLink
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+    -link)      optLink=true ;;
 
-    -link)
-        optLink=true
-        ;;
-    cmake-[1-9]*)
-        cmakePACKAGE="${1%%/}"
+    cmake/* | sources/cmake* | \
+    cmake-[0-9]*)
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -79,53 +86,60 @@ do
     shift
 done
 
-[ -n "$cmakePACKAGE" ] || die "The cmake-VERSION was not specified"
-
-if _foamIsSystem "$cmakePACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    unset optLink # basic sanity - cannot
+    die "The CMAKE package/version not specified"
+fi
+
+if _foamIsSystem "$PACKAGE"
+then
+    unset optLink # basic sanity - cannot create a link
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build CMAKE
-#   CMAKE_SOURCE_DIR : location of the original sources
-#   CMAKE_ARCH_PATH  : installation directory
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-CMAKE_SOURCE_DIR=$sourceBASE/$cmakePACKAGE
-CMAKE_ARCH_PATH=$installBASE/$cmakePACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-if [ -d "$CMAKE_ARCH_PATH" -a -r "$CMAKE_ARCH_PATH/bin/cmake" ]
+
+if [ -z "$optForce" ] \
+&& [ -d "$PKG_PREFIX" ] \
+&& [ -r "$PKG_PREFIX/bin/cmake" ]
 then
-    echo "Already built: $cmakePACKAGE"
+    echo "Already built: $PACKAGE"
 else
-    echo "Starting build: $cmakePACKAGE"
+    echo "Starting build: $PACKAGE"
     (
-        buildDIR=$buildBASE/$cmakePACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
+        make distclean 2>/dev/null || true
 
-        cd $CMAKE_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        make distclean 2>/dev/null
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
-
-        $CMAKE_SOURCE_DIR/bootstrap \
-            --prefix=$CMAKE_ARCH_PATH \
+        cd "$PKG_BUILD" && \
+        "$PKG_SOURCE"/bootstrap \
+            --prefix="$PKG_PREFIX" \
         && time make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: $cmakePACKAGE"
+        && echo "Built: $PACKAGE"
     ) || {
-        echo "Error building: $cmakePACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
 fi
 
-if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ]
+if [ "$optLink" = true ] && [ -x "$PKG_PREFIX/bin/cmake" ]
 then
 (
-    cd ${CMAKE_ARCH_PATH%/*} || exit 1
+    cd "${PKG_PREFIX%/*}" || exit
     if [ -L cmake-system ]
     then
         rm cmake-system
@@ -133,7 +147,7 @@ then
     then
         exit 2
     fi
-    ln -svf $cmakePACKAGE cmake-system
+    ln -svf "$PACKAGE" cmake-system
 )
 fi
 

makeFFTW

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeFFTW
@@ -26,62 +27,80 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- FFTW_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
-    then
-        echo "    fftw include: $dir/include"
-        echo "    fftw library: $dir/lib$WM_COMPILER_LIB_ARCH"
-        exit 0
-    else
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="fftw"
+    libName="libfftw3"
+    for lib in \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
+    exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-
-# FFTW version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig FFTW
 
-fftwPACKAGE=${fftw_version:-fftw-system}
+PACKAGE="${fftw_version:-none}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions fftw; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [fftw-VERSION] [-- configure-options]
+Usage: ${0##*/} [OPTION] [fftw-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build FFTW with
-      ${fftwPACKAGE:-'unspecified FFTW version'}
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint fftw
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
+    fftw/* | sources/fftw* | \
     fftw-[0-9]* | fftw_[0-9]* | fftw-system )
-        fftwPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -90,45 +109,61 @@ do
     shift
 done
 
-[ -n "$fftwPACKAGE" ] || die "The fftw-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$fftwPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using fftw-none (skip ThirdParty build of FFTW)"
-    exit 0
-elif _foamIsSystem "$fftwPACKAGE"
+    die "The FFTW package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using fftw-system (skip ThirdParty build of FFTW)"
+    echo "Using none/system (skip ThirdParty build of FFTW)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build FFTW
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+#
 # For 64-bit
 # - FFTW itself will normally build into 'lib64',
-#   but provide --libdir on configure to be 100% certain
-# - Third-Party builds into 'lib64'
-# - system is normally built into 'lib64'
-#
-#   FFTW_SOURCE_DIR : location of the original sources
-#   FFTW_ARCH_PATH  : installation directory
 
-FFTW_SOURCE_DIR=$sourceBASE/$fftwPACKAGE
-FFTW_ARCH_PATH=$installBASE/$fftwPACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PKG_SOURCE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+    [ -r "$PKG_PREFIX/lib/libfftw3$EXT_SO" ] \
+ || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ] \
+ || [ -r "$PKG_PREFIX/bin/libfftw3-3$EXT_SO" ]  # Windows
+}
 then
-    echo "Already has FFTW shared library"
+    echo "FFTW already built : $PKG_PREFIX"
 else
-    echo "Starting build: FFTW ($fftwPACKAGE)"
+    echo "Starting build: FFTW ($PACKAGE)"
     echo
 
     (
         # Configuration options:
         unset configOpt
 
+        # Compiler-specific adjustments
+        case "$WM_COMPILER" in
+        (Mingw*)
+            # Cross-compiling
+            # See http://www.fftw.org/install/windows.html
+            configOpt="
+  --host=x86_64-w64-mingw32
+  --with-our-malloc
+  --enable-threads --with-combined-threads
+  --enable-sse2
+  --with-incoming-stack-boundary=2
+"
+            ;;
+        esac
+
         # Additional configure options
         if [ "$1" = "--" ]
         then
@@ -138,32 +173,40 @@ else
 
         # End of configuration options
         # ----------------------------
-        buildDIR=$buildBASE/$fftwPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
 
-        cd $FFTW_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        rm -rf $FFTW_ARCH_PATH
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
-
-        set -x
-        $FFTW_SOURCE_DIR/configure \
-            --prefix=$FFTW_ARCH_PATH \
-            --libdir=$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$PKG_PREFIX" \
             --enable-shared --disable-static \
             --disable-fortran \
             $configOpt \
         && set +x \
         && make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built $fftwPACKAGE" \
-        && pkgconfigAdjust $FFTW_ARCH_PATH
+        && echo "Built: $PACKAGE" \
+        && pkgconfigAdjust "$PKG_PREFIX"
     ) || {
-        echo "Error building: FFTW"
+        echo "Error building: $PACKAGE"
         exit 1
     }
+
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$PKG_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $PACKAGE"
+            rm -rf "$PKG_PREFIX/$dir"
+        fi
+    done
+    rmdir "$PKG_PREFIX"/share 2>/dev/null || true
+
 fi
 
 #------------------------------------------------------------------------------

makeGcc

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeGcc
@@ -33,13 +33,16 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 unset GMP_ARCH_PATH MPFR_ARCH_PATH                                  # Purge old
 
@@ -49,36 +52,43 @@ WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 # Default GCC, mpfr, gmp and mpc versions from OpenFOAM etc/config.sh file:
 _foamConfig compiler
 
-gmpPACKAGE=${gmp_version:-gmp-system}
-mpfrPACKAGE=${mpfr_version:-mpfr-system}
-mpcPACKAGE=${mpc_version:-mpc-system}
-gccPACKAGE=$gcc_version
+GMP_PACKAGE="${gmp_version:-gmp-system}"
+MPFR_PACKAGE="${mpfr_version:-mpfr-system}"
+MPC_PACKAGE="${mpc_version:-mpc-system}"
+GCC_PACKAGE="$gcc_version"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions gcc gmp mpfr mpc; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [gcc-VERSION] [gmp-VERSION] [mpfr-VERSION] [mpc-VERSION]
+Usage: ${0##*/} [OPTION] [gcc-VERSION] [gmp-VERSION] [mpfr-VERSION] [mpc-VERSION]
 options:
   -clang            Force clang/clang++ for building
+  -m32 | -m64       32-bit or 64-bit (default) ABI
   -multilib         for 64-bit systems with 32-bit support required
   -no-multilib      for 64-bit systems without 32-bit support (DEFAULT)
   -no-threadsafe    disable mpfr thread-safe (default is auto-detect)
   -system           use system versions for gmp/mpfr/mpc
-  -help
+  -list             List available unpacked source versions
+  -help             Display usage help
 
-* build combinations of gmp, mpfr, mpc and gcc
-      $gmpPACKAGE
-      $mpfrPACKAGE
-      $mpcPACKAGE
-      ${gccPACKAGE:-'unspecified GCC version'}
+* Build combinations of gmp, mpfr, mpc and gcc
+      ${GMP_PACKAGE:-[gmp unspecified]}
+      ${MPFR_PACKAGE:-[mpfr unspecified]}
+      ${MPC_PACKAGE:-[mpc unspecified]}
+      ${GCC_PACKAGE:-[gcc unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint gcc
+    showDownloadHint gmp
+    showDownloadHint mpfr
+    showDownloadHint mpc
+    exit 0 # Clean exit
 }
 #------------------------------------------------------------------------------
+optArch=64      # Use 64-bit ABI
+
 # Build 32-bit libraries on 64-bit systems (normally not needed)
 optMultilib=disable
 unset optThreadSafe # unset=auto
@@ -88,12 +98,16 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -clang)     # Force use of clang/clang++ for building
         export CC=clang
         export CXX=clang++
         ;;
 
+    -m32 | -m64)
+        optArch="${1#*m}"
+        ;;
     -multi*)
         optMultilib=enable
         ;;
@@ -104,24 +118,35 @@ do
         optThreadSafe=disable
         ;;
     -sys*)
-        gmpPACKAGE="gmp-system"
-        mpfrPACKAGE="mpfr-system"
-        mpcPACKAGE="mpc-system"
+        GMP_PACKAGE="gmp-system"
+        MPFR_PACKAGE="mpfr-system"
+        MPC_PACKAGE="mpc-system"
         unset GMP_ARCH_PATH MPFR_ARCH_PATH
         ;;
-    gmp-[4-9]* | gmp-system)
-        gmpPACKAGE="${1%%/}"
+
+    gmp/* | sources/gmp* |\
+    gmp-[0-9]* | gmp-system)
+        GMP_PACKAGE="${1%%/}"
         unset GMP_ARCH_PATH
         ;;
-    mpfr-[2-9]* | mpfr-system)
-        mpfrPACKAGE="${1%%/}"
+
+    mpfr/* | sources/mpfr* |\
+    mpfr-[0-9]* | mpfr-system)
+        MPFR_PACKAGE="${1%%/}"
         unset MPFR_ARCH_PATH
         ;;
+
+    mpc/* | sources/mpc* |\
     mpc-[0-9]* | mpc-system)
-        mpcPACKAGE="${1%%/}"
+        MPC_PACKAGE="${1%%/}"
         ;;
-    gcc-[4-9]* | gcc-system)
-        gccPACKAGE="${1%%/}"
+
+    gcc/* | sources/gcc* |\
+    gcc-[0-9]* | gcc-system)
+        GCC_PACKAGE="${1%%/}"
+        ;;
+    [0-9]*)
+        GCC_PACKAGE="gcc-${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -130,47 +155,58 @@ do
     shift
 done
 
-[ -n "$gccPACKAGE" ] || die "The gcc-VERSION was not specified"
+[ -n "$GCC_PACKAGE" ] || die "The gcc-VERSION was not specified"
 
 cat<<SUMMARY
 GCC configuration
 ------------------
-    GCC     = $gccPACKAGE
-    GMP     = $gmpPACKAGE
-    MPFR    = $mpfrPACKAGE
-    MPC     = $mpcPACKAGE
+    ABI     = $optArch
+    GCC     = $GCC_PACKAGE
+    GMP     = $GMP_PACKAGE
+    MPFR    = $MPFR_PACKAGE
+    MPC     = $MPC_PACKAGE
 ------------------
 Using CC    = $CC $CFLAGS
 Using CXX   = $CXX $CXXFLAGS
 SUMMARY
 
-# Set 32 or 64 bit ABI
-case "$WM_ARCH_OPTION" in
-32 | 64)
-    ABI=$WM_ARCH_OPTION
-    ;;
-*)
-    die "The WM_ARCH_OPTION ($WM_ARCH_OPTION) must be 32 or 64"
-    ;;
-esac
-
-
 #------------------------------------------------------------------------------
-# Build/install without compiler name
-buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER_ARCH
-installBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
+# !Build/install locations with arch name only (NO compiler name)!
+buildBASE="$(dirname "$buildBASE")/$WM_ARCH$WM_COMPILER_ARCH"
+installBASE="$(dirname "$installBASE")/$WM_ARCH$WM_COMPILER_ARCH"
+
+# gcc
+GCC_SOURCE="$(findSourceDir "$GCC_PACKAGE")"
+GCC_PACKAGE="$(basename "$GCC_PACKAGE")"
+GCC_PREFIX="$installBASE/$GCC_PACKAGE"
+
+# gmp
+GMP_SOURCE="$(findSourceDir "$GMP_PACKAGE")"
+GMP_PACKAGE="$(basename "$GMP_PACKAGE")"
+GMP_PREFIX="$installBASE/$GMP_PACKAGE"
+
+# mpc
+MPC_SOURCE="$(findSourceDir "$MPC_PACKAGE")"
+MPC_PACKAGE="$(basename "$MPC_PACKAGE")"
+MPC_PREFIX="$installBASE/$MPC_PACKAGE"
+
+# mpfr
+MPFR_SOURCE="$(findSourceDir "$MPFR_PACKAGE")"
+MPFR_PACKAGE="$(basename "$MPFR_PACKAGE")"
+MPFR_PREFIX="$installBASE/$MPFR_PACKAGE"
+
+
+# Override as per config file (if any)
+[ -n "$GMP_ARCH_PATH" ]  && GMP_PREFIX="$GMP_ARCH_PATH"
+[ -n "$MPFR_ARCH_PATH" ] && MPFR_PREFIX="$MPFR_ARCH_PATH"
 
-GCC_ARCH_PATH=$installBASE/$gccPACKAGE
-GMP_ARCH_PATH=$installBASE/$gmpPACKAGE
-MPFR_ARCH_PATH=$installBASE/$mpfrPACKAGE
-MPC_ARCH_PATH=$installBASE/$mpcPACKAGE
 
 # Prefix <dir> to LD_LIBRARY_PATH, if it exists. 0 on success, 1 on failure
 addLib()
 {
     if [ -d "$1" ]
     then
-        export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+        export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH"
         return 0
     else
         return 1
@@ -182,47 +218,47 @@ addLib()
 # Build GMP
 # ================
 echo "---------------"
-if [ -d "$GMP_ARCH_PATH" ]
+if [ -d "$GMP_PREFIX" ]
 then
-    echo "Already built: $gmpPACKAGE"
-elif _foamIsSystem $GMP_ARCH_PATH
+    echo "Already built: $GMP_PREFIX"
+elif _foamIsSystem "$GMP_PREFIX"
 then
-    echo "Using gmp-system"
+    echo "Using system gmp"
 else
-    echo "Starting build: $gmpPACKAGE"
+    echo "Starting build: $GMP_PACKAGE"
     echo
 (
-    sourceDIR=$sourceBASE/$gmpPACKAGE
-    buildDIR=$buildBASE/$gmpPACKAGE
+    PKG_SOURCE="$GMP_SOURCE"
+    PKG_PREFIX="$GMP_PREFIX"
+    PKG_BUILD="$buildBASE/$GMP_PACKAGE"
+    export GIT_DIR="$PKG_SOURCE/.git"
 
-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-    make distclean 2>/dev/null
+    cd "$PKG_SOURCE" || exit
+    make distclean 2>/dev/null || true
 
-    rm -rf $buildDIR
-    mkdir -p $buildDIR
-    cd $buildDIR
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
 
-    set -x
-    $sourceDIR/configure ABI=$ABI \
-        --prefix=$GMP_ARCH_PATH \
-        --libdir=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+    cd "$PKG_BUILD" && set -x && \
+    "$PKG_SOURCE"/configure ABI="$optArch" \
+        --prefix="$PKG_PREFIX" \
+        --libdir="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH" \
         --enable-cxx \
     && set +x \
     && make -j $WM_NCOMPPROCS \
     && make install \
-    && echo "Built: $gmpPACKAGE"
+    && echo "Built: $GMP_PACKAGE"
 ) || {
-    echo "Error building: $gmpPACKAGE"
+    echo "Error building: $GMP_PACKAGE"
     exit 1
 }
 fi
 
-if addLib "$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
+if addLib "$GMP_PREFIX/lib$WM_COMPILER_LIB_ARCH"
 then
     configGMP=$(cat <<CONFIG_OPTIONS
-    --with-gmp-include=$GMP_ARCH_PATH/include
-    --with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    --with-gmp-include=$GMP_PREFIX/include
+    --with-gmp-lib=$GMP_PREFIX/lib$WM_COMPILER_LIB_ARCH
 CONFIG_OPTIONS
 )
 else
@@ -234,51 +270,51 @@ fi
 # Build MPFR
 # ================
 echo "---------------"
-if [ -d $MPFR_ARCH_PATH ]
+if [ -d "$MPFR_PREFIX" ]
 then
-    echo "Already built: $mpfrPACKAGE"
-elif _foamIsSystem $MPFR_ARCH_PATH
+    echo "Already built: $MPFR_PACKAGE"
+elif _foamIsSystem "$MPFR_PREFIX"
 then
-    echo "Using mpfr-system"
+    echo "Using system mpfr"
 else
-    echo "Starting build: $mpfrPACKAGE"
+    echo "Starting build: $MPFR_PACKAGE"
     echo
 (
-    sourceDIR=$sourceBASE/$mpfrPACKAGE
-    buildDIR=$buildBASE/$mpfrPACKAGE
+    PKG_SOURCE="$MPFR_SOURCE"
+    PKG_PREFIX="$MPFR_PREFIX"
+    PKG_BUILD="$buildBASE/$MPFR_PACKAGE"
+    export GIT_DIR="$PKG_SOURCE/.git"
 
-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-    make distclean 2>/dev/null
+    cd "$PKG_SOURCE" || exit
+    make distclean 2>/dev/null || true
 
-    rm -rf $buildDIR
-    mkdir -p $buildDIR
-    cd $buildDIR
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
 
     unset configOpt
     # explicitly enable/disable thread-safe
     [ -n "$optThreadSafe" ] && configOpt="--${optThreadSafe}-thread-safe"
 
-    set -x
-    $sourceDIR/configure ABI=$ABI \
-        --prefix=$MPFR_ARCH_PATH \
-        --libdir=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+    cd "$PKG_BUILD" && set -x && \
+    "$PKG_SOURCE"/configure ABI="$optArch" \
+        --prefix="$PKG_PREFIX" \
+        --libdir="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH" \
         $configGMP $configOpt \
     && set +x \
     && make -j $WM_NCOMPPROCS \
     && make install \
-    && echo "Built: $mpfrPACKAGE"
+    && echo "Built: $MPFR_PACKAGE"
 ) || {
-    echo "Error building: $mpfrPACKAGE"
+    echo "Error building: $MPFR_PACKAGE"
     exit 1
 }
 fi
 
-if addLib "$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
+if addLib "$MPFR_PREFIX/lib$WM_COMPILER_LIB_ARCH"
 then
     configMPFR=$(cat <<CONFIG_OPTIONS
-    --with-mpfr-include=$MPFR_ARCH_PATH/include \
-    --with-mpfr-lib=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    --with-mpfr-include=$MPFR_PREFIX/include \
+    --with-mpfr-lib=$MPFR_PREFIX/lib$WM_COMPILER_LIB_ARCH
 CONFIG_OPTIONS
 )
 else
@@ -290,47 +326,47 @@ fi
 # Build MPC
 # ================
 echo "---------------"
-if [ -d $MPC_ARCH_PATH ]
+if [ -d "$MPC_PREFIX" ]
 then
-    echo "Already built: $mpcPACKAGE"
-elif _foamIsSystem $MPC_ARCH_PATH
+    echo "Already built: $MPC_PACKAGE"
+elif _foamIsSystem "$MPC_PREFIX"
 then
-    echo "Using mpc-system"
+    echo "Using system mpc"
 else
-    echo "Starting build: $mpcPACKAGE"
+    echo "Starting build: $MPC_PACKAGE"
     echo
 (
-    sourceDIR=$sourceBASE/$mpcPACKAGE
-    buildDIR=$buildBASE/$mpcPACKAGE
+    PKG_SOURCE="$MPC_SOURCE"
+    PKG_PREFIX="$MPC_PREFIX"
+    PKG_BUILD="$buildBASE/$MPC_PACKAGE"
+    export GIT_DIR="$PKG_SOURCE/.git"
 
-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-    make distclean 2>/dev/null
+    cd "$PKG_SOURCE" || exit
+    make distclean 2>/dev/null || true
 
-    rm -rf $buildDIR
-    mkdir -p $buildDIR
-    cd $buildDIR
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
 
-    set -x
-    $sourceDIR/configure ABI=$ABI \
-        --prefix=$MPC_ARCH_PATH \
-        --libdir=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+    cd "$PKG_BUILD" && set -x && \
+    "$PKG_SOURCE"/configure ABI="$optArch" \
+        --prefix="$PKG_PREFIX" \
+        --libdir="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH" \
         $configGMP $configMPFR \
     && set +x \
     && make -j $WM_NCOMPPROCS \
     && make install \
-    && echo "Built: $mpcPACKAGE"
+    && echo "Built: $MPC_PACKAGE"
 ) || {
-    echo "Error building: $mpcPACKAGE"
+    echo "Error building: $MPC_PACKAGE"
     exit 1
 }
 fi
 
-if addLib "$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
+if addLib "$MPC_PREFIX/lib$WM_COMPILER_LIB_ARCH"
 then
     configMPC=$(cat <<CONFIG_OPTIONS
-    --with-mpc-include=$MPC_ARCH_PATH/include \
-    --with-mpc-lib=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    --with-mpc-include=$MPC_PREFIX/include \
+    --with-mpc-lib=$MPC_PREFIX/lib$WM_COMPILER_LIB_ARCH
 CONFIG_OPTIONS
 )
 else
@@ -346,35 +382,35 @@ fi
 # or specify -no-multilib on the command-line
 #
 echo "---------------"
-if [ -d $GCC_ARCH_PATH ]
+if [ -d "$GCC_PREFIX" ]
 then
-    echo "Already built: $gccPACKAGE"
-elif _foamIsSystem $GCC_ARCH_PATH
+    echo "Already built: $GCC_PACKAGE"
+elif _foamIsSystem "$GCC_PREFIX"
 then
-    echo "Using gcc-system"
+    echo "Using system gcc"
 else
-    echo "Starting build: $gccPACKAGE"
+    echo "Starting build: $GCC_PACKAGE"
     echo
 (
-    sourceDIR=$sourceBASE/$gccPACKAGE
-    buildDIR=$buildBASE/$gccPACKAGE
+    PKG_SOURCE="$GCC_SOURCE"
+    PKG_PREFIX="$GCC_PREFIX"
+    PKG_BUILD="$buildBASE/$GCC_PACKAGE"
+    export GIT_DIR="$PKG_SOURCE/.git"
 
-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-    make distclean 2>/dev/null
+    cd "$PKG_SOURCE" || exit
+    make distclean 2>/dev/null || true
 
-    rm -rf $buildDIR
-    mkdir -p $buildDIR
-    cd $buildDIR
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
 
     unset configOpt
     # with/without multi-lib (32-bit support on 64-bit systems)
     [ -n "$optMultilib" ] && configOpt="--${optMultilib}-multilib"
 
-    set -x
-    $sourceDIR/configure \
-        --prefix=$GCC_ARCH_PATH \
-        --with-pkgversion=OpenFOAM \
+    cd "$PKG_BUILD" && set -x && \
+    "$PKG_SOURCE"/configure \
+        --prefix="$PKG_PREFIX" \
+        --with-pkgversion=www.openfoam.com \
         --enable-languages=c,c++ \
         --enable-__cxa_atexit \
         --enable-libstdcxx-allocator=new \
@@ -384,9 +420,9 @@ else
     && set +x \
     && make -j $WM_NCOMPPROCS \
     && make install \
-    && echo "Built: $gccPACKAGE"
+    && echo "Built: $GCC_PACKAGE"
 ) || {
-    echo "Error building: $gccPACKAGE"
+    echo "Error building: $GCC_PACKAGE"
     exit 1
 }
 fi

makeGperftools

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2012 OpenFOAM Foundation
+#     Copyright (C) 2012 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeGperftools
@@ -21,50 +21,59 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-
-# Gperftools version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig gperftools
 
-gperftoolsPACKAGE=${gperftools_version:-gperftools-system}
+PACKAGE="${gperftools_version:-none}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions gperf; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [gperftools-VERSION]
+Usage: ${0##*/} [gperftools-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build gperftools
-      $gperftoolsPACKAGE
+* Build gperftools
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint gperftools
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
+    gperftools/* | sources/gperftools* |\
     gperftools-[0-9]* | gperftools-svn* | gperftools-git)
-        gperftoolsPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -73,55 +82,67 @@ do
     shift
 done
 
-[ -n "$gperftoolsPACKAGE" ] || die "The gperftools-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone $gperftoolsPACKAGE
+if [ -z "$PACKAGE" ]
 then
-    echo "Using gperftools-none (skip ThirdParty build of gperftools)"
-    exit 0
-elif _foamIsSystem $gperftoolsPACKAGE
+    die "The GPERFTOOLS package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using gperftools-system (skip ThirdParty build of gperftools)"
+    echo "Using none/system (skip ThirdParty build of GPERFTOOLS)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build gperftools
-#
-GPERFTOOLS_SOURCE_DIR=$sourceBASE/$gperftoolsPACKAGE
-GPERFTOOLS_ARCH_PATH=$installBASE/$gperftoolsPACKAGE
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
 echo "---------------"
-if [ -d "$GPERFTOOLS_ARCH_PATH" ]
+if [ -z "$optForce" ] \
+&& [ -d "$PKG_PREFIX" ]
 then
-    echo "Already built: $gperftoolsPACKAGE"
+    echo "Already built: $PACKAGE"
 else
-    echo "Starting build: $gperftoolsPACKAGE"
+    echo "Starting build: $PACKAGE"
     (
-        buildDIR=$buildBASE/$gperftoolsPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
 
-        cd $GPERFTOOLS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        [ -e Makefile ] && make distclean 2>/dev/null
+        make distclean 2>/dev/null || true
 
-        rm -rf $GPERFTOOLS_ARCH_PATH
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        set -x
-        $GPERFTOOLS_SOURCE_DIR/configure \
-            --prefix=$GPERFTOOLS_ARCH_PATH \
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$PKG_PREFIX" \
         && set +x \
         && make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: $gperftoolsPACKAGE" \
+        && echo "Built: $PACKAGE" \
     ) || {
-        echo "Error building: $gperftoolsPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
+
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$PKG_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $PACKAGE"
+            rm -rf "$PKG_PREFIX/$dir"
+        fi
+    done
+    rmdir "$PKG_PREFIX"/share 2>/dev/null || true
+
 fi
 
 #------------------------------------------------------------------------------

makeHDF5

@@ -0,0 +1,235 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2024 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# Script
+#     makeHDF5
+#
+# Description
+#     Build script for HDF5
+#
+# ----------------------------------------------
+# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
+#------------------------------------------------------------------------------
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+
+# Short-circuit test for an installation
+if [ "$1" = "-test" ]
+then
+    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="hdf5"
+    libName="hdf5"
+    for lib in \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
+    exit 2
+fi
+#------------------------------------------------------------------------------
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
+#------------------------------------------------------------------------------
+# Obtain version from OpenFOAM etc/config.sh file:
+_foamConfig hdf5
+
+PACKAGE="${hdf5_version:-none}"
+
+# Hint for cmake findMPI
+if [ -d "$MPI_ARCH_PATH" ]
+then
+    export MPI_HOME="$MPI_ARCH_PATH"
+fi
+
+#------------------------------------------------------------------------------
+printVersions() { listPackageVersions hdf5; exit 0; }
+printHelp() {
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [HDF5-VERSION]
+options:
+  -force            Force compilation, even if include/library already exists
+  -gcc              Force use of gcc/g++
+  -cmake PATH       With cmake from the given path
+  -mpi-home PATH    With hint for MPI_HOME
+  -DNAME=VALUE      add cmake variable
+  -list             List available unpacked source versions
+  -help             Display usage help
+
+* Build HDF5
+      ${PACKAGE:-[unspecified]}
+
+USAGE
+    showDownloadHint hdf5
+    exit 0  # Clean exit
+}
+#------------------------------------------------------------------------------
+exportCompiler minimal  # Minimal compiler info for CMake/configure
+
+unset optForce
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
+    -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+
+    -cmake)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        CMAKE_PATH="${2%%/}"
+        shift
+        ;;
+    -mpi-home) # mpi with hint
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        export MPI_HOME="${2%%/}"
+        case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
+        shift
+        ;;
+
+    hdf/* | hdf5/* | sources/hdf* | \
+    hdf5[-_][0-9]* | hdf5-git* )
+        PACKAGE="${1%%/}"
+        ;;
+    -D[A-Z]*=* | [A-Z]*=*)  # cmake variables
+        addCMakeVariable "$1"
+        ;;
+    *)
+        die "unknown option/argument: '$1'"
+        ;;
+    esac
+    shift
+done
+
+if [ -z "$PACKAGE" ]
+then
+    die "The HDF5 package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
+then
+    echo "Using none/system (skip ThirdParty build of HDF5)"
+    exit 0
+fi
+
+# Known build issues for mingw (various things)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ "$optForce" = true ]
+    then
+        echo "Warning: hdf5 - likely compilation issues with $WM_COMPILER"
+    else
+        echo "Skipping hdf5 - likely compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
+#------------------------------------------------------------------------------
+#
+# Build HDF5
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
+
+: "${FOAM_MPI:=dummy}"
+
+# FUTURE:
+#
+# Manual installation of parallel libraries
+# from libdir to -> $FOAM_EXT_LIBBIN/$FOAM_MPI
+#
+
+echo
+echo ========================================
+echo "Build hdf5 library $PACKAGE for $FOAM_MPI"
+echo
+
+# Needs future adjustment
+# - for mpi-specific library locations
+if [ -z "$optForce" ] \
+&& [ -f "$PKG_PREFIX/include/hdf5.h" ] \
+&& {
+    [ -r "$PKG_PREFIX/lib/libhdf5$EXT_SO" ] \
+ || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libhdf5$EXT_SO" ]
+}
+then
+    echo "    HDF5 already built : $PKG_PREFIX"
+else
+    # CMake options often lag the configure ones
+    echo "Starting build: $PACKAGE (using cmake)"
+    echo
+    (
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
+
+        applyPatch "$PACKAGE" "$PKG_SOURCE"
+
+        # Remove any existing build folder and recreate
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
+
+        # May not work properly with FOAM_MPI = dummy
+        if [ "$FOAM_MPI" != dummy ]
+        then
+            CC=mpicc
+            CXX=mpicxx
+        fi
+
+        cmake=$(findCMake)
+
+        # Installs into lib64/
+        cd "$PKG_BUILD" && set -x && \
+        ${cmake:?} \
+            -DCMAKE_INSTALL_PREFIX="$PKG_PREFIX" \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DHDF5_BUILD_FORTRAN=FALSE \
+            -DHDF5_BUILD_TESTING=FALSE \
+            -DHDF5_BUILD_STATIC_LIBS=FALSE \
+            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
+            "$PKG_SOURCE" \
+        && make -j $WM_NCOMPPROCS all \
+        && make install \
+        && echo "Built: $PACKAGE"
+    ) || {
+        echo "Error building: $PACKAGE"
+        exit 1
+    }
+fi
+
+# -----------------------------------------------------------------------------

makeHYPRE

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeHYPRE
@@ -19,87 +20,70 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library ending (default is .so)
-[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
-
-# Short-circuit test for an installation
-if [ "$1" = "-test" ]
+if :    # Run from third-party directory
 then
-    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- HYPRE_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libhypre$EXT_SO \
-            $dir/lib/libhypre.a \
-            $dir/lib/libhypre$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    hypre include: $dir/include"
-                echo "    hypre library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
-    exit 2
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
 fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-#------------------------------------------------------------------------------
+# Obtain version from etc/config.sh file:
 _foamConfig hypre
 
-hyprePACKAGE=${hypre_version:-hypre-system}
+PACKAGE="${hypre_version:-none}"
 targetType=libso
 
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset HYPRE_ARCH_PATH
+fi
+
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions hypre; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION]
+Usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build HYPRE with
-      ${hyprePACKAGE:-'unspecified hypre version'}
+* Build HYPRE with
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint hypre
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    --) break;; # Extra configure options (leave on $@ for later detection)
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     lib|libso)
         targetType="$1"
         ;;
 
-    hypre-[0-9]*)
-        hyprePACKAGE="${1%%/}"
+    hypre/* | sources/hypre* |\
+    hypre-[0-9]* | hypre-git)
+        PACKAGE="${1%%/}"
         unset HYPRE_ARCH_PATH  # Avoid inconsistency
         ;;
     *)
@@ -109,16 +93,12 @@ do
     shift
 done
 
-[ -n "$hyprePACKAGE" ] || die "The hypre-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone $hyprePACKAGE
+if [ -z "$PACKAGE" ]
 then
-    echo "Using hypre-none (skip ThirdParty build of HYPRE)"
-    exit 0
-elif _foamIsSystem $hyprePACKAGE
+    die "The HYPRE package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using hypre-system"
+    echo "Using none/system (skip ThirdParty build of HYPRE)"
     exit 0
 fi
 
@@ -126,14 +106,23 @@ fi
 #
 # Build HYPRE
 #
-#   HYPRE_ARCH_PATH  : installation directory
-#   HYPRE_SOURCE_DIR : location of the original sources
+#   HYPRE_ARCH_PATH : installation directory (as per config file)
+#
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-HYPRE_SOURCE_DIR=$sourceBASE/$hyprePACKAGE
-: "${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$hyprePACKAGE}"
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-[ -d "$HYPRE_SOURCE_DIR" ] || {
-    echo "Missing sources: '$hyprePACKAGE'"
+# Override as per config file (if any)
+[ -n "$HYPRE_ARCH_PATH" ] && PKG_PREFIX="$HYPRE_ARCH_PATH"
+
+[ -d "$PKG_SOURCE" ] || {
+    echo "Missing sources: '$PACKAGE'"
+    showDownloadHint hypre
     exit 1
 }
 
@@ -142,31 +131,37 @@ HYPRE_SOURCE_DIR=$sourceBASE/$hyprePACKAGE
 CC="$(whichMpicc)"
 CXX="$(whichMpicxx)"
 
-echo "Starting build: $hyprePACKAGE ($targetType)"
+echo "Starting build: $PACKAGE ($targetType)"
 echo
 (
-    # Configuration options:
+    # Configuration options
     unset configOpt
 
-    cd $HYPRE_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    # Additional configure options
+    if [ "$1" = "--" ]
+    then
+        shift
+        configOpt="$configOpt $@"
+    fi
 
-    rm -rf $HYPRE_ARCH_PATH
-    [ -e Makefile ] && make distclean 2>/dev/null
+    cd "$PKG_SOURCE/src" || exit
 
+    rm -rf "$PKG_PREFIX"
+    make distclean 2>/dev/null || true
+
+    set -x && \
     ./configure \
-       --prefix=$HYPRE_ARCH_PATH \
+       --prefix="$PKG_PREFIX" \
        --disable-fortran \
        --enable-shared \
        $configOpt \
     && make -j $WM_NCOMPPROCS \
     && echo "Built: hypre" \
     && make install \
-    && echo "Installed: hypre"
+    && echo "Installed: $PACKAGE"
 ) || {
-    echo "Error building: hypre"
+    echo "Error building: $PACKAGE"
     exit 1
 }
 
-
 #------------------------------------------------------------------------------

makeKAHIP

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeKAHIP
@@ -26,80 +27,123 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- KAHIP_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libkahip$EXT_SO \
-            $dir/lib/libkahip.a \
-            $dir/lib/libkahip$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    kahip include: $dir/include"
-                echo "    kahip library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="kahip"
+    libName="libkahip"
+    for lib in \
+        "$FOAM_EXT_LIBBIN/$libName$EXT_SO" \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
     exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
+# Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig kahip
 
-kahipPACKAGE=${KAHIP_VERSION:-kahip-system}
+PACKAGE="${KAHIP_VERSION:-system}"
 targetType=libso
 
+# Hint for cmake findMPI
+if [ -d "$MPI_ARCH_PATH" ]
+then
+    export MPI_HOME="$MPI_ARCH_PATH"
+fi
+
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset KAHIP_ARCH_PATH
+fi
+
 #------------------------------------------------------------------------------
-usage()
-{
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions kahip; exit 0; }
+printHelp() {
     /bin/cat<<USAGE
 
 Usage: ${0##*/} [OPTION] [lib|libso] [kahip-VERSION]
 options:
-  -gcc          Force use of gcc/g++
-  -help
+  -gcc              Force use of gcc/g++
+  -force            Force build attempt (mingw)
+  -cmake PATH       With cmake from the given path
+  -bin              Create kahip binaries as well
+  -no-bin           Suppress creation of kahip binaries (default)
+  -mpi-home PATH    With hint for MPI_HOME
+  -no-mpi           Compile without MPI
+  -list             List available unpacked source versions
+  -help             Display usage help
 
-* Compile KaHIP
-      $kahipPACKAGE
+* Build kahip (int32_t only)
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint kahip
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
+exportCompiler minimal  # Minimal compiler info for CMake/configure
+
+unset optForce optNoExtlib
+optBinaries=false
+optWithMPI=true
+optLabelSize="${WM_LABEL_SIZE:-32}"
 
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
+    -gcc)       useGccWmake ;;
+    -force)     optForce=true ;;
+    -int32 | -int64) echo "ignoring $1" ;;
+    -bin)       optBinaries=true ;;
+    -no-bin)    optBinaries=false ;;
+    -no-mpi)    optWithMPI=false ;;
+    -no-extlib) optNoExtlib=true ;;  # Hidden option (experimental)
+
+    -cmake)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        CMAKE_PATH="${2%%/}"
+        shift
+        ;;
+    -mpi-home) # mpi with hint
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        export MPI_HOME="${2%%/}"
+        case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
+        shift
+        ;;
 
     lib|libso)
         targetType="$1"
         ;;
 
-    kahip-[1-9]* | kahip-git | KaHIP_* |  KaHIP-[1-9]*)
-        kahipPACKAGE="${1%%/}"
+    kahip/* | sources/kahip* | sources/KaHIP* |\
+    kahip-[0-9]* | kahip-git | KaHIP_* |  KaHIP-[0-9]*)
+        PACKAGE="${1%%/}"
         unset KAHIP_ARCH_PATH  # Avoid inconsistency
         ;;
     *)
@@ -109,90 +153,323 @@ do
     shift
 done
 
-[ -n "$kahipPACKAGE" ] || die "The kahip-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone $kahipPACKAGE
+if [ -z "$PACKAGE" ]
 then
-    echo "Using kahip-none (skip ThirdParty build of KAHIP)"
-    exit 0
-elif _foamIsSystem $kahipPACKAGE
+    die "The KAHIP package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using kahip-system"
+    echo "Using none/system (skip ThirdParty build of KAHIP)"
     exit 0
 fi
 
-requireWMakeToolchain
+# Known build issues for mingw (uses some non-portable headers)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ "$optForce" = true ]
+    then
+        echo "Warning: kahip - known compilation issues with $WM_COMPILER"
+    else
+        echo "Skipping kahip - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
+if [ "$optNoExtlib" = true ]
+then
+    unset FOAM_EXT_LIBBIN
+else
+    requireExtLibBin
+fi
 
 #------------------------------------------------------------------------------
 #
 # Build KaHIP
 #
-#   KAHIP_ARCH_PATH  : installation directory
-#   KAHIP_SOURCE_DIR : location of the original sources
-
-KAHIP_SOURCE_DIR=$sourceBASE/$kahipPACKAGE
-KAHIP_ARCH_PATH=$installBASE/$kahipPACKAGE
-
-[ -d "$KAHIP_SOURCE_DIR" ] || {
-    echo "Missing sources: '$kahipPACKAGE'"
-    exit 1
-}
-
+#   KAHIP_ARCH_PATH : installation directory (as per config file)
 #
-# Manual installation
-#
-install()
-{
-    # Ensure a clean build next time
-    wclean
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-    local bindir=$KAHIP_ARCH_PATH/bin
-    local incdir=$KAHIP_ARCH_PATH/include
-    local libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+# Future:  PKG_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PACKAGE"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-    mkdir -m 0755 -p $incdir
+# Override as per config file (if any)
+[ -n "$KAHIP_ARCH_PATH" ] && PKG_PREFIX="$KAHIP_ARCH_PATH"
 
-    /bin/cp -pv \
-        $KAHIP_SOURCE_DIR/interface/kaHIP_interface.h \
-        $incdir
-}
-
-echo "Starting build: $kahipPACKAGE ($targetType)"
-echo
-(
-    cd $KAHIP_SOURCE_DIR/lib || exit 1
-    export GIT_DIR=$KAHIP_SOURCE_DIR/.git # Mask seeing our own git-repo
-
-    rm -rf $KAHIP_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libkahip$EXT_SO
-
-    libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-
-    cpMakeFiles kahip 2>/dev/null
-
-    if [ -e ../interface -a ! -e interface ]
-    then
-        ln -s ../interface interface
-    fi
-
-    # Place static libraries in sub-directory:
-    if [ "$targetType" = lib ]
-    then
-        mkdir -m 0755 -p $libdir 2>/dev/null
-        export FOAM_EXT_LIBBIN=$libdir
-    fi
-
-    # Location of lib sources for wmake
-    export KAHIP_LIB_SRC=$PWD
-
-    wmake -j $WM_NCOMPPROCS -s $targetType \
-    && echo "Built: kahip" \
-    && install
-) || {
-    echo "Error building: kahip"
-    exit 1
+[ -d "$PKG_SOURCE" ] || {
+    echo "Missing sources: '$PACKAGE'"
+    showDownloadHint kahip
+    exit 2
 }
 
 
+#------------------------------------------------------------------------------
+
+# - newer versions use CMake.
+# - intermediate versions (eg, kahip-2.11) had CMakeLists but didn't install
+#   include/ which means the scons workaround is probably better.
+# - very old versions only had scons.
+
+# NB: the flags for 64bit indices in the header seem to be missing.
+
+unset useWmakeWorkaround
+if [ -f "$PKG_SOURCE/SConstruct" ]
+then
+    # Use wmake for old scons builds
+    echo "Using wmake for the build..."
+    useWmakeWorkaround=true
+    requireWMakeToolchain
+fi
+
+
+#
+# Manual installation of serial libraries
+# from libdir to -> $FOAM_EXT_LIBBIN
+#
+install()
+{
+    local bindir="$PKG_PREFIX"/bin
+    local libdir_source="$1"
+    local libdir_serial="$FOAM_EXT_LIBBIN"
+    local libdir_parallel="$FOAM_EXT_LIBBIN/$FOAM_MPI"
+    local libname_suffix="-int$WM_LABEL_SIZE"
+
+    [ -n "$FOAM_EXT_LIBBIN" ] || unset libdir_serial libdir_parallel
+    [ -n "$WM_LABEL_SIZE" ] || unset libname_suffix
+
+    echo
+    echo "Adjusting installation"
+
+    if [ "$optBinaries" = false ]
+    then
+        echo "Removing binaries: $bindir"
+        rm -rf "$bindir" 2>/dev/null # Failed removal is uncritical
+    fi
+
+    if [ -z "$libdir_source" ]
+    then
+        libdir_source="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH"
+        if [ ! -d "$libdir_source" ]
+        then
+            libdir_source="$PKG_PREFIX/lib"
+        fi
+    fi
+
+    # Before kahip-v3.12 built 'libinterface'. Rename this to 'libkahip'
+    (
+        cd "$libdir_source" || exit
+        libname="libkahip"
+
+        for name in libinterface
+        do
+            if [ -f "$name$EXT_SO" ]
+            then
+                rm -f "$libname$EXT_SO" "$libname$libname_suffix$EXT_SO"
+                mv "$name$EXT_SO" "$libname$EXT_SO"
+                echo "Renamed $name -> $libname"
+                break
+            fi
+        done
+    )
+
+    # Rename lib as xxx-intNN qualified library names (non-windows)
+    if [ -n "$libname_suffix" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+    then
+    (
+        cd "$libdir_source" || exit
+        echo "Tagging libraries with $libname_suffix"
+        for name in libkahip libparhip_interface
+        do
+            if [ -f "$name$EXT_SO" ]
+            then
+                mv "$name$EXT_SO" "$name$libname_suffix$EXT_SO"
+                ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+    )
+    fi
+
+    local libdir_target
+
+    # Serial
+    libdir_target="$libdir_serial"
+    if [ -n "$libdir_target" ]
+    then
+        # Remove old libraries/links
+        for name in libkahip libkahip_interface libparhip_interface
+        do
+            rm -f "$libdir_target/$name$EXT_SO"
+            rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+        done
+        mkdir -p "$libdir_target"
+        echo "Relocating serial libraries"
+
+        # echo "Installing: $libdir_target/libkahip$libname_suffix"
+        mv -f "$libdir_source"/libkahip*"$EXT_SO" "$libdir_target" 2>/dev/null
+    fi
+
+    # Parallel
+    libdir_target="$libdir_parallel"
+    if [ -n "$libdir_target" ]
+    then
+        # Remove old libraries/links
+        for name in libkahip libkahip_interface libparhip_interface
+        do
+            rm -f "$libdir_target/$name$EXT_SO"
+            rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+        done
+        mkdir -p "$libdir_target"
+        echo "Relocating parallel libraries"
+
+        # echo "Installing: $libdir_target/libparhip$libname_suffix"
+        mv -f "$libdir_source"/libparhip*"$EXT_SO" "$libdir_target" 2>/dev/null
+    fi
+
+    rmdir "$libdir_source" 2>/dev/null  # Failed rmdir is uncritical
+    return 0
+}
+
+
+#
+# Manual installation
+#
+install_wmake()
+{
+    local bindir="$PKG_PREFIX"/bin
+    local incdir="$PKG_PREFIX"/include
+    local libdir_source="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH"
+    local libdir_target="$FOAM_EXT_LIBBIN"
+    local libname_suffix="-int$WM_LABEL_SIZE"
+
+    [ -n "$WM_LABEL_SIZE" ] || unset libname_suffix
+
+    # Leave static libraries in sub-directory
+    if [ "$targetType" = lib ] || [ -z "$FOAM_EXT_LIBBIN" ]
+    then
+        unset libdir_target
+    fi
+
+    # Remove build artifacts from the source directory
+    # (for a clean build next time)
+    wclean
+
+    echo
+    echo "Adjusting installation"
+    echo "Installing headers: $incdir"
+
+    mkdir -m 0755 -p "$incdir"
+    /bin/cp -pv \
+        "$PKG_SOURCE"/interface/kaHIP_interface.h \
+        "$incdir"
+
+    # Rename lib as xxx-intNN qualified library names (non-windows)
+    if [ -n "$libname_suffix" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+    then
+    (
+        cd "$libdir_source" || exit
+        echo "Tagging libraries with $libname_suffix"
+        for name in libkahip libparhip_interface
+        do
+            if [ -f "$name$EXT_SO" ]
+            then
+                mv "$name$EXT_SO" "$name$libname_suffix$EXT_SO"
+                ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+    )
+    fi
+
+    if [ -n "$libdir_target" ]
+    then
+        # Remove old libraries/links
+        for name in libkahip libkahip_interface libparhip_interface
+        do
+            rm -f "$libdir_target/$name$EXT_SO"
+            rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+        done
+        mkdir -p "$libdir_target"
+        echo "Relocating serial libraries"
+
+        # echo "Installing: $libdir_target/libkahip$libname_suffix"
+        mv -f "$libdir_source"/libkahip*"$EXT_SO" "$libdir_target" 2>/dev/null
+    fi
+
+    rmdir "$libdir_source" 2>/dev/null  # Failed rmdir is uncritical
+    return 0
+}
+
+if [ "${useWmakeWorkaround:-false}" = false ]
+then
+(
+    echo "Starting build: $PACKAGE using cmake"
+    echo
+
+    PKG_BUILD="$buildBASE/$PACKAGE"
+    cd "$PKG_SOURCE" || exit
+
+    # Remove any existing build folder and recreate
+    rm -rf "$PKG_PREFIX"
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
+
+    unset buildOpt
+    if [ "$optWithMPI" = false ]
+    then
+        buildOpt="${buildOpt} -DPARHIP=OFF"
+    fi
+
+    cmake=$(findCMake)
+
+    cd "$PKG_BUILD" && set -x && \
+    ${cmake:?} \
+        -B "$PKG_BUILD" \
+        -S "$PKG_SOURCE" \
+        -DCMAKE_INSTALL_PREFIX="$PKG_PREFIX" \
+        -DCMAKE_BUILD_TYPE=Release \
+        $buildOpt \
+        ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
+     && set +x \
+     && make -j $WM_NCOMPPROCS \
+     && make install \
+     && install \
+     && echo "Built: $PACKAGE"
+) || {
+    echo "Error building: $PACKAGE"
+    exit 1
+}
+elif true
+then
+(
+    echo "Starting build: $PACKAGE ($targetType) using wmake"
+    echo
+
+    cd "$PKG_SOURCE/lib" || exit
+
+    rm -rf "$PKG_PREFIX"
+    rm -f "$FOAM_EXT_LIBBIN/libkahip"*
+
+    export KAHIP_LIB_DIR="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH"
+    mkdir -m 0755 -p "$KAHIP_LIB_DIR" 2>/dev/null
+
+    cpMakeFiles kahip 2>/dev/null
+
+    if [ -e ../interface ] && [ ! -e interface ]
+    then
+        ln -s ../interface interface
+    fi
+
+    wmake -j $WM_NCOMPPROCS -s $targetType \
+    && echo "Built: $PACKAGE" \
+    && install_wmake
+) || {
+    echo "Error building: $PACKAGE"
+    exit 1
+}
+fi
+
 #------------------------------------------------------------------------------

makeLLVM

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeLLVM
@@ -39,13 +39,16 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 
 [ "${WM_COMPILER#Clang}" = "$WM_COMPILER" ] && WM_COMPILER=Clang  # Force clang
@@ -54,25 +57,26 @@ WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 # LLVM/Clang version from OpenFOAM etc/config.sh file:
 _foamConfig compiler
 
-llvmPACKAGE=$clang_version
+PACKAGE="$clang_version"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions llvm; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [llvm-VERSION]
+Usage: ${0##*/} [OPTION] [llvm-VERSION]
 options:
   -gcc          Force use of gcc/g++
   -cmake PATH   with cmake from the given path
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build llvm/clang
-      ${llvmPACKAGE:-'unspecified LLVM version'}
+* Build llvm/clang
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint llvm
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
@@ -82,7 +86,8 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
 
     -cmake)
@@ -90,11 +95,13 @@ do
         CMAKE_PATH="${2%%/}"
         shift
         ;;
+
+    llvm/* | sources/llvm* |\
     llvm-[0-9]* | llvm-svn*)
-        llvmPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
-    [1-9]*)
-        llvmPACKAGE="llvm-${1%%/}"
+    [0-9]*)
+        PACKAGE="llvm-${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -103,97 +110,97 @@ do
     shift
 done
 
-[ -n "$llvmPACKAGE" ] || die "The llvm-VERSION was not specified"
+if [ -z "$PACKAGE" ]
+then
+    die "The LLVM package/version not specified"
+fi
 
 #------------------------------------------------------------------------------
-# Build/install locations without a compiler name
-buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER_ARCH
-installBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
+# !Build/install locations with arch name only (NO compiler name)!
+buildBASE="$(dirname "$buildBASE")/$WM_ARCH$WM_COMPILER_ARCH"
+installBASE="$(dirname "$installBASE")/$WM_ARCH$WM_COMPILER_ARCH"
 
 # Build LLVM (clang)
-#   LLVM_SOURCE_DIR : location of the original sources
-#   LLVM_BUILD_DIR  : location of the build
-#   LLVM_ARCH_PATH  : location of the installed program
-# - Strip any trailing '.src' from the proper names
+#   *PACKAGE   : name-version of the package
+#   *SOURCEDIR : location of original sources
+#   *PREFIXDIR : installation directory
+# Note: strip trailing '.src' from package name
 
-LLVM_SOURCE_DIR=$sourceBASE/$llvmPACKAGE
-LLVM_BUILD_DIR=$buildBASE/${llvmPACKAGE%%.src}
-LLVM_ARCH_PATH=$installBASE/${llvmPACKAGE%%.src}
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE" .src)"   # Strip of trailing .src
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"    # Avoid seeing our own git-repo
 
-#
-# Build LLVM
-#
+
+# Building...
 echo "---------------"
-if [ -d $LLVM_ARCH_PATH ]
+if [ -d "$PKG_PREFIX" ]
 then
-    echo "Already built: $llvmPACKAGE"
-elif [ -z "$CMAKE_PATH" ] && $LLVM_SOURCE_DIR/configure -help >/dev/null 2>&1
+    echo "Already built: $PACKAGE"
+elif [ -z "$CMAKE_PATH" ] && "$PKG_SOURCE"/configure -help >/dev/null 2>&1
 then
     # configure can be used prior to 3.9.0
     # but use cmake if someone explicitly mentioned -cmake on the command-line
 
-    echo "Starting build: $llvmPACKAGE (using configure)"
+    echo "Starting build: $PACKAGE (using configure)"
     echo
     (
-        cd $LLVM_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        make distclean 2>/dev/null
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
+        make distclean 2>/dev/null || true
 
-        rm -rf $LLVM_BUILD_DIR
-        mkdir -p $LLVM_BUILD_DIR
-        cd $LLVM_BUILD_DIR
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        set -x
-        $LLVM_SOURCE_DIR/configure \
-            --prefix=$LLVM_ARCH_PATH \
-            --with-gcc-toolchain=$(which gcc | sed s%/bin/gcc%%) \
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$PKG_PREFIX" \
+            --with-gcc-toolchain="$(command -v gcc | sed 's%/bin/gcc%%')" \
             --enable-optimized \
             --enable-shared \
         && set +x \
         && make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: $llvmPACKAGE"
+        && echo "Built: $PACKAGE"
     ) || {
-        echo "Error building: $llvmPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
 
 else
     # CMake used with 3.9.0 and later
 
-    echo "Starting build: $llvmPACKAGE (using cmake)"
+    echo "Starting build: $PACKAGE (using cmake)"
     echo
     (
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
+
         # Configuration options:
         unset configOpt
-
-        cd $LLVM_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
         if [ -f tools/openmp/CMakeLists.txt ]
         then
             configOpt="$configOpt -DLLVM_TOOL_OPENMP_BUILD=ON"
         fi
 
-        rm -rf $LLVM_BUILD_DIR
-        mkdir -p $LLVM_BUILD_DIR
-        cd $LLVM_BUILD_DIR
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
         cmake=$(findCMake)
 
-        set -x
-        $cmake \
-            -DCMAKE_INSTALL_PREFIX=$LLVM_ARCH_PATH \
+        cd "$PKG_BUILD" && set -x && \
+        ${cmake:?} \
+            -DCMAKE_INSTALL_PREFIX="$PKG_PREFIX" \
             -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
             $configOpt \
-            $LLVM_SOURCE_DIR \
+            "$PKG_SOURCE" \
         && set +x \
         && make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: $llvmPACKAGE"
+        && echo "Built: $PACKAGE"
     ) || {
-        echo "Error building: $llvmPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
 

makeMETIS

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMETIS
@@ -26,80 +27,103 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- METIS_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libmetis$EXT_SO \
-            $dir/lib/libmetis.a \
-            $dir/lib/libmetis$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    metis include: $dir/include"
-                echo "    metis library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="metis"
+    libName="libmetis"
+    for lib in \
+        "$FOAM_EXT_LIBBIN/$libName$EXT_SO" \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
     exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
+# Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig metis
 
-metisPACKAGE=${METIS_VERSION:-metis-system}
+PACKAGE="${METIS_VERSION:-system}"
 targetType=libso
 
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset METIS_ARCH_PATH
+fi
+
 #------------------------------------------------------------------------------
-usage() {
+printVersions() { listPackageVersions metis; exit 0; }
+printHelp() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [lib|libso] [METIS-VERSION]
+Usage: ${0##*/} [OPTION] [lib|libso] [METIS-VERSION]
 options:
   -gcc          Force use of gcc/g++
-  -help
+  -int32        Use IDXTYPEWIDTH 32
+  -int64        Use IDXTYPEWIDTH 64
+  -bin          Create metis binaries as well
+  -no-bin       Suppress creation of metis binaries (default)
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build METIS with
-      ${metisPACKAGE:-'unspecified metis version'}
+* Build METIS (default: -int${WM_LABEL_SIZE:-32}) with
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint metis
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce optNoExtlib
+optBinaries=false
+optLabelSize="${WM_LABEL_SIZE:-32}"
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     echo "ignoring $1" ;;
+    -int32 | -int64) optLabelSize="${1#-int}" ;;
+    -bin)       optBinaries=true ;;
+    -no-bin)    optBinaries=false ;;
+    -no-extlib) optNoExtlib=true ;;  # Hidden option (experimental)
 
     lib|libso)
         targetType="$1"
         ;;
 
+    metis/* | sources/metis* | \
     metis-[0-9]*)
-        metisPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         unset METIS_ARCH_PATH  # Avoid inconsistency
         ;;
     *)
@@ -109,32 +133,54 @@ do
     shift
 done
 
-[ -n "$metisPACKAGE" ] || die "The metis-VERSION was not specified"
+if [ -z "$PACKAGE" ]
+then
+    die "The METIS package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
+then
+    echo "Using none/system (skip ThirdParty build of METIS)"
+    exit 0
+fi
 
-# Nothing to build
-if _foamIsNone $metisPACKAGE
+# Known build issues for mingw (various things)
+case "$WM_COMPILER" in
+(Mingw*)
+    if :
+    then
+        echo "Skipping metis - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
+if [ "$optNoExtlib" = true ]
 then
-    echo "Using metis-none (skip ThirdParty build of METIS)"
-    exit 0
-elif _foamIsSystem $metisPACKAGE
-then
-    echo "Using metis-system"
-    exit 0
+    unset FOAM_EXT_LIBBIN
+else
+    requireExtLibBin
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build METIS
+#   METIS_ARCH_PATH : installation directory (as per config file)
 #
-#   METIS_ARCH_PATH  : installation directory
-#   METIS_SOURCE_DIR : location of the original sources
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-METIS_SOURCE_DIR=$sourceBASE/$metisPACKAGE
-: "${METIS_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$metisPACKAGE}"
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-[ -d "$METIS_SOURCE_DIR" ] || {
-    echo "Missing sources: '$metisPACKAGE'"
-    exit 1
+# Override as per config file (if any)
+[ -n "$METIS_ARCH_PATH" ] && PKG_PREFIX="$METIS_ARCH_PATH"
+
+[ -d "$PKG_SOURCE" ] || {
+    echo "Missing sources: '$PACKAGE'"
+    showDownloadHint metis
+    exit 2
 }
 
 #
@@ -142,19 +188,70 @@ METIS_SOURCE_DIR=$sourceBASE/$metisPACKAGE
 #
 install()
 {
-    local libdir=$METIS_ARCH_PATH/lib
+    local bindir="$PKG_PREFIX"/bin
+    local libdir="$PKG_PREFIX"/lib
+    local libdir_target="$FOAM_EXT_LIBBIN"
+    local libname_suffix="-int$WM_LABEL_SIZE"
+
+    [ -n "$FOAM_EXT_LIBBIN" ] || unset libdir_target
+    [ -n "$WM_LABEL_SIZE" ] || unset libname_suffix
+
+    echo
+    echo "Adjusting installation"
+
+    if [ "$optBinaries" = false ]
+    then
+        echo "Removing binaries: $bindir"
+        rm -rf "$bindir" 2>/dev/null # Failed removal is uncritical
+    fi
 
     if [ "$targetType" = libso ]
     then
-        \mv $libdir/libmetis$EXT_SO $FOAM_EXT_LIBBIN
-        rmdir $libdir 2>/dev/null # Failed rmdir is uncritical
+        # Rename lib as xxx-intNN qualified library names (non-windows)
+        if [ -n "$libname_suffix" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+        then
+        (
+            cd "$libdir" || exit
+            echo "Tagging libraries with $libname_suffix"
+            for name in libmetis
+            do
+                if [ -f "$name$EXT_SO" ]
+                then
+                    mv "$name$EXT_SO" "$name$libname_suffix$EXT_SO"
+                    ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+                fi
+            done
+        )
+        fi
 
-        echo "Installing: $FOAM_EXT_LIBBIN/libmetis$EXT_SO"
+        if [ -n "$libdir_target" ]
+        then
+            # Remove old libraries and links
+            for name in libmetis
+            do
+                rm -f "$libdir_target/$name$EXT_SO"
+                rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+            done
+            mkdir -p "$libdir_target"
+            echo "Relocating serial libraries"
+
+            # echo "Installing: $libdir_target/libmetis"
+            mv -f "$libdir"/libmetis* "$libdir_target"
+        fi
     fi
+
+    rmdir "$libdir" 2>/dev/null  # Failed rmdir is uncritical
     return 0
 }
 
-echo "Starting build: $metisPACKAGE ($targetType)"
+
+echo "Starting build: $PACKAGE ($targetType)"
+if [ "$optLabelSize" != "$WM_LABEL_SIZE" ]
+then
+    echo "Using int-$optLabelSize instead of int-$WM_LABEL_SIZE"
+fi
+export WM_LABEL_SIZE="$optLabelSize"
+
 echo
 (
     # Configuration options:
@@ -164,20 +261,18 @@ echo
         configOpt="shared=1"
     fi
 
-    cd $METIS_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$PKG_SOURCE" || exit
+    rm -rf "$PKG_PREFIX"
+    rm -f "$FOAM_EXT_LIBBIN"/libmetis*
 
-    rm -rf $METIS_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libmetis$EXT_SO
-
-    # Adjust metis integer size to match OpenFOAM label-size
-    sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '$WM_LABEL_SIZE'=' \
+    # Adjust metis IDXTYPEWIDTH (integer size)
+    sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '"$optLabelSize"'=' \
         include/metis.h
 
     # No config option for the library location.
     # - build normally and use mv to relocate it
 
-    make config $configOpt prefix=$METIS_ARCH_PATH \
+    make config $configOpt prefix="$PKG_PREFIX" \
     && make -j $WM_NCOMPPROCS install \
     && echo "Built: metis" \
     && install

makeMGridGen

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMGridGen
@@ -19,52 +20,60 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from ThirdParty directory only
-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."
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-
-# mgridgen version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig mgridgen
 
-mgridgenPACKAGE=${MGRIDGEN_VERSION:-mgridgen-none}
+PACKAGE="${MGRIDGEN_VERSION:-none}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions mgridgen parmgridgen; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [mgridgen-VERSION]
+Usage: ${0##*/} [OPTION] [mgridgen-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* Build MGridGen
-      $mgridgenPACKAGE
+* Build MGridGen with
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    # showDownloadHint gridgen
+    exit 0   # Clean exit
 }
-
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
-    mgridgen-[1-9]* | MGridGen-[1-9]* | parmgridgen-[1-9]* | ParMGridGen-[1-9]*)
-        mgridgenPACKAGE="${1%%/}"
+    mgridgen/* | sources/*gridgen* | sources/*GridGen* | \
+    mgridgen-[0-9]* | MGridGen-[0-9]* | \
+    parmgridgen-[0-9]* | ParMGridGen-[0-9]*)
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -73,34 +82,32 @@ do
     shift
 done
 
-[ -n "$mgridgenPACKAGE" ] || die "The mgridgen-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$mgridgenPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using mgridgen-none (skip ThirdParty build of MGridGen)"
-    exit 0
-elif _foamIsSystem "$mgridgenPACKAGE"
+    die "The MGRIDGEN package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using mgridgen-system"
+    echo "Using none/system (skip ThirdParty build of MGRIDGEN)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build MGridGen
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-#   MGRIDGEN_SOURCE_DIR : location of the original sources
-#   MGRIDGEN_ARCH_PATH  : installation directory
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-MGRIDGEN_SOURCE_DIR=$WM_THIRD_PARTY_DIR/$mgridgenPACKAGE
-MGRIDGEN_ARCH_PATH="$installBASE$WM_SIZE_OPTIONS/$mgridgenPACKAGE"
-
-: ${FOAM_MPI:=dummy}
+: "${FOAM_MPI:=dummy}"
 
 echo
 echo ========================================
-echo "Build mgridgen library $mgridgenPACKAGE"
+echo "Build mgridgen library $PACKAGE"
 echo
 
 #
@@ -108,42 +115,44 @@ echo
 #
 install()
 {
-    echo "Install into $MGRIDGEN_ARCH_PATH"
+    echo "Install into $PKG_PREFIX"
 
-    local bindir=$MGRIDGEN_ARCH_PATH/bin
-    local incdir=$MGRIDGEN_ARCH_PATH/include
-    local libdir=$MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    local bindir="$PKG_PREFIX"/bin
+    local incdir="$PKG_PREFIX"/include
+    local libdir="$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH"
 
-    for dir in $MGRIDGEN_ARCH_PATH $bindir $incdir $libdir
+    for dir in "$PKG_PREFIX" "$bindir" "$incdir" "$libdir"
     do
-        mkdir -m 0755 -p $dir
+        mkdir -m 0755 -p "$dir"
     done
 
-    cp -vf mgridgen.h   $incdir
-    cp -vf libmgrid.a   $libdir
-    cp -vf mgridgen     $bindir
+    cp -vf mgridgen.h   "$incdir"
+    cp -vf libmgrid.a   "$libdir"
+    cp -vf mgridgen     "$bindir"
 
-    chmod -R 0644 $incdir/* $libdir/*
-    chmod -R 0755 $bindir/*
+    chmod -R 0644 "$incdir"/* "$libdir"/*
+    chmod -R 0755 "$bindir"/*
 }
 
 
 # Needs future adjustment
 # - for shared library
 # - for mpi-specific library locations
-if [ -f $MGRIDGEN_ARCH_PATH/include/mgridgen.h \
-  -a -r $MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmgrid.a ]
+if [ -z "$optForce" ] \
+&& [ -f "$PKG_PREFIX/include/mgridgen.h" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmgrid.a" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmgrid.a" ]
+}
 then
-    echo "    MGridGen header in $MGRIDGEN_ARCH_PATH/include"
-    echo "    MGridGen libs   in $MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
-    echo
+    echo "    MGridGen already built : $PKG_PREFIX"
 else
 (
-    cd $MGRIDGEN_SOURCE_DIR || exit 1
+    cd "$PKG_SOURCE" || exit
     [ -e Makefile ] && make realclean 2>/dev/null
 
     # Remove any existing build folder and recreate
-    rm -rf $MGRIDGEN_ARCH_PATH
+    rm -rf "$PKG_PREFIX"
 
     serial="$(whichCC)"             # CC (serial compiler) default=gcc
     # parallel=$(whichMpicc)        # PARCC (parallel compiler) default=mpicc
@@ -161,9 +170,10 @@ else
         make=make \
         serial \
     && install \
-    && echo "Built: $mgridgenPACKAGE"
+    && echo "Built: $PACKAGE"
 ) || {
-    echo "Error building: $mgridgenPACKAGE"
+    echo "Error building: $PACKAGE"
+    exit 1
 }
 fi
 

makeMPICH

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMPICH
@@ -26,73 +27,86 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
-    then
-        echo "Have mpich shared library (${dir##*/})"
-        exit 0
-    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
-    then
-        echo "Have mpich static library (${dir##*/})"
-        exit 0
-    else
-        echo "No mpich libraries found: ${dir:-not-specified}"
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="mpich"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package shared library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 # Transition
-# ~~~~~~~~~~
 _foamAddLib()  { true; }
 _foamAddMan()  { true; }
 _foamAddPath() { true; }
 #------------------------------------------------------------------------------
-
-WM_MPLIB=MPICH                                  # Ensure we get the correct MPI
-
-# mpich version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
+WM_MPLIB=MPICH      # Ensure we get the correct MPI
 _foamConfig mpi
 
-mpiPACKAGE=${FOAM_MPI:-mpich-system}
+PACKAGE="${FOAM_MPI:-system}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions mpich; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [mpich-VERSION] [-- configure-options]
+Usage: ${0##*/} [OPTION] [mpich-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build mpich with
-      ${mpiPACKAGE:-'unspecified mpich version'}
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint mpich
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
+    mpich/* | sources/mpich* | \
     mpich*)
-        mpiPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
 
     *)
@@ -102,37 +116,43 @@ do
     shift
 done
 
-[ -n "$mpiPACKAGE" ] || die "The mpich-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$mpiPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using mpich-none (skip ThirdParty build of mpich)"
-    exit 0
-elif _foamIsSystem "$mpiPACKAGE"
+    die "The MPICH package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using mpich-system (skip ThirdParty build of mpich)"
+    echo "Using none/system (skip ThirdParty build of MPICH)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
-# Build mpich
-#
-#   MPI_SOURCE_DIR : location of the original sources
-#   MPI_ARCH_PATH  : installation directory
+# Build MPICH
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
-MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi$EXT_SO" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+}
 then
-    echo "Already has shared library"
-elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+    echo "Already has shared library: $PKG_PREFIX"
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi.a" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
-    echo "Already has static library"
+    echo "Already has static library: $PKG_PREFIX"
 else
-    echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
+    echo "Starting build: $WM_MPLIB ($PACKAGE)"
     echo
 
     (
@@ -149,33 +169,51 @@ else
         # End of configuration options
         # ----------------------------
 
-        buildDIR=$buildBASE/$mpiPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
 
-        cd $MPI_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        [ -e Makefile ] && make distclean 2>/dev/null
+        cd "$PKG_SOURCE" || exit
+        make distclean 2>/dev/null || true
 
-        rm -rf $MPI_ARCH_PATH
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        set -x
-        $MPI_SOURCE_DIR/configure \
-            --prefix=$MPI_ARCH_PATH \
+        # reproducible build naming
+        local_destdir="$(dirname $PKG_PREFIX)"
+        local_prefix="/$(basename $local_destdir)/$(basename $PKG_PREFIX)"
+        local_destdir="$(dirname $local_destdir)"
+
+        echo
+        echo "configured prefix: $local_prefix"
+        echo "install directory: $local_destdir"
+        echo
+
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$local_prefix" \
             --disable-fortran --disable-g \
-            --libdir=$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
             --enable-shared --disable-static \
             $configOpt \
         && set +x \
         && make -j $WM_NCOMPPROCS \
-        && make install \
-        && echo "Built: $mpiPACKAGE" \
-        && pkgconfigAdjust $MPI_ARCH_PATH
+        && make install DESTDIR="$local_destdir" \
+        && echo "Built: $PACKAGE"
     ) || {
-        echo "Error building: $mpiPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
+
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$PKG_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $PACKAGE"
+            rm -rf "$PKG_PREFIX/$dir"
+        fi
+    done
+    rmdir "$PKG_PREFIX"/share 2>/dev/null || true
+
 fi
 
 #------------------------------------------------------------------------------

makeMVAPICH

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMVAPICH2
@@ -26,77 +27,90 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
-    then
-        echo "Have mpich shared library (${dir##*/})"
-        exit 0
-    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
-    then
-        echo "Have mpich static library (${dir##*/})"
-        exit 0
-    else
-        echo "No mpich libraries found: ${dir:-not-specified}"
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="mvapich"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 # Transition
-# ~~~~~~~~~~
 _foamAddLib()  { true; }
 _foamAddMan()  { true; }
 _foamAddPath() { true; }
 #------------------------------------------------------------------------------
-
-WM_MPLIB=MV2MPI                                 # Ensure we get the correct MPI
-
-# mvapich2 version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
+WM_MPLIB=MVA2MPI    # Ensure we get the correct MPI
 _foamConfig mpi
 
-mpiPACKAGE=${FOAM_MPI:-mvapich2-system}
+PACKAGE="${FOAM_MPI:-system}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions mvapich; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [mvapich2-VERSION] [-- configure-options]
+Usage: ${0##*/} [OPTION] [mvapich2-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build mvapich2 with
-      ${mpiPACKAGE:-'unspecified mpich version'}
+      ${PACKAGE:-[unspecified]}
 
 The additional configure-options could include, for example,
 
     ${0##*/} -- --disable-mcast
 
 USAGE
-    exit 1
+    showDownloadHint mvapich
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
+    mvapich/* | sources/mvapich* | \
     mvapich*)
-        mpiPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
 
     *)
@@ -106,37 +120,43 @@ do
     shift
 done
 
-[ -n "$mpiPACKAGE" ] || die "The mvapich-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$mpiPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using mvapich-none (skip ThirdParty build of mvapich)"
-    exit 0
-elif _foamIsSystem "$mpiPACKAGE"
+    die "The MVAPICH package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using mvapich-system (skip ThirdParty build of mvapich)"
+    echo "Using none/system (skip ThirdParty build of MVAPICH)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
-# Build mvapich
-#
-#   MPI_SOURCE_DIR : location of the original sources
-#   MPI_ARCH_PATH  : installation directory
+# Build MVAPICH
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
-MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi$EXT_SO" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+}
 then
-    echo "Already has shared library"
-elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+    echo "Already has shared library: $PKG_PREFIX"
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi.a" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
-    echo "Already has static library"
+    echo "Already has static library: $PKG_PREFIX"
 else
-    echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
+    echo "Starting build: $WM_MPLIB ($PACKAGE)"
     echo
 
     (
@@ -153,31 +173,28 @@ else
         # End of configuration options
         # ----------------------------
 
-        buildDIR=$buildBASE/$mpiPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
 
-        cd $MPI_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        [ -e Makefile ] && make distclean 2>/dev/null
+        cd "$PKG_SOURCE" || exit
+        make distclean 2>/dev/null || true
 
-        rm -rf $MPI_ARCH_PATH
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        set -x
-        $MPI_SOURCE_DIR/configure \
-            --prefix=$MPI_ARCH_PATH \
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$PKG_PREFIX" \
             --disable-fortran --disable-g \
-            --libdir=$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
             --enable-shared --disable-static \
             $configOpt \
         && set +x \
         && make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: $mpiPACKAGE" \
-        && pkgconfigAdjust $MPI_ARCH_PATH
+        && echo "Built: $PACKAGE" \
+        && pkgconfigAdjust "$PKG_PREFIX"
     ) || {
-        echo "Error building: $mpiPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
 fi

makeMesa

@@ -3,18 +3,19 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMesa
 #
 # Description
-#     Build script for Mesa
+#     Build script for MESA
 #
 # Note
 #     Building with mesa-12.x.x fails to create an include/GL directory and
@@ -22,42 +23,52 @@
 #
 #     Building with mesa-11.x, mesa-13.x and mesa-17.x seems to be okay.
 #
+# Known dependencies (likely incomplete)
+#
+# openSUSE 15.2:
+#
+#     dri2proto-devel
+#     glproto-devel
+#     libxshmfence-devel
+#
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-
-unset vtk_version mesa_version mesa_llvm              # Purge current values
-
-# mesa version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
+unset vtk_version mesa_version mesa_llvm    # Purge current values
 _foamConfig vtk
 
-mesaPACKAGE=$mesa_version
+PACKAGE="$mesa_version"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions mesa; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] mesa-VERSION [-- configure-options]
+Usage: ${0##*/} [OPTION] mesa-VERSION [-- configure-options]
 options:
   -gcc          Force use of gcc/g++
   -llvm VER     llvm version (in ThirdParty) or 'system' to use system
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* build Mesa with
-      ${mesaPACKAGE:-'unspecified MESA version'}
+* build MESA with
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint mesa
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
@@ -90,7 +101,8 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)
         useGcc
         unset withLLVM
@@ -103,8 +115,10 @@ do
     llvm-*)
         withLLVM="$1"
         ;;
+
+    mesa/* | sources/mesa* |\
     mesa-*)
-        mesaPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -113,22 +127,23 @@ do
     shift
 done
 
-[ -n "$mesaPACKAGE" ] || die "The mesa-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$mesaPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using mesa-none (skip ThirdParty build of MESA)"
-    exit 0
-elif _foamIsSystem "$mesaPACKAGE"
+    die "The MESA package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using mesa-system (skip ThirdParty build of MESA)"
+    echo "Using none/system (skip ThirdParty build of MESA)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 # Locate third-party clang as required
 case "$withLLVM" in
+('' | none | false)
+    withLLVM=none
+    echo "Without llvm"
+    ;;
+
 (true | system)
     LLVM_ARCH_PATH="$(command -v clang)" || {
         echo "Error: could not properly locate llvm/clang"
@@ -138,51 +153,61 @@ case "$withLLVM" in
     # Root installation directory
     LLVM_ARCH_PATH="${LLVM_ARCH_PATH%/bin/clang}"
 
-    [ -d "$LLVM_ARCH_PATH" ] || {
+    if [ -d "$LLVM_ARCH_PATH" ]
+    then
+        # Add to path (for llvm-config)
+        PATH="$LLVM_ARCH_PATH/bin:$PATH"
+    else
         echo "Error: could not properly locate llvm/clang"
         exit 2
-    }
-    ;;
-
-('' | none | false)
-    withLLVM=none
-    echo "No llvm"
+    fi
     ;;
 
 (llvm-*)
     echo "check llvm = $withLLVM"
     LLVM_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$withLLVM"
 
-    [ -d "$LLVM_ARCH_PATH" ] || {
+    if [ -d "$LLVM_ARCH_PATH" ]
+    then
+        # Add to path (for llvm-config)
+        PATH="$LLVM_ARCH_PATH/bin:$PATH"
+    else
         echo "Error: could not properly locate llvm/clang"
         exit 2
-    }
+    fi
     ;;
 esac
 
 #------------------------------------------------------------------------------
 #
 # Build MESA
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
+#
 # For 64-bit
 # - MESA itself will normally build into 'lib64' (depends on autoconfig).
-#
-#   MESA_SOURCE_DIR : location of the original sources
-#   MESA_ARCH_DIR   : installation directory
 
-MESA_SOURCE_DIR=$sourceBASE/$mesaPACKAGE
-MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
+
 
-#
 # Manual adjustments to mesa
 # - avoid GLES (GLES1) since <GLES/gl.h> may mask the <GL/gl.h> header
 adjustMESA()
 {
-    pkgconfigAdjust $MESA_ARCH_PATH
+    pkgconfigAdjust "$PKG_PREFIX"
 
-    \rm -rf $MESA_ARCH_PATH/include/GLES $MESA_ARCH_PATH/include/GLES1
+    rm -rf "$PKG_PREFIX"/include/GLES "$PKG_PREFIX"/include/GLES1
     echo "removed all gles1 includes"
 }
 
+# Old MESA with autoconfig
+
+if [ -e "$PKG_SOURCE"/configure ]
+then
 (
     # Configuration options:
     unset configOpt compFlags
@@ -207,21 +232,14 @@ adjustMESA()
 
     # End of configuration options
     # ----------------------------
-    buildDIR=$buildBASE/$mesaPACKAGE
+    PKG_BUILD="$buildBASE/$PACKAGE"
 
-    cd $MESA_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-    # Remove any existing build
-    rm -rf $MESA_ARCH_PATH
-    rm -rf $buildDIR
-    mkdir -p $buildDIR
-    cd $buildDIR
+    cd "$PKG_SOURCE" || exit
 
     echo "----"
-    echo "Building $mesaPACKAGE"
-    echo "    Source  : $MESA_SOURCE_DIR"
-    echo "    Target  : $MESA_ARCH_PATH"
+    echo "Building $PACKAGE (with autoconf)"
+    echo "    Source  : $PKG_SOURCE"
+    echo "    Target  : $PKG_PREFIX"
     if [ -d "$LLVM_ARCH_PATH" ]
     then
         echo "    llvm    : $LLVM_ARCH_PATH"
@@ -235,9 +253,14 @@ adjustMESA()
     fi
 
     ## autoreconf -fi
-    set -x
-    $MESA_SOURCE_DIR/configure \
-        --prefix=$MESA_ARCH_PATH \
+
+    rm -rf "$PKG_PREFIX"
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
+
+    cd "$PKG_BUILD" && set -x && \
+    "$PKG_SOURCE"/configure \
+        --prefix="$PKG_PREFIX" \
         --disable-xvmc \
         --disable-glx \
         --disable-dri \
@@ -250,11 +273,82 @@ adjustMESA()
     && set +x \
     && make -j $WM_NCOMPPROCS \
     && make install \
-    && echo "Built $mesaPACKAGE" \
+    && echo "Built $PACKAGE" \
     && adjustMESA
 ) || {
     echo "Error building: MESA"
     exit 1
 }
 
+elif [ -e "$PKG_SOURCE"/meson.build ]
+then
+(
+    # Configuration options:
+    unset configOpt compFlags
+
+    # Sometimes for LLVM issues
+    # compFlags="-D_GLIBCXX_USE_CXX11_ABI=0"
+
+    # Possibly for older mesa versions (see paraview wiki)
+    # compFlags="-O2 -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
+
+    # Additional configure options
+    if [ "$1" = "--" ]
+    then
+        shift
+        configOpt="$configOpt $@"
+    fi
+
+    # End of configuration options
+    # ----------------------------
+    PKG_BUILD="$buildBASE/$PACKAGE"
+    cd "$PKG_SOURCE" || exit
+
+    echo "----"
+    echo "Building $PACKAGE (with meson)"
+    echo "    Source  : $PKG_SOURCE"
+    echo "    Target  : $PKG_PREFIX"
+    if [ -d "$LLVM_ARCH_PATH" ]
+    then
+        echo "    llvm    : $LLVM_ARCH_PATH"
+    fi
+    echo "----"
+
+    if [ -n "$compFlags" ]
+    then
+        CFLAGS="$CFLAGS $compFlags"
+        CXXFLAGS="$CXXFLAGS $compFlags"
+    fi
+
+    # Needs c++14 not c++11
+    CXXFLAGS="$(echo "$CXXFLAGS" | sed 's/c++11/c++14/')"
+
+    rm -rf "$PKG_PREFIX"
+    rm -rf "$PKG_BUILD"
+    mkdir -p "$PKG_BUILD"
+
+    cd "$PKG_SOURCE" && set -x && \
+    meson "$PKG_BUILD" \
+        --prefix="$PKG_PREFIX" \
+        -Dplatforms=x11 \
+        -Dosmesa=gallium \
+        -Dgallium-drivers=swrast \
+        -Ddri-drivers=[] \
+        -Dvulkan-drivers=[] \
+        $configOpt \
+    && set +x \
+    && ninja -j $WM_NCOMPPROCS -C "$PKG_BUILD" \
+    && ninja -C "$PKG_BUILD" install \
+    && echo "Built $PACKAGE" \
+    && adjustMESA
+) || {
+    echo "Error building: MESA"
+    exit 1
+}
+else
+    echo "Error building: MESA. Not autoconfig or meson?"
+    exit 1
+fi
+
+
 # -----------------------------------------------------------------------------

makeOPENMPI

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeOPENMPI
@@ -26,66 +27,74 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
-    then
-        echo "    Have openmpi shared library (${dir##*/})"
-        exit 0
-    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
-    then
-        echo "    Have openmpi static library (${dir##*/})"
-        exit 0
-    else
-        echo "No openmpi libraries found: ${dir:-not-specified}"
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="openmpi"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 fi
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 # Transition
-# ~~~~~~~~~~
 _foamAddLib()  { true; }
 _foamAddMan()  { true; }
 _foamAddPath() { true; }
 #------------------------------------------------------------------------------
-
-WM_MPLIB=OPENMPI                                # Ensure we get the correct MPI
-
-# openmpi version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
+WM_MPLIB=OPENMPI    # Ensure we get the correct MPI
 _foamConfig mpi
 
-mpiPACKAGE=${FOAM_MPI:-openmpi-system}
+PACKAGE="${FOAM_MPI:-system}"
 
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions openmpi; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [openmpi-VERSION] [-- configure-options]
+Usage: ${0##*/} [OPTION] [openmpi-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -memcheck     Configure with --enable-memcheck (requires valgrind.h)
   -threaded     Configure with --enable-mpi-thread-multiple
   -no-threaded  Configure with --disable-mpi-thread-multiple
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build openmpi with
-      ${mpiPACKAGE:-'unspecified openmpi version'}
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint openmpi
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optMemchecker optThreaded
+unset optForce optMemchecker optThreaded
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -93,14 +102,17 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
     -memcheck*) optMemchecker=true ;;
     -thread*)   optThreaded=enable ;;
     -no-thread*) optThreaded=disable ;;
 
+    openmpi/* | sources/openmpi* | \
     openmpi-[0-9]* | openmpi_[0-9]* | openmpi-system )
-        mpiPACKAGE="${1%%/}"
+        PACKAGE="${1%%/}"
         ;;
 
     *)
@@ -110,37 +122,43 @@ do
     shift
 done
 
-[ -n "$mpiPACKAGE" ] || die "The openmpi-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$mpiPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using openmpi-none (skip ThirdParty build of openmpi)"
-    exit 0
-elif _foamIsSystem "$mpiPACKAGE"
+    die "The OPENMPI package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using openmpi-system (skip ThirdParty build of openmpi)"
+    echo "Using none/system (skip ThirdParty build of OPENMPI)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
-# Build openmpi
-#
-#   MPI_SOURCE_DIR : location of the original sources
-#   MPI_ARCH_PATH  : installation directory
+# Build OPENMPI
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
-MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi$EXT_SO" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+}
 then
-    echo "Already has shared library: $MPI_ARCH_PATH"
-elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+    echo "Already has shared library: $PKG_PREFIX"
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$PKG_PREFIX/lib/libmpi.a" ] \
+  || [ -r "$PKG_PREFIX/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
-    echo "Already has static library: $MPI_ARCH_PATH"
+    echo "Already has static library: $PKG_PREFIX"
 else
-    echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
+    echo "Starting build: $WM_MPLIB ($PACKAGE)"
     echo
 
     (
@@ -169,34 +187,59 @@ else
         # End of configuration options
         # ----------------------------
 
-        buildDIR=$buildBASE/$mpiPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
+        cd "$PKG_SOURCE" || exit
 
-        cd $MPI_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-        [ -e Makefile ] && make distclean 2>/dev/null
+        make distclean 2>/dev/null || true
 
-        rm -rf $MPI_ARCH_PATH
-        rm -rf $buildDIR
-        mkdir -p $buildDIR
-        cd $buildDIR
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
-        set -x
-        $MPI_SOURCE_DIR/configure \
-            --prefix=$MPI_ARCH_PATH \
-            --libdir=$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        # The real prefix is /path/ThirdParty/platforms/arch/openmpi-x.y.z
+        # but configure with prefix="/arch/openmpi-x.y.z"
+        # and install into "/path/ThirdParty/platforms"
+
+        # The final binaries are then independent of the build location and
+        # will always require OPAL_PREFIX to run
+
+        local_destdir="$(dirname $PKG_PREFIX)"
+        local_prefix="/$(basename $local_destdir)/$(basename $PKG_PREFIX)"
+        local_destdir="$(dirname $local_destdir)"
+
+        echo
+        echo "configured prefix: $local_prefix"
+        echo "install directory: $local_destdir"
+        echo
+
+        # Do not specify '--libdir' or relocating becomes difficult
+        cd "$PKG_BUILD" && set -x && \
+        "$PKG_SOURCE"/configure \
+            --prefix="$local_prefix" \
             --disable-orterun-prefix-by-default \
             --enable-shared --disable-static \
             --enable-mpi-fortran=none \
             $configOpt \
         && set +x \
         && make -j $WM_NCOMPPROCS \
-        && make install \
-        && echo "Built: $mpiPACKAGE" \
-        && pkgconfigAdjust $MPI_ARCH_PATH
+        && make install DESTDIR="$local_destdir" \
+        && echo "Built: $PACKAGE"
     ) || {
-        echo "Error building: $mpiPACKAGE"
+        echo "Error building: $PACKAGE"
         exit 1
     }
+
+    # Unneeded generated files
+    for dir in share/doc share/info share/man
+    do
+        if [ -d "$PKG_PREFIX/$dir" ]
+        then
+            echo "Discard $dir files to save space: $PACKAGE"
+            rm -rf "$PKG_PREFIX/$dir"
+        fi
+    done
+    rmdir "$PKG_PREFIX"/share 2>/dev/null || true
+
 fi
 
 #------------------------------------------------------------------------------

makePETSC

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makePETSC
@@ -19,88 +20,98 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library ending (default is .so)
-[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
-
-# Short-circuit test for an installation
-if [ "$1" = "-test" ]
+if :    # Run from third-party directory
 then
-    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- PETSC_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libpetsc$EXT_SO \
-            $dir/lib/libpetsc.a \
-            $dir/lib/libpetsc$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    petsc include: $dir/include"
-                echo "    petsc library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
-    exit 2
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
 fi
-#------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 _foamConfig petsc
 
-petscPACKAGE=${petsc_version:-petsc-system}
+PETSC_PACKAGE="${petsc_version:-none}"
 targetType=libso
 
+unset HYPRE_PACKAGE
+unset HYPRE_ARCH_PATH   # Avoid inconsistency
+
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset PETSC_ARCH_PATH
+fi
+
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions petsc; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [lib|libso] [PETSC-VERSION]
+Usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION] [PETSC-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
-  -help
+  -inplace      Build/install inplace (expert option)
+  -debug        Build with debugging enabled
+  -hypre=URL    Specify hypre download location
+  -no-hypre     Disable automatic hypre download/detection
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build PETSC with
-      ${petscPACKAGE:-'unspecified petsc version'}
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint petsc
+
+    echo
+    echo "Many people who have downloaded PETSC have also downloaded HYPRE :"
+    showDownloadHint hypre
+
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optDebug optForce optInplace optHypre
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    --) break;; # Extra configure options (leave on $@ for later detection)
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+    -inplace)   optInplace=true ;;
+    -debug)     optDebug=true ;;
 
-    lib|libso)
-        targetType="$1"
+    lib|libso)  targetType="$1" ;;
+
+    -hypre=*)
+        optHypre="${1#*=}"      # URL for download
+        unset HYPRE_PACKAGE HYPRE_ARCH_PATH
         ;;
 
-    petsc-[0-9]*)
-        petscPACKAGE="${1%%/}"
-        unset PETSC_ARCH_PATH  # Avoid inconsistency
+    -no-hypre)
+        optHypre=false
+        unset HYPRE_PACKAGE HYPRE_ARCH_PATH
+        ;;
+
+    hypre-[0-9]* | hypre-git)
+        HYPRE_PACKAGE="${1%%/}"
+        unset optHypre
+        unset HYPRE_ARCH_PATH   # Avoid inconsistency
+        ;;
+
+    petsc/* | sources/petsc* |\
+    petsc-[0-9]* | petsc-git)
+        PETSC_PACKAGE="${1%%/}"
+        unset PETSC_ARCH_PATH   # Avoid inconsistency
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -109,47 +120,103 @@ do
     shift
 done
 
-[ -n "$petscPACKAGE" ] || die "The petsc-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone $petscPACKAGE
+if [ -z "$PETSC_PACKAGE" ]
 then
-    echo "Using petsc-none (skip ThirdParty build of PETSC)"
-    exit 0
-elif _foamIsSystem $petscPACKAGE
+    die "The PETSC package/version not specified"
+elif _foamIsNone "$PETSC_PACKAGE" || _foamIsSystem "$PETSC_PACKAGE"
 then
-    echo "Using petsc-system"
+    echo "Using none/system (skip ThirdParty build of PETSC)"
     exit 0
 fi
 
+#------------------------------------------------------------------------------
+# Integrations
+
+# Clunky
+if [ -z "$optHypre" ] && [ -n "$HYPRE_PACKAGE" ] \
+&& ! _foamIsNone "$HYPRE_PACKAGE"
+then
+    echo "Using $HYPRE_PACKAGE"
+    : "${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$HYPRE_PACKAGE}"
+fi
+
+
 #------------------------------------------------------------------------------
 #
 # Build PETSC
 #
-#   PETSC_ARCH_PATH  : installation directory
-#   PETSC_SOURCE_DIR : location of the original sources
+#   PETSC_ARCH_PATH : installation directory (as per config file)
+#
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-PETSC_SOURCE_DIR=$sourceBASE/$petscPACKAGE
-: "${PETSC_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$petscPACKAGE}"
+PETSC_SOURCE="$(findSourceDir "$PETSC_PACKAGE")"
+PETSC_PACKAGE="$(basename "$PETSC_PACKAGE")"
+PETSC_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PETSC_PACKAGE"
 
-[ -d "$PETSC_SOURCE_DIR" ] || {
-    echo "Missing sources: '$petscPACKAGE'"
-    exit 1
+# Override as per config file (if any)
+[ -n "$PETSC_ARCH_PATH" ] && PETSC_PREFIX="$PETSC_ARCH_PATH"
+
+[ -d "$PETSC_SOURCE" ] || {
+    echo "Missing sources: '$PETSC_PACKAGE'"
+    showDownloadHint petsc
+    exit 2
 }
 
 
-echo "Starting build: $petscPACKAGE ($targetType)"
+# PETSC arch - same root as WM_OPTIONS (eg, DPInt32)
+archOpt="$WM_SIZE_OPTIONS"
+
+if [ -n "$optInplace" ]
+then
+    # Inplace installation. No install stage required
+    unset PETSC_PREFIX
+    makeInstall() { true; }
+else
+    # Regular installation location (PETSC_PREFIX)
+
+    makeInstall() {
+        make PETSC_DIR="$PETSC_SOURCE" PETSC_ARCH="$archOpt" install
+        pkgconfigAdjust "$PETSC_PREFIX"
+    }
+fi
+
+echo "Starting build: $PETSC_PACKAGE ($targetType)"
+if [ "$WM_PRECISION_OPTION" = SP ]
+then
+    optHypre=false  # No single-precision hypre
+    echo "No single-precision hypre"
+fi
+if [ -d "$PETSC_SOURCE/$archOpt/externalpackages" ]
+then
+    echo "Removing old $archOpt/externalpackages"
+    rm -rf "$PETSC_SOURCE/$archOpt/externalpackages"
+fi
 echo
 (
-    # PETSC arch - same root as WM_OPTIONS (eg, DPInt32)
-    archOpt="$WM_SIZE_OPTIONS"
+    # Configuration options
 
-    # Configuration options:
-    configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)"
+    # Compiler or MPI (but not both)
+    # if [ -d "$MPI_ARCH_PATH" ]
+    # then
+    #     configOpt="--with-mpi-dir=$MPI_ARCH_PATH"
+    # else
+        configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)"
+    # fi
+
+    if [ "$optDebug" = true ]
+    then
+        configOpt="$configOpt --with-debugging=1"
+    else
+        # A reasonable assumption for optimization
+        configOpt="$configOpt --with-debugging=0"
+        configOpt="$configOpt --COPTFLAGS=-O3 --CXXOPTFLAGS=-O3"
+    fi
 
     if [ "$targetType" = libso ]
     then
-        configOpt="--with-shared-libraries"
+        configOpt="$configOpt --with-shared-libraries"
     fi
 
     if [ "$WM_LABEL_SIZE" = 64 ]
@@ -166,27 +233,66 @@ echo
         configOpt="$configOpt --with-precision=double"
     fi
 
-    cd $PETSC_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    case "$optHypre" in
+    false)
+        configOpt="$configOpt --with-hypre=0"
+        ;;
+    ftp:* | git:* | http:* | https:*)
+        configOpt="$configOpt --download-hypre=$optHypre"
+        ;;
+    *)
+        # This is a really clunky way to use ThirdParty hypre
+        if [ -f "$HYPRE_ARCH_PATH/include/HYPRE.h" ]
+        then
+            echo "Has installed hypre: $HYPRE_PACKAGE"
+            configOpt="$configOpt --with-hypre-dir=$HYPRE_ARCH_PATH"
+        else
+            configOpt="$configOpt --download-hypre"
+        fi
+    ;;
+    esac
 
-    rm -rf $PETSC_ARCH_PATH
+    # Additional configure options
+    if [ "$1" = "--" ]
+    then
+        shift
+        configOpt="$configOpt $@"
+    fi
 
+    # We export compiler settings (above) but actually use the
+    # --with-cc and --with-cxx. So ignore these environment variables.
+
+    unset CC CXX
+    unset CFLAGS CXXFLAGS
+
+    cd "$PETSC_SOURCE" || exit
+    unset GIT_DIR # No special git-repo handling
+
+    if [ -n "$PETSC_PREFIX" ]
+    then
+        rm -rf "$PETSC_PREFIX"
+    fi
+    # No clean here, if we have multiple arch in the same directory
+
+    echo
+    set -x
     ./configure \
-       --prefix=$PETSC_ARCH_PATH \
-       --with-petsc-arch=$archOpt \
+        ${PETSC_PREFIX:+--prefix="$PETSC_PREFIX"} \
+       --PETSC_DIR="$PETSC_SOURCE" \
+       --with-petsc-arch="$archOpt" \
        --with-clanguage=C \
-       --with-scalapack=0 \
-       --with-superlu_dist=0 \
-       --with-suitesparse=0 \
-       --download-f2cblaslapack=1 \
+       --with-fc=0 \
+       --with-x=0 \
        $configOpt \
+     && set +x \
      && echo "Configured: petsc" \
-     && make PETSC_DIR=$PETSC_SOURCE_DIR PETSC_ARCH="$archOpt" all \
+     && make ${WM_NCOMPPROCS:+-j $WM_NCOMPPROCS} \
+            PETSC_DIR="$PETSC_SOURCE" PETSC_ARCH="$archOpt" all \
      && echo "Built: petsc" \
-     && make PETSC_DIR=$PETSC_SOURCE_DIR PETSC_ARCH="$archOpt" install
-     && echo "Installed: petsc"
+     && makeInstall \
+     && echo "Installed: $PETSC_PACKAGE"
 ) || {
-    echo "Error building: petsc"
+    echo "Error building: $PETSC_PACKAGE"
     exit 1
 }
 

makeParaView

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeParaView
@@ -26,19 +26,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-. etc/tools/ParaViewFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ParaViewFunctions
 #------------------------------------------------------------------------------
 
-unset ParaView_VERSION                                   # Purge current values
-
 # ParaView_VERSION from etc/config.sh file:
+unset ParaView_VERSION                  # Purge current values
 _foamConfig paraview
 
 # Avoid any potential conflicts (especially if building from git)
@@ -63,14 +66,19 @@ setParaViewVersion ${ParaView_VERSION:-none}
 # New rendering backend (starting with paraview 5.0).
 withGL2=auto # auto-config based on version
 
+# Hint for cmake findMPI
+if [ -d "$MPI_ARCH_PATH" ]
+then
+    export MPI_HOME="$MPI_ARCH_PATH"
+fi
+
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
+printVersions() { listPackageVersions paraview; exit 0; }
+printHelp() {
     : ${ParaView_VERSION:=none} # some dummy value for usage information
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [paraview-VERSION] [CMAKE-OPTION]
+Usage: ${0##*/} [OPTION] [paraview-VERSION] [CMAKE-OPTION]
 options:
   -gcc              Force use of gcc/g++
   -cmake PATH       with cmake from the given path
@@ -82,20 +90,24 @@ options:
   -mesa-lib PATH    path to mesa library     (current: ${MESA_LIBRARY:-none})
   -mpi              with mpi
   -mpi=N            with max 'N' mpi processes. N=0 for no upper-limit.
-  -python           with python
+  -mpi-home PATH    with mpi and hint for MPI_HOME
+  -python | -python2 | -python3
+                    with python
   -python-include DIR
                     location of python headers (current: ${PYTHON_INCLUDE:-none})
   -python-lib PATH  path to python library (current: ${PYTHON_LIBRARY:-none})
   -qmake PATH       with QT version corresponding to the qmake in given path
   -qt               with extra Qt gui support (if not already enabled)
-  -qt-VER           with QT version corresponding to
+  -qt-<VER>         with QT version corresponding to
                         \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/qt-VER/bin/qmake
   -verbose          verbose output in Makefiles
   -version VER      specify an alternative version (current: $ParaView_VERSION)
   -major   VER      specify an alternative major version for special builds
   -buildType NAME   specify the build type (default: Release)
   -suffix NAME      specify a suffix to distinguish the build
-  -help
+  -DNAME=VALUE      add cmake variable
+  -list             List available unpacked source versions
+  -help             Display usage help
 
 The -no-FEATURE option can be used to forcibly disable these features:
   -no-gl2 | -no-mesa | -no-mpi | -no-python | -no-qt
@@ -124,10 +136,11 @@ For example,
 Or change the \$WM_PROJECT_DIR/etc/config.sh/paraview settings.
 
 USAGE
-    exit 1
+    showDownloadHint paraview
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
-exportCompiler          # Compiler info for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure
 
 # Various building stages
 unset runPATCH runCONFIG runMAKE runINSTALL
@@ -138,13 +151,16 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
 
-    [0-9]* | paraview-[0-9]* | ParaView-[0-9]*) # paraview version
-        setParaViewVersion "${1%%/}"
+    # paraview version
+    paraview/* | vtk/* | sources/paraview* | sources/vtk* |\
+    [0-9]* | paraview-[0-9]* | ParaView-[0-9]* | ParaView-v[0-9]*)
+        setParaViewVersion "$(basename "$1")"
         ;;
-    [A-Z]*=*)            # cmake variables
+    -D[A-Z]*=* | [A-Z]*=*)  # cmake variables
         addCMakeVariable "$1"
         ;;
     -patch)              # stage 0: patch sources
@@ -228,14 +244,27 @@ do
         withMPI=true
         MPI_MAX_PROCS="${1##*=}"
         ;;
+    -mpi-home) # mpi with hint
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        withMPI=true
+        export MPI_HOME="${2%%/}"
+        case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
+        shift
+        ;;
     -no-mpi)
         withMPI=false
         ;;
     -python)
         withPYTHON=true
         ;;
+    -python2)
+        withPYTHON=true; withPYTHON3=false
+        ;;
+    -python3)
+        withPYTHON=true; withPYTHON3=true
+        ;;
     -no-python)
-        withPYTHON=false
+        withPYTHON=false; unset withPYTHON3
         ;;
     -python-include)
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
@@ -265,7 +294,7 @@ do
     -no-qt)
         withQT=false
         ;;
-    -qt-[1-9]*)
+    -qt-[0-9]*)
         withQT=true
         QMAKE_PATH="$installBASE/${1##-}"
         ;;
@@ -319,6 +348,16 @@ then
     fi
 fi
 
+# ParaView-5.7.0 default is python3
+if [ "$withPYTHON" = true ] && [ -z "$withPYTHON3" ]
+then
+    case "${ParaView_VERSION}" in
+    (5.[7-9]* | [6-9]* | [1-9][0-9].*)
+        withPYTHON3=true
+        ;;
+    esac
+fi
+
 if [ "$runDEFAULT" = true ]
 then
     : ${runPATCH:=true}
@@ -340,6 +379,7 @@ fi
 
 # Set configure options
 #~~~~~~~~~~~~~~~~~~~~~~
+addGeneral          # general settings (version-dependent)
 addVerbosity        # verbose makefiles
 addMpiSupport       # set MPI-specific options
 addPythonSupport    # set Python-specific options
@@ -367,6 +407,10 @@ Features selected
     python    ${withPYTHON:-false}
     qt        ${withQT:-false}
 ---------------------
+Compiler
+    cxx       ${CXX:-unknown}
+    flags     ${CXXFLAGS:-none}
+---------------------
 Version information
     paraview  ${ParaView_VERSION:-unknown}
     major     ${ParaView_MAJOR:-unknown}

makeParaView.example

@@ -3,6 +3,8 @@
 # - mpi (0 = no upper-limit on processes)
 # - mesa
 # - python (required for Catalyst)
+# - has VTK_PYTHON_OPTIONAL_LINK=OFF to avoid
+#       undefined symbol: PyExc_ValueError
 #
 # NOTE: must modify etc/config.*/paraview to use this particular version
 # and combination, or use chaining as per etc/config.*/example/paraview
@@ -18,6 +20,8 @@ set -x
     -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
     -python \
     -suffix mesa-mpi-py \
+    -DPARAVIEW_ENABLE_FFMPEG=ON \
+    -DVTK_PYTHON_OPTIONAL_LINK=OFF \
     "$@"
 
 #------------------------------------------------------------------------------

makeQt

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeQt
@@ -21,46 +21,63 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-. etc/tools/QtFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/QtFunctions
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions qt; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [qt-VERSION] [-- configure-options]
+Usage: ${0##*/} [OPTION] [qt-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if it already exists
   -gcc          Force use of gcc/g++
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
 * build $qtTYPE, version ${qtVERSION:-undefined}
 
 USAGE
-    exit 1
+    showDownloadHint qt
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 exportCompiler true     # Compiler info + flags for CMake/configure
 
+unset optForce
+unset PACKAGE qtVERSION
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
     --) break;; # Extra configure options (leave on $@ for later detection)
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
-    -qt-[1-9]* | [1-9]* | qt-*)
+    qt/* | sources/qt*)
+        # -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
+        PACKAGE="${1%%/}";
+        qtVERSION="$(basename "$PACKAGE" | sed 's#^.*-##')"
+        ;;
+
+    -qt-[0-9]* | [0-9]* | qt-*)
         # -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
         qtVERSION="${1%%/}";
         qtVERSION="${qtVERSION##*-}"
+        PACKAGE="$qtTYPE-$qtVERSION"
         ;;
 
     *)
@@ -69,35 +86,41 @@ do
     esac
     shift
 done
-qtPACKAGE=$qtTYPE-$qtVERSION
 
-# Nothing to build
-if _foamIsNone "$qtPACKAGE"
+if [ -z "$PACKAGE" ]
 then
-    echo "Using qt-none (skip ThirdParty build of QT)"
-    exit 0
-elif _foamIsSystem "$qtPACKAGE"
+    die "The QT package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using qt-system"
+    echo "Using none/system (skip ThirdParty build of QT)"
     exit 0
 fi
 
 #------------------------------------------------------------------------------
 #
 # Build QT
+#
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-QT_SOURCE_DIR=$sourceBASE/$qtPACKAGE
-QT_ARCH_PATH=$installBASE/qt-$qtVERSION
+PKG_SOURCE="$(findSourceDir "$PACKAGE" "$qtTYPE-$qtVERSION")"
+PACKAGE="qt-$qtVERSION"
+PKG_PREFIX="$installBASE/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
 echo
 echo ========================================
-echo "Build Qt $qtPACKAGE"
+echo "Build Qt $PACKAGE"
 echo
-if [ -d "$QT_ARCH_PATH" -a -r "$QT_ARCH_PATH/bin/qmake" ]
+
+if [ -z "$optForce" ] \
+&& [ -d "$PKG_PREFIX" ] \
+&& [ -r "$PKG_PREFIX"/bin/qmake ]
 then
-    echo "Already built: Qt-$qtVERSION"
+    echo "Already built: $PACKAGE"
 else
-    echo "Starting build: Qt-$qtVERSION"
+    echo "Starting build: $PACKAGE"
     (
         # Configuration options:
         unset configOpt
@@ -131,35 +154,34 @@ else
 
         # End of configuration options
         # ----------------------------
-        buildDIR=$buildBASE/$qtPACKAGE
+        PKG_BUILD="$buildBASE/$PACKAGE"
 
-        cd $QT_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$PKG_SOURCE" || exit
         [ -e Makefile ] && make distclean 2>/dev/null
 
         # Remove any existing build folder and recreate
-        rm -rf $QT_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
+        rm -rf "$PKG_PREFIX"
+        rm -rf "$PKG_BUILD"
+        mkdir -p "$PKG_BUILD"
 
         # Remove any remnants from a previous shadow build
-        rm -f "$QT_SOURCE_DIR/.qmake.cache" 2>/dev/null
-        rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.h" 2>/dev/null
-        rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.cpp" 2>/dev/null
+        rm -f "$PKG_SOURCE"/.qmake.cache
+        rm -f "$PKG_SOURCE"/src/corelib/global/qconfig.h
+        rm -f "$PKG_SOURCE"/src/corelib/global/qconfig.cpp
 
-        cd $buildDIR || exit 1
+        cd "$PKG_BUILD" || exit
 
         # Compile as opensource, accepting LGPL conditions (yes)
-        echo yes | $QT_SOURCE_DIR/configure \
-            -prefix $QT_ARCH_PATH \
+        echo yes | "$PKG_SOURCE"/configure \
+            -prefix "$PKG_PREFIX" \
             -opensource \
             $configOpt \
         && time make -j $WM_NCOMPPROCS \
         && make install \
-        && echo "Built: Qt-$qtVERSION" \
-        && finalizeQt
+        && echo "Built: $PACKAGE" \
+        && finalizeQt "$PKG_PREFIX"
     ) || {
-        echo "Error building: Qt-$qtVERSION"
+        echo "Error building: $PACKAGE"
         exit 1
     }
 fi

makeSCOTCH

@@ -3,78 +3,95 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeSCOTCH
 #
 # Description
-#     Build the SCOTCH and PTSCOTCH libraries
+#     Build the SCOTCH and PTSCOTCH libraries, optionally build binaries
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 _foamConfig scotch  # Get SCOTCH_ARCH_PATH, SCOTCH_VERSION
 
-scotchPACKAGE=${SCOTCH_VERSION:-scotch-system}
+PACKAGE="${SCOTCH_VERSION:-system}"
 
 unset withMPI
 case "$WM_MPLIB" in (*MPI*) [ "$FOAM_MPI" = dummy ] || withMPI=true ;; esac
 
+if nonStandardPlatforms  # Possibly unreliable inherited values
+then
+    unset SCOTCH_ARCH_PATH
+fi
+
 #------------------------------------------------------------------------------
-usage()
-{
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions scotch; exit 0; }
+printHelp() {
     /bin/cat<<USAGE
 
 Usage: ${0##*/} [OPTION] [libso] [scotch-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
+                Also force build attempt of pt-scotch (mingw)
   -gcc          Force use of gcc/g++
+  -int32        Use SCOTCH_Num 32
+  -int64        Use SCOTCH_Num 64
+  -bin          Create scotch binaries as well
+  -no-bin       Suppress creation of scotch binaries (default)
   -no-mpi       Suppress build of pt-scotch
-  -help
+  -list         List available unpacked source versions
+  -help         Display usage help
 
-* Compile SCOTCH
-      $kahipPACKAGE
+* Build SCOTCH (default: -int${WM_LABEL_SIZE:-32}) with
+      ${PACKAGE:-[unspecified]}
 
 USAGE
-    exit 1
+    showDownloadHint scotch
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 
+unset optForce optNoExtlib
+optBinaries=false
+optLabelSize="${WM_LABEL_SIZE:-32}"
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+    -int32 | -int64) optLabelSize="${1#-int}" ;;
+    -bin)       optBinaries=true ;;
+    -no-bin)    optBinaries=false ;;
+    -no-mpi)    unset withMPI ;;
+    -no-extlib) optNoExtlib=true ;;  # Hidden option
 
-    -no-mpi)
-        unset withMPI
-        ;;
-    scotch-[1-9]* | scotch-git | scotch_* |  scotch-[1-9]*)
-        scotchPACKAGE="${1%%/}"
+    scotch/ | sources/scotch* |\
+    scotch-[0-9]* | scotch-v[0-9]* | scotch-git | scotch_* )
+        PACKAGE="${1%%/}"
         unset SCOTCH_ARCH_PATH  # Avoid inconsistency
         ;;
     *)
@@ -84,62 +101,279 @@ do
     shift
 done
 
-[ -n "$scotchPACKAGE" ] || die "The scotch-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone $scotchPACKAGE
+if [ -z "$PACKAGE" ]
 then
-    echo "Using scotch-none (skip ThirdParty build of SCOTCH)"
-    exit 0
-elif _foamIsSystem $scotchPACKAGE
+    die "The SCOTCH package/version not specified"
+elif _foamIsNone "$PACKAGE" || _foamIsSystem "$PACKAGE"
 then
-    echo "Using scotch-system"
+    echo "Using none/system (skip ThirdParty build of SCOTCH)"
     exit 0
 fi
 
-#------------------------------------------------------------------------------
-
-# Needs generalizing, but works fairly well
-for scotchMakefile in \
-    "OpenFOAM-$(uname -s)-${WM_COMPILER}.shlib" \
-    "OpenFOAM-$(uname -s).shlib" \
-    OpenFOAM-Linux.shlib \
-;
-do
-    scotchMakefile="etc/makeFiles/scotch/Makefile.inc.$scotchMakefile"
-    [ -f "$scotchMakefile" ] && break
-done
-
-# The relative link location within the "scotch/src/" directory
-makefileInc="../../$scotchMakefile"
+if [ "$optNoExtlib" = true ]
+then
+    unset FOAM_EXT_LIBBIN
+else
+    requireExtLibBin
+fi
 
 #------------------------------------------------------------------------------
 #
 # Build SCOTCH
+#   SCOTCH_ARCH_PATH : installation directory (as per config file)
 #
-#   SCOTCH_ARCH_PATH  : installation directory
-#   SCOTCH_SOURCE_DIR : location of the original sources
+#   *PACKAGE : name-version of the package
+#   *SOURCE  : location of original sources
+#   *PREFIX  : installation directory
 
-SCOTCH_SOURCE_DIR=$sourceBASE/$scotchPACKAGE
-: "${SCOTCH_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$scotchPACKAGE}"
+PKG_SOURCE="$(findSourceDir "$PACKAGE")"
+PACKAGE="$(basename "$PACKAGE")"
+PKG_PREFIX="$installBASE$WM_SIZE_OPTIONS/$PACKAGE"
+export GIT_DIR="$PKG_SOURCE/.git"
 
-[ -d "$SCOTCH_SOURCE_DIR" ] || {
-    echo "Missing sources: '$scotchPACKAGE'"
-    exit 1
+# Override as per config file (if any)
+[ -n "$SCOTCH_ARCH_PATH" ] && PKG_PREFIX="$SCOTCH_ARCH_PATH"
+
+[ -d "$PKG_SOURCE/src" ] || {
+    echo "Missing sources: '$PACKAGE'"
+    showDownloadHint scotch
+    exit 2
 }
 
+
+#------------------------------------------------------------------------------
+
+# Select a Makefile.inc for the scotch build
+# - could use more generalizing, but works fairly well
+
+unset MakefileInc
+for ending in \
+    "$(uname -s)-${WM_COMPILER}".shlib \
+    "$(uname -s)".shlib \
+    Linux.shlib \
+;
+do
+    # Fully resolve path
+    file="$WM_THIRD_PARTY_DIR/etc/makeFiles/scotch/Makefile.inc.$ending"
+    if [ -f "$file" ]
+    then
+        MakefileInc="$file"
+        break
+    fi
+done
+
+
+# - copy OpenFOAM-specific Makefile include files into the scotch dir.
+# - place a full copy into an 'openfoam/' directory (for documentation)
+# - make symlink from the openfoam/Makefile.inc.XXX -> src/Makefile.inc
+
+createMakefileLinks()
+{
+    # Sanity checks
+    if [ -z "$MakefileInc" ]
+    then
+        echo "Did not define a Makefile.inc for"
+        echo "    $PACKAGE/src"
+        return 1
+    elif [ ! -f "$MakefileInc" ]
+    then
+        echo "No such file to include:"
+        echo "    $MakefileInc"
+        return 1
+    fi
+
+    if [ ! -d "$PKG_SOURCE"/src ] || [ ! -w "$PKG_SOURCE"/src ]
+    then
+        echo "Directory missing or not writable:"
+        echo "    $PKG_SOURCE/src"
+        return 1
+    fi
+
+
+    # Copy files and make links
+    mkdir -p "$PKG_SOURCE"/openfoam
+    cp -p "$(dirname "$MakefileInc")"/* "$PKG_SOURCE"/openfoam
+    rm -f "$PKG_SOURCE"/src/Makefile.inc
+    (
+        cd "$PKG_SOURCE/src" && \
+        ln -sf ../openfoam/"$(basename "$MakefileInc")" Makefile.inc
+    )
+}
+
+
+#------------------------------------------------------------------------------
+
+#
+# Manual installation of serial libraries
+# from libdir to -> $FOAM_EXT_LIBBIN
+#
+install_serial()
+{
+    local libdir_source="$1"
+    local libdir_target="$FOAM_EXT_LIBBIN"
+    local libname_suffix="-int$WM_LABEL_SIZE"
+
+    [ -n "$FOAM_EXT_LIBBIN" ] || unset libdir_target
+    [ -n "$WM_LABEL_SIZE" ] || unset libname_suffix
+
+    echo
+    echo "Adjusting installation"
+
+    # Rename lib as xxx-intNN qualified library names (non-windows)
+    if [ -n "$libname_suffix" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+    then
+    (
+        cd "$libdir_source" || exit
+        echo "Tagging libraries with $libname_suffix"
+        for name in libscotch
+        do
+            if [ -f "$name$EXT_SO" ]
+            then
+                mv "$name$EXT_SO" "$name$libname_suffix$EXT_SO"
+                ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+    )
+    fi
+
+    if [ -n "$libdir_target" ]
+    then
+        # Remove old libraries and links
+        for name in libscotch
+        do
+            rm -f "$libdir_target/$name$EXT_SO"
+            rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+        done
+        mkdir -p "$libdir_target"
+        echo "Relocating serial libraries"
+
+        # echo "Installing: $libdir_target/libscotch$libname_suffix"
+        mv -f "$libdir_source"/lib* "$libdir_target"
+    fi
+
+    rmdir "$libdir_source" 2>/dev/null  # Failed rmdir is uncritical
+    return 0
+}
+
+
+#
+# Manual installation of parallel libraries
+# from libdir to -> $FOAM_EXT_LIBBIN/$FOAM_MPI
+#
+install_parallel()
+{
+    local libdir_source="$1"
+    local libdir_target="$FOAM_EXT_LIBBIN/$FOAM_MPI"
+    local libname_suffix="-int$WM_LABEL_SIZE"
+    local link_serial=false
+
+    [ -n "$FOAM_EXT_LIBBIN" ] || unset libdir_target
+    [ -n "$WM_LABEL_SIZE" ] || unset libname_suffix
+
+    echo
+    echo "Adjusting installation"
+
+    # Rename lib as xxx-intNN qualified library names (non-windows)
+    if [ -n "$libname_suffix" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+    then
+    (
+        cd "$libdir_source" || exit
+        echo "Tagging libraries with $libname_suffix"
+
+        # When linked, remove generated serial libraries
+        if [ "$link_serial" = true ]
+        then
+            rm -f libscotch*
+        fi
+
+        for name in libscotch libptscotch
+        do
+            if [ -f "$name$EXT_SO" ]
+            then
+                mv "$name$EXT_SO" "$name$libname_suffix$EXT_SO"
+                ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+    )
+    fi
+
+    if [ -n "$libdir_target" ]
+    then
+        # Remove old libraries and links
+        for name in libscotch libptscotch
+        do
+            rm -f "$libdir_target/$name$EXT_SO"
+            rm -f "$libdir_target/$name$libname_suffix$EXT_SO"
+        done
+        mkdir -p "$libdir_target"
+        echo "Relocating parallel libraries"
+
+        # echo "Installing: $libdir_target/libptscotch$libname_suffix"
+        mv -f "$libdir_source"/lib* "$libdir_target"
+    fi
+
+    # Create symlinks to serial versions?
+    if [ -n "$link_serial" ] && [ "${EXT_SO:-.dll}" != ".dll" ]
+    then
+    (
+        if [ -n "$libdir_target" ]
+        then
+            cd "$libdir_target" || exit
+        else
+            cd "$libdir_source" || exit
+        fi
+
+        for name in libscotch"$libname_suffix" libscotcherr*
+        do
+            if [ -f ../"$name$EXT_SO" ]
+            then
+                ln -sf ../"$name$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+
+        for name in libscotch
+        do
+            if [ -f "$name$libname_suffix$EXT_SO" ]
+            then
+                ln -sf "$name$libname_suffix$EXT_SO" "$name$EXT_SO"
+            fi
+        done
+    )
+    fi
+
+    rmdir "$libdir_source" 2>/dev/null  # Failed rmdir is uncritical
+    return 0
+}
+
+
 echo
 echo ========================================
-echo "scotch decomposition ($scotchPACKAGE)"
-echo "    Makefile.inc  : ${makefileInc##*/}"
+echo "scotch decomposition ($PACKAGE)"
+echo "    Makefile.inc  : ${customMakefileInc##*/}"
+
+# (serial) scotch
+bindir="$PKG_PREFIX"/bin
+includedir="$PKG_PREFIX"/include
+libdir="$FOAM_EXT_LIBBIN"
+if [ -z "$FOAM_EXT_LIBBIN" ]
+then
+    libdir="$PKG_PREFIX"/lib
+fi
+
+if [ "$optLabelSize" != "$WM_LABEL_SIZE" ]
+then
+    echo "Using int-$optLabelSize instead of int-$WM_LABEL_SIZE"
+fi
+export WM_LABEL_SIZE="$optLabelSize"
 
 # Test installation. May or may not have libscotcherrexit.so
-if [ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] \
-&& [ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& [ -f "$includedir"/scotch.h ] \
+&& haveLibso "$libdir"/libscotch
 then
-    echo "    scotch include: $SCOTCH_ARCH_PATH/include"
-    echo "    scotch library: $FOAM_EXT_LIBBIN"
-elif [ -d "$SCOTCH_SOURCE_DIR" ]
+    echo "    scotch include: $includedir"
+    echo "    scotch library: $libdir"
+elif [ -d "$PKG_SOURCE" ]
 then
 (
     # Older versions ok, but scotch-6.0.5a cannot build in parallel.
@@ -148,51 +382,63 @@ then
     echo "*** building scotch in serial ***"
     echo
 
-    [ -f "$scotchMakefile" ] || {
-        echo " Error: no such makefile: $scotchMakefile"
-        exit 1
-    }
+    cd "$PKG_SOURCE/src" || exit
 
-    cd $SCOTCH_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
-    rm -rf $SCOTCH_ARCH_PATH
+    applyPatch "$PACKAGE" ..      # patch at parent-level
+    createMakefileLinks || exit
 
-    applyPatch "$scotchPACKAGE" ..      # patch at parent-level
-
-    prefixDIR=$SCOTCH_ARCH_PATH
-    incDIR=$SCOTCH_ARCH_PATH/include
-    libDIR=$FOAM_EXT_LIBBIN
-
-    mkdir -p $prefixDIR 2>/dev/null
-    mkdir -p $incDIR    2>/dev/null
-    mkdir -p $libDIR    2>/dev/null
-
-    if [ -f "$makefileInc" ]
-    then
-        rm -f Makefile.inc
-        ln -s $makefileInc Makefile.inc
-    fi
+    # Verify
     [ -f Makefile.inc ] || {
         echo " Error: scotch needs an appropriate Makefile.inc"
         exit 1
     }
 
+    # Fresh install
+    rm -rf "$PKG_PREFIX"
+    mkdir -p "$bindir" "$includedir" "$libdir"
+
+    # Temporary location for library install
+    libdir_tmp="$libdir"
+    if [ -n "$FOAM_EXT_LIBBIN" ]
+    then
+        libdir_tmp="$PKG_PREFIX"/lib-tmp
+    fi
+
     export CCS="$(whichCC)"         # CCS (serial compiler)
     export CCP="$(whichMpicc)"      # CCP (parallel compiler) default=mpicc
 
     # Consistency for Intel-MPI and non-icc compilers
     [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
 
+    # The make targets.
+    # - according to docs, cannot make binaries with suffix renaming
+    make_targets="libscotch"
+    if [ "$optBinaries" = true ]
+    then
+        make_targets="$make_targets scotch"
+    fi
+
     make realclean 2>/dev/null  # Extra safety
-    make -j $WM_NCOMPPROCS libscotch \
+    make -j $WM_NCOMPPROCS $make_targets \
      && make \
-        prefix=$prefixDIR \
-        includedir=$incDIR \
-        libdir=$libDIR \
+        prefix="$PKG_PREFIX" \
+        bindir="$bindir" \
+        includedir="$includedir" \
+        libdir="$libdir_tmp" \
         install
 
-    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    install_serial "$libdir_tmp"
+
+    sharedir="$PKG_PREFIX/share"
+    if [ "$optBinaries" = false ]
+    then
+        rm -rf "$sharedir/man"                  # No bins -> no manpages
+    fi
+
+    rmdir "$bindir" 2>/dev/null || true         # Remove empty bin/
+    rmdir "${bindir%/*}" 2>/dev/null || true    # ... and empty parent
+    rmdir "$sharedir" 2>/dev/null || true       # Remove empty share/
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues SCOTCH
 else
     warnNotFound SCOTCH
@@ -201,90 +447,132 @@ fi
 
 # Build ptscotch when MPI (ThirdParty or system) is available
 
-[ "${withMPI}" = true ] || {
+if [ "${withMPI}" != true ]
+then
     # Report that the above tests failed and pass-through the failure
     echo "Skipping pt-scotch (no mpi)"
     exit 0
-}
+fi
+
+# Known build issues for mingw (MS-MPI source code annotations)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ -z "$optForce" ]
+    then
+        echo "Skipping pt-scotch - known compilation issues with $WM_COMPILER"
+        exit 0
+    else
+        echo "Warning: pt-scotch - known compilation issues with $WM_COMPILER"
+    fi
+    ;;
+esac
 
-echo
-echo ========================================
-echo "pt-scotch decomposition ($scotchPACKAGE with $FOAM_MPI)"
 
 # Build ptscotch if normal scotch was built (has include and library)
-[ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] && \
-[ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_SO" ] || \
-{
-    # Report that the above tests failed and pass-through the failure
-    echo
-    echo "    skipping - no <scotch.h> found"
-    exit 1
-}
-
-if [ -f "$SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h" ] && \
-   [ -r "$FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch$EXT_SO" ]
+# (reuse prefix/include/lib dirs set above)
+if [ -f "$includedir"/scotch.h ] \
+&& haveLibso "$libdir"/libscotch
 then
-    echo "    ptscotch include: $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
-    echo "    ptscotch library: $FOAM_EXT_LIBBIN/$FOAM_MPI"
+    echo
+    echo ========================================
+    echo "pt-scotch decomposition ($PACKAGE with $FOAM_MPI)"
+else
+    # Report that the above tests failed and pass-through the failure
+    echo "Skipping pt-scotch - no <scotch.h> found"
+    exit 2
+fi
+
+# (parallel) pt-scotch
+bindir="$PKG_PREFIX/bin/$FOAM_MPI"
+includedir="$PKG_PREFIX/include/$FOAM_MPI"
+libdir="$FOAM_EXT_LIBBIN/$FOAM_MPI"
+if [ -z "$FOAM_EXT_LIBBIN" ]
+then
+    libdir="$PKG_PREFIX/lib/$FOAM_MPI"
+fi
+
+if [ -z "$optForce" ] \
+&& [ -f "$includedir"/ptscotch.h ] \
+&& haveLibso "$libdir"/libptscotch
+then
+    echo "    ptscotch include: $includedir"
+    echo "    ptscotch library: $libdir"
 else
 (
     # Older versions ok, but scotch-6.0.5a cannot build in parallel.
     # Force serial build
     export WM_NCOMPPROCS=1
     echo "*** building pt-scotch in serial ***"
-
-    [ -f "$scotchMakefile" ] || {
-        echo " Error: no such makefile: $scotchMakefile"
-        exit 1
-    }
-
-    cd $SCOTCH_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
     echo
 
-    prefixDIR=$SCOTCH_ARCH_PATH
-    incDIR=$SCOTCH_ARCH_PATH/include/$FOAM_MPI
-    libDIR=$FOAM_EXT_LIBBIN/$FOAM_MPI
+    cd "$PKG_SOURCE/src" || exit
+    createMakefileLinks || exit
 
-    mkdir -p $prefixDIR 2>/dev/null
-    mkdir -p $incDIR    2>/dev/null
-    mkdir -p $libDIR    2>/dev/null
-
-    if [ -f "$makefileInc" ]
-    then
-        rm -f Makefile.inc
-        ln -s $makefileInc Makefile.inc
-    fi
+    # Verify
     [ -f Makefile.inc ] || {
         echo " Error: ptscotch needs an appropriate Makefile.inc"
         exit 1
     }
 
+    # Install into existing prefix
+    mkdir -p "$bindir" "$includedir" "$libdir"
+
+    # Temporary location for library install
+    libdir_tmp="$libdir"
+    if [ -n "$FOAM_EXT_LIBBIN" ]
+    then
+        libdir_tmp="$PKG_PREFIX"/lib-tmp
+    fi
+
     export CCS="$(whichCC)"     # CCS (serial compiler)
     export CCP="$(whichMpicc)"  # CCP (parallel compiler) default=mpicc
 
     # Consistency for Intel-MPI and non-icc compilers
     [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
 
+    # The make targets.
+    # - no simple means of handling mpi-specific binaries
+    # - according to docs, cannot make binaries with suffix renaming
+    make_targets="libptscotch"
+    if [ "$optBinaries" = true ]
+    then
+        make_targets="$make_targets ptscotch"
+    fi
+
+    # Remove any old symlinks etc
+    rm -rf "$includedir"/scotch*.h 2>/dev/null
+    rm -rf "$libdir"/libscotch*.so 2>/dev/null
+
     make realclean 2>/dev/null  # Extra safety
-    make -j $WM_NCOMPPROCS libptscotch \
+    make -j $WM_NCOMPPROCS $make_targets \
      && make \
-        prefix=$prefixDIR \
-        includedir=$incDIR \
-        libdir=$libDIR \
+        prefix="$PKG_PREFIX" \
+        bindir="$bindir" \
+        includedir="$includedir" \
+        libdir="$libdir_tmp" \
         install
 
-    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    install_parallel "$libdir_tmp"
+
+    sharedir="$PKG_PREFIX/share"
+    if [ "$optBinaries" = false ]
+    then
+        rm -rf "$sharedir/man"                  # No bins -> no manpages
+    fi
+
+    rmdir "$bindir" 2>/dev/null || true         # Remove empty bin/
+    rmdir "${bindir%/*}" 2>/dev/null || true    # ... and empty parent
+    rmdir "$sharedir" 2>/dev/null || true       # Remove empty share/
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues PTSCOTCH
 fi
 
 # Verify existence of ptscotch include
-[ -f "$SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h" ] || {
+[ -f "$PKG_PREFIX/include/$FOAM_MPI/ptscotch.h" ] || {
     echo
     echo "    WARNING: required include file 'ptscotch.h' not found!"
 }
 
-# Could now remove $SCOTCH_SOURCE_DIR/src/Makefile.inc
+# Could remove $PKG_SOURCE/src/Makefile.inc, but leave for documentation
 
 #------------------------------------------------------------------------------

makeVTK

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeVTK
@@ -26,20 +27,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-. etc/tools/ParaViewFunctions
-. etc/tools/vtkFunctions
+if :    # Run from third-party directory
+then
+    cd "${0%/*}" || exit
+    wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+        echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+        echo "    Check your OpenFOAM environment and installation"
+        exit 1
+    }
+fi
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ParaViewFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/vtkFunctions
 #------------------------------------------------------------------------------
-
-unset vtk_version mesa_version                           # Purge current values
-
-# vtk version from OpenFOAM etc/config.sh file:
+# Obtain version from OpenFOAM etc/config.sh file:
+unset vtk_version mesa_version              # Purge current values
 _foamConfig vtk
 
 VTK_VERSION="$vtk_version"
@@ -51,17 +54,21 @@ case "$VTK_VERSION" in
 esac
 VTK_VERSION="${VTK_VERSION%%-*}"            # Without suffix (eg, -mesa)
 
-
 # New rendering backend (starting with vtk 7?).
 withGL2=auto # auto-config based on version
 
+# Hint for cmake findMPI
+if [ -d "$MPI_ARCH_PATH" ]
+then
+    export MPI_HOME="$MPI_ARCH_PATH"
+fi
+
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printVersions() { listPackageVersions vtk; exit 0; }
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [vtk-VERSION] [CMAKE-OPTION]
+Usage: ${0##*/} [OPTION] [vtk-VERSION] [CMAKE-OPTION]
 options:
   -gcc              Force use of gcc/g++
   -cmake PATH       with cmake from the given path
@@ -74,11 +81,14 @@ options:
   -osmesa           with off-screen mesa only
   -mpi              with mpi (VTK_Group_MPI=ON)
   -mpi=N            with max 'N' mpi processes. N=0 for no upper-limit.
+  -mpi-home PATH    with mpi and hint for MPI_HOME
   -verbose          verbose output in Makefiles
   -version VER      specify an alternative version (current: $VTK_VERSION)
   -buildType NAME   specify the build type (default: Release)
   -suffix NAME      specify a suffix to distinguish the build
-  -help
+  -DNAME=VALUE      add cmake variable
+  -list             List available unpacked source versions
+  -help             Display usage help
 
 The -no-FEATURE option can be used to forcibly disable these features:
   -no-gl2 | -no-mesa | -no-mpi
@@ -100,10 +110,11 @@ For finer control, the build stages can be selected or deselected individually:
   ->  \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/VTK-$VTK_VERSION$BUILD_SUFFIX
 
 USAGE
-    exit 1
+    # showDownloadHint vtk
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
-exportCompiler          # Compiler info for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure
 
 # Various building stages
 unset runPATCH runCONFIG runMAKE runINSTALL
@@ -114,13 +125,16 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) printHelp;;
+    -list)      printVersions;;
     -gcc)       useGcc  ;;
 
-    [0-9]* | vtk-[0-9]* | VTK-[0-9]*) # VTK version
-        setVtkVersion "${1%%/}"
+    # VTK version
+    paraview/* | vtk/* | sources/paraview* | sources/vtk* |\
+    [0-9]* | vtk-[0-9]* | VTK-[0-9]*)
+        setVtkVersion "$(basename "$1")"
         ;;
-    [A-Z]*=*)            # cmake variables
+    -D[A-Z]*=* | [A-Z]*=*)  # cmake variables
         addCMakeVariable "$1"
         ;;
     -patch)              # stage 0: patch sources
@@ -201,6 +215,13 @@ do
         withMPI=true
         MPI_MAX_PROCS="${1##*=}"
         ;;
+    -mpi-home) # mpi with hint
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        withMPI=true
+        export MPI_HOME="${2%%/}"
+        case "${MPI_HOME:-none}" in (false|none) unset MPI_HOME;; esac
+        shift
+        ;;
     -no-mpi)
         withMPI=false
         ;;
@@ -293,6 +314,10 @@ Features selected
     mesa      ${withMESA:-false}
     mpi       ${withMPI:-false}
 ---------------------
+Compiler
+    cxx       ${CXX:-unknown}
+    cxxflags  ${CXXFLAGS:-none}
+---------------------
 Version information
     vtk       ${VTK_VERSION:-unknown}
     build     ${BUILD_TYPE:-unknown}

minCmake

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     minCmake
@@ -20,18 +21,17 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
 #------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+printHelp() {
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [dir1 ... dirN]
+Usage: ${0##*/} [OPTION] [dir1 ... dirN]
 options:
   -help
 
@@ -39,18 +39,17 @@ options:
 * Without any arguments, select all first level directories.
 
 USAGE
-    exit 1
+    exit 0  # Clean exit
 }
 #------------------------------------------------------------------------------
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    -h | -help)
-        usage
-        ;;
+    -h | -help*) printHelp;;
     -*)
-        usage "unknown option: '$1'"
+        echo "$0: Error unknown option: '$1'" 1>&2
+        exit 1
         ;;
     *)
         break
@@ -60,27 +59,55 @@ do
 done
 
 # Nothing specified - use first level of unpacked directories
-[ "$#" -gt 0 ] || set -- $(find -mindepth 1 -maxdepth 1 -type d)
+if [ "$#" -eq 0 ]
+then
+set -- \
+$(
+    echo "searching..." 1>&2
+    find . -mindepth 2 -maxdepth 2 -name CMakeLists.txt
+    for dir in sources/*
+    do
+        [ -d "$dir" ] || continue
+        echo "search <$dir>" 1>&2
+        depth=1
+        # Is sources/pkg/pkg-version ?
+        if [ "$(echo "$dir" | sed -e 's#.*/[a-z][a-z]*##' | wc -w)" = 0 ]
+        then
+            depth=2
+        fi
+        find "$dir" -maxdepth "$depth" -name CMakeLists.txt
+    done
+)
+fi
 
+
+echo "processing..." 1>&2
 for dir
 do
     dir="${dir#./}" # Remove leading  "./"
     dir="${dir%/}"  # Remove trailing "/"
 
+    case "$dir" in
+        (*/CMakeLists.txt) file="$dir" ;;
+        (*) file="$dir/CMakeLists.txt" ;;
+    esac
+    dir="$(dirname "$file")"
+    dir="$(basename "$dir")"
+
     min=$(sed -n \
         -e 's/^.*cmake_minimum.*VERSION *\([0-9.][0-9.]*\).*/\1/p' \
-        "$dir/CMakeLists.txt" \
+        "$file" \
         2>/dev/null | head -1)
 
     if [ -n "$min" ]
     then
         # Remove trailing ".0" from version
-        echo "${min%.0}" "${dir#sources/}"
+        echo "${min%.0}" "$dir"
     fi
 
 done \
     | sort -n -k 1 \
     | xargs printf "    %-10s  %s\n"
-    # Use 4 leading spaces for easier pasting as Markdown
+    # 4 leading spaces for easy pasting as Markdown
 
 #------------------------------------------------------------------------------