diff --git a/etc/pkgconfigAdjust b/etc/pkgconfigAdjust index ae96c0e..99cade3 100755 --- a/etc/pkgconfigAdjust +++ b/etc/pkgconfigAdjust @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2019 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # etc/pkgconfigAdjust @@ -36,7 +35,6 @@ # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE #------------------------------------------------------------------------------ # Run from third-party directory only -cd "${0%/*}" || exit 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" @@ -67,7 +65,7 @@ while [ "$#" -gt 0 ] do case "$1" in '') ;; # Ignore empty - -h | -help) usage ;; + -h | -help*) usage ;; *) pkgconfigAdjust "$1" diff --git a/etc/pkgconfigPrefix b/etc/pkgconfigPrefix index b095427..c3bab31 100755 --- a/etc/pkgconfigPrefix +++ b/etc/pkgconfigPrefix @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2019 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # etc/pkgconfigPrefix @@ -28,13 +27,12 @@ # # 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 directory only -cd "${0%/*}" || exit 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" @@ -64,7 +62,7 @@ while [ "$#" -gt 0 ] do case "$1" in '') ;; # Ignore empty - -h | -help) usage ;; + -h | -help*) usage ;; *) pkgconfigNewPrefix "$1" diff --git a/etc/relocateQt b/etc/relocateQt index 50786b1..70aaa36 100755 --- a/etc/relocateQt +++ b/etc/relocateQt @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011 OpenFOAM Foundation -# Copyright (C) 2016-2017 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # etc/relocateQt @@ -23,7 +22,6 @@ # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE #------------------------------------------------------------------------------ # Run from third-party directory only -cd "${0%/*}" || exit 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" @@ -58,12 +56,12 @@ while [ "$#" -gt 0 ] do case "$1" in '') ;; # Ignore empty - -h | -help) usage ;; + -h | -help*) usage ;; -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##*-}" @@ -86,6 +84,6 @@ then # Create qt.conf and adjust locations to use '${prefix}' internally finalizeQt fi -pkgconfigNewPrefix $QT_ARCH_PATH +pkgconfigNewPrefix "$QT_ARCH_PATH" # ----------------------------------------------------------------------------- diff --git a/etc/tools/ParaViewFunctions b/etc/tools/ParaViewFunctions index f955b41..f7ce194 100644 --- a/etc/tools/ParaViewFunctions +++ b/etc/tools/ParaViewFunctions @@ -6,11 +6,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # File # etc/tools/ParaViewFunctions diff --git a/etc/tools/vtkFunctions b/etc/tools/vtkFunctions index 05a5ae9..917e44d 100644 --- a/etc/tools/vtkFunctions +++ b/etc/tools/vtkFunctions @@ -5,11 +5,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2016-2018 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # File # etc/tools/vtkFunctions diff --git a/makeAdios2 b/makeAdios2 index f393ced..f6e7173 100755 --- a/makeAdios2 +++ b/makeAdios2 @@ -85,10 +85,8 @@ do CMAKE_PATH="${2%%/}" shift ;; - ADIOS2-[1-9]* | ADIOS2-git* | adios-[1-9]* | ADIOS-git*) - adiosPACKAGE="${1%%/}" - ;; - adios2-[1-9]* | adios2-git* | adios-[1-9]* | adios-git*) + ADIOS2-[0-9]* | ADIOS2-git* | ADIOS-[0-9]* | ADIOS-git* | \ + adios2-[0-9]* | adios2-git* | adios-[0-9]* | adios-git*) adiosPACKAGE="${1%%/}" ;; *) diff --git a/makeCCMIO b/makeCCMIO index 31c010c..3c98926 100755 --- a/makeCCMIO +++ b/makeCCMIO @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeCCMIO @@ -86,7 +85,7 @@ do lib|libso) targetType="$1" ;; - libccmio-[1-9]*) + libccmio-[0-9]*) ccmioPACKAGE="${1%%/}" ;; *) diff --git a/makeCGAL b/makeCGAL index a3da43f..47bebf0 100755 --- a/makeCGAL +++ b/makeCGAL @@ -88,7 +88,7 @@ usage: ${0##*/} [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERS options: -gcc Force use of gcc/g++ -cmake PATH Use cmake from the given path - -no-lib Configure CGAL for 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 -system Use system versions for boost/gmp/mpfr @@ -143,11 +143,11 @@ do -with-lib) optHeadersOnly=false ;; - gmp-[4-9]* | gmp-system | gmp-none) + gmp-[0-9]* | gmp-system | gmp-none) gmpPACKAGE="${1%%/}" unset GMP_ARCH_PATH ;; - mpfr-[2-9]* | mpfr-system | mpfr-none) + mpfr-[0-9]* | mpfr-system | mpfr-none) mpfrPACKAGE="${1%%/}" unset MPFR_ARCH_PATH ;; diff --git a/makeCmake b/makeCmake index 8a8cced..a971f54 100755 --- a/makeCmake +++ b/makeCmake @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeCmake @@ -71,7 +70,7 @@ do -link) optLink=true ;; - cmake-[1-9]*) + cmake-[0-9]*) cmakePACKAGE="${1%%/}" ;; *) diff --git a/makeFFTW b/makeFFTW index 54adde9..edb76f6 100755 --- a/makeFFTW +++ b/makeFFTW @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeFFTW diff --git a/makeGcc b/makeGcc index ab2271e..5ec8c0d 100755 --- a/makeGcc +++ b/makeGcc @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeGcc @@ -117,20 +116,23 @@ do mpcPACKAGE="mpc-system" unset GMP_ARCH_PATH MPFR_ARCH_PATH ;; - gmp-[4-9]* | gmp-system) + gmp-[0-9]* | gmp-system) gmpPACKAGE="${1%%/}" unset GMP_ARCH_PATH ;; - mpfr-[2-9]* | mpfr-system) + mpfr-[0-9]* | mpfr-system) mpfrPACKAGE="${1%%/}" unset MPFR_ARCH_PATH ;; mpc-[0-9]* | mpc-system) mpcPACKAGE="${1%%/}" ;; - gcc-[4-9]* | gcc-system) + gcc-[0-9]* | gcc-system) gccPACKAGE="${1%%/}" ;; + [0-9]*) + gccPACKAGE="gcc-${1%%/}" + ;; *) die "unknown option/argument: '$1'" ;; diff --git a/makeGperftools b/makeGperftools index 2461959..4d3b0f5 100755 --- a/makeGperftools +++ b/makeGperftools @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2012 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeGperftools diff --git a/makeHYPRE b/makeHYPRE index 01d778a..5b6dbbc 100755 --- a/makeHYPRE +++ b/makeHYPRE @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2019 OpenCFD Ltd. +# Copyright (C) 2018-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeHYPRE diff --git a/makeKAHIP b/makeKAHIP index 721a9e6..04fab4a 100755 --- a/makeKAHIP +++ b/makeKAHIP @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2019 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeKAHIP @@ -109,7 +108,7 @@ do targetType="$1" ;; - kahip-[1-9]* | kahip-git | KaHIP_* | KaHIP-[1-9]*) + kahip-[0-9]* | kahip-git | KaHIP_* | KaHIP-[0-9]*) kahipPACKAGE="${1%%/}" unset KAHIP_ARCH_PATH # Avoid inconsistency ;; diff --git a/makeLLVM b/makeLLVM index ab5001c..de3c483 100755 --- a/makeLLVM +++ b/makeLLVM @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeLLVM @@ -95,7 +94,7 @@ do llvm-[0-9]* | llvm-svn*) llvmPACKAGE="${1%%/}" ;; - [1-9]*) + [0-9]*) llvmPACKAGE="llvm-${1%%/}" ;; *) @@ -148,7 +147,7 @@ then set -x $LLVM_SOURCE_DIR/configure \ --prefix=$LLVM_ARCH_PATH \ - --with-gcc-toolchain=$(which gcc | sed s%/bin/gcc%%) \ + --with-gcc-toolchain="$(command -v gcc | sed 's%/bin/gcc%%')" \ --enable-optimized \ --enable-shared \ && set +x \ diff --git a/makeMETIS b/makeMETIS index 70b6561..6b81ac3 100755 --- a/makeMETIS +++ b/makeMETIS @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2018 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeMETIS diff --git a/makeMGridGen b/makeMGridGen index 94dea5a..d2c365b 100755 --- a/makeMGridGen +++ b/makeMGridGen @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2019 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeMGridGen @@ -66,7 +65,7 @@ do -h | -help) usage ;; -gcc) useGcc ;; - mgridgen-[1-9]* | MGridGen-[1-9]* | parmgridgen-[1-9]* | ParMGridGen-[1-9]*) + mgridgen-[0-9]* | MGridGen-[0-9]* | parmgridgen-[0-9]* | ParMGridGen-[0-9]*) mgridgenPACKAGE="${1%%/}" ;; *) diff --git a/makeOPENMPI b/makeOPENMPI index 60b5731..a17cc8a 100755 --- a/makeOPENMPI +++ b/makeOPENMPI @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2019 OpenCFD Ltd. +# Copyright (C) 2017-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeOPENMPI diff --git a/makePETSC b/makePETSC index 81cb379..5988cc8 100755 --- a/makePETSC +++ b/makePETSC @@ -152,7 +152,7 @@ echo if [ "$targetType" = libso ] then - configOpt="--with-shared-libraries" + configOpt="$configOpt --with-shared-libraries" fi if [ "$WM_LABEL_SIZE" = 64 ] @@ -169,25 +169,36 @@ echo configOpt="$configOpt --with-precision=double" fi + # We export compiler settings (above) but actually use the + # --with-cc and --with-cxx. So ignore them and flags + + unset CC CXX + unset CFLAGS CXXFLAGS + cd "$PETSC_SOURCE_DIR" || exit export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo rm -rf "$PETSC_ARCH_PATH" + ## without tests? --testdir=.. + + set -x ./configure \ --prefix="$PETSC_ARCH_PATH" \ --with-petsc-arch="$archOpt" \ --with-clanguage=C \ + --with-fc=0 \ --with-scalapack=0 \ --with-superlu_dist=0 \ --with-suitesparse=0 \ --download-f2cblaslapack=1 \ $configOpt \ + && set +x \ && echo "Configured: petsc" \ && make PETSC_DIR="$PETSC_SOURCE_DIR" PETSC_ARCH="$archOpt" all \ && echo "Built: petsc" \ && make PETSC_DIR="$PETSC_SOURCE_DIR" PETSC_ARCH="$archOpt" install \ - && echo "Installed: petsc" + && echo "Installed: petsc - may require etc/pkgconfigPrefix to relocate" ) || { echo "Error building: petsc" exit 1 diff --git a/makeParaView b/makeParaView index 5180442..c06d30d 100755 --- a/makeParaView +++ b/makeParaView @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeParaView @@ -274,7 +273,7 @@ do -no-qt) withQT=false ;; - -qt-[1-9]*) + -qt-[0-9]*) withQT=true QMAKE_PATH="$installBASE/${1##-}" ;; diff --git a/makeQt b/makeQt index bd87083..8c3b658 100755 --- a/makeQt +++ b/makeQt @@ -7,11 +7,10 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011 OpenFOAM Foundation -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeQt @@ -59,7 +58,7 @@ do -h | -help) usage ;; -gcc) useGcc ;; - -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##*-}" diff --git a/makeSCOTCH b/makeSCOTCH index d68794f..21124e6 100755 --- a/makeSCOTCH +++ b/makeSCOTCH @@ -81,7 +81,7 @@ do -no-bin) unset optBinaries ;; -no-mpi) unset withMPI ;; - scotch-[1-9]* | scotch-git | scotch_* | scotch-[1-9]*) + scotch-[0-9]* | scotch-git | scotch_* ) scotchPACKAGE="${1%%/}" unset SCOTCH_ARCH_PATH # Avoid inconsistency ;; diff --git a/makeVTK b/makeVTK index 94c67c9..d24d575 100755 --- a/makeVTK +++ b/makeVTK @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # makeVTK diff --git a/minCmake b/minCmake index c9c4ea2..196d419 100755 --- a/minCmake +++ b/minCmake @@ -6,11 +6,10 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2016-2019 OpenCFD Ltd. +# Copyright (C) 2016-2020 OpenCFD Ltd. #------------------------------------------------------------------------------ # License -# This file is part of OpenFOAM, licensed under GNU General Public License -# . +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # # Script # minCmake @@ -84,6 +83,6 @@ do 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 #------------------------------------------------------------------------------