STYLE: regularize quoting and exit on failed 'cd'

This commit is contained in:
Mark Olesen
2019-11-13 12:46:30 +01:00
parent e51f92f2f1
commit c8a7f46db2
31 changed files with 235 additions and 147 deletions

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011 OpenFOAM Foundation # Copyright (C) 2011 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -22,7 +23,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -61,39 +63,48 @@ for i in \
gmp-* mpfr-* mpc-* gcc-* llvm-* \ gmp-* mpfr-* mpc-* gcc-* llvm-* \
; ;
do do
[ -d "$i" ] && ( if [ -d "$i" ]
then
(
echo echo
echo "${i%/*}" echo "${i%/*}"
echo " make distclean" echo " make distclean"
echo echo
cd $i && make distclean cd $i && make distclean
) )
fi
done done
# Clean various packages via 'realclean' # Clean various packages via 'realclean'
for i in scotch*/src for i in scotch*/src
do do
[ -d "$i" ] && ( if [ -d "$i" ]
then
(
echo echo
echo "${i%/*}" echo "${i%/*}"
echo " make realclean" echo " make realclean"
echo echo
cd $i && make realclean cd $i && make realclean
) )
fi
done done
# Clean various packages via 'wclean' # Clean various packages via 'wclean'
for i in libccmio*/Make kahip*/lib/Make for i in libccmio*/Make kahip*/lib/Make
do do
[ -d "$i" ] && ( if [ -d "$i" ]
then
(
echo echo
echo "${i%/Make}" echo "${i%/Make}"
echo " wclean" echo " wclean"
echo echo
cd ${i%/Make} && wclean cd ${i%/Make} && wclean
) )
fi
done done
@ -117,7 +128,7 @@ removePlatform()
then then
echo echo
echo "Cleaning platform '$platform'" echo "Cleaning platform '$platform'"
\rm -rf "platforms/$platform" rm -rf "platforms/$platform"
else else
echo echo
echo "Platform '$platform' not built" echo "Platform '$platform' not built"
@ -138,7 +149,7 @@ do
echo echo
echo "Removing all platforms/sub-directories" echo "Removing all platforms/sub-directories"
echo echo
\rm -rf platforms/* rm -rf platforms/*
break break
;; ;;

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -22,7 +23,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -33,7 +35,8 @@
# ---------------------------------------------- # ----------------------------------------------
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party (parent) directory only # Run from third-party directory only
cd "${0%/*}" || exit
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR" echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -31,7 +33,8 @@
# ---------------------------------------------- # ----------------------------------------------
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party (parent) directory only # Run from third-party directory only
cd "${0%/*}" || exit
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR" echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011 OpenFOAM Foundation # Copyright (C) 2011 OpenFOAM Foundation
# Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -21,7 +22,8 @@
# ---------------------------------------------- # ----------------------------------------------
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party (parent) directory only # Run from third-party directory only
cd "${0%/*}" || exit
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR" echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"

View File

@ -2,10 +2,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -85,7 +86,7 @@ setParaViewDirs()
echo "ParaView_BUILD_DIR=$ParaView_BUILD_DIR" echo "ParaView_BUILD_DIR=$ParaView_BUILD_DIR"
echo "ParaView_DIR=$ParaView_DIR" echo "ParaView_DIR=$ParaView_DIR"
export GIT_DIR=$ParaView_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$ParaView_SOURCE_DIR/.git" # Mask seeing our own git-repo
} }
@ -396,7 +397,7 @@ configParaView()
addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE" addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"
cd $ParaView_BUILD_DIR || exit 1 # Change to build folder cd "$ParaView_BUILD_DIR" || exit # Change to build folder
echo "----" echo "----"
echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR)" echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR)"
@ -434,7 +435,7 @@ configParaView()
# #
makeParaView() makeParaView()
{ {
cd $ParaView_BUILD_DIR || exit 1 # Change to build folder cd "$ParaView_BUILD_DIR" || exit # Change to build folder
echo " Starting make" echo " Starting make"
time make -j $WM_NCOMPPROCS time make -j $WM_NCOMPPROCS
echo " Done make" echo " Done make"
@ -453,7 +454,7 @@ makeParaView()
# #
installParaView() installParaView()
{ {
cd $ParaView_BUILD_DIR || exit 1 # Change to build folder cd "$ParaView_BUILD_DIR" || exit # Change to build folder
echo " Installing ParaView to $ParaView_DIR" echo " Installing ParaView to $ParaView_DIR"
make install make install

View File

@ -2,10 +2,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -738,7 +739,7 @@ applyPatch()
if [ -r "$patch" ] if [ -r "$patch" ]
then then
( (
cd $dst || exit 1 cd "$dst" || exit
if [ -f "$sentinel" ] if [ -f "$sentinel" ]
then then
echo "patch for $pkg was already applied" echo "patch for $pkg was already applied"

View File

@ -2,9 +2,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -65,7 +67,7 @@ setVtkDirs()
echo "VTK_BUILD_DIR=$VTK_BUILD_DIR" echo "VTK_BUILD_DIR=$VTK_BUILD_DIR"
echo "VTK_DIR=$VTK_DIR" echo "VTK_DIR=$VTK_DIR"
export GIT_DIR=$VTK_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$VTK_SOURCE_DIR/.git" # Mask seeing our own git-repo
} }
@ -120,7 +122,7 @@ configVTK()
addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE" addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"
cd $VTK_BUILD_DIR || exit 1 # change to build folder cd "$VTK_BUILD_DIR" || exit # change to build folder
echo "----" echo "----"
echo "Configuring VTK-$VTK_VERSION" echo "Configuring VTK-$VTK_VERSION"
@ -176,7 +178,7 @@ addMpiSupport()
# #
makeVTK() makeVTK()
{ {
cd $VTK_BUILD_DIR || exit 1 # Change to build folder cd "$VTK_BUILD_DIR" || exit # Change to build folder
echo " Starting make" echo " Starting make"
time make -j $WM_NCOMPPROCS time make -j $WM_NCOMPPROCS
@ -193,7 +195,7 @@ makeVTK()
# #
installVTK() installVTK()
{ {
cd $VTK_BUILD_DIR || exit 1 # Change to build folder cd "$VTK_BUILD_DIR" || exit # Change to build folder
echo " Installing VTK to $VTK_DIR" echo " Installing VTK to $VTK_DIR"
make install make install

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -20,7 +22,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -119,7 +122,7 @@ adjustADIOS()
{ {
# Rename libraries according to FOAM_MPI # Rename libraries according to FOAM_MPI
( (
cd $ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH || exit 1 cd "$ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" || exit
if [ "$FOAM_MPI" != dummy ] if [ "$FOAM_MPI" != dummy ]
then then
@ -272,8 +275,8 @@ then
# ---------------------------- # ----------------------------
buildDIR=$buildBASE/$adiosPACKAGE buildDIR=$buildBASE/$adiosPACKAGE
cd $ADIOS1_SOURCE_DIR || exit 1 cd "$ADIOS1_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
@ -320,8 +323,8 @@ else
echo echo
( (
buildDIR=$buildBASE/$adiosPACKAGE buildDIR=$buildBASE/$adiosPACKAGE
cd $ADIOS1_SOURCE_DIR || exit 1 cd "$ADIOS1_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
applyPatch $adiosPACKAGE $ADIOS1_SOURCE_DIR applyPatch $adiosPACKAGE $ADIOS1_SOURCE_DIR
@ -355,6 +358,7 @@ else
&& listMethods && listMethods
) || { ) || {
echo "Error building: $adiosPACKAGE" echo "Error building: $adiosPACKAGE"
exit 1
} }
fi fi

View File

@ -1,13 +1,15 @@
#!/bin/sh #!/bin/sh
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# This file is part of OpenFOAM, licensed under the GNU General Public License # Copyright (C) 2018-2019 OpenCFD Ltd.
# <http://www.gnu.org/licenses/>. #------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
# #
# Script # Script
# makeAdios2 # makeAdios2
@ -37,7 +39,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -138,8 +141,8 @@ else
echo echo
( (
buildDIR=$buildBASE/$adiosPACKAGE buildDIR=$buildBASE/$adiosPACKAGE
cd $ADIOS2_SOURCE_DIR || exit 1 cd "$ADIOS2_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
applyPatch $adiosPACKAGE $ADIOS2_SOURCE_DIR applyPatch $adiosPACKAGE $ADIOS2_SOURCE_DIR

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -25,7 +26,8 @@
[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so [ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -125,8 +127,8 @@ install()
echo "Starting build: $ccmioPACKAGE ($targetType)" echo "Starting build: $ccmioPACKAGE ($targetType)"
echo echo
( (
cd $CCMIO_SOURCE_DIR || exit 1 cd "$CCMIO_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $CCMIO_ARCH_PATH rm -rf $CCMIO_ARCH_PATH
rm -f $FOAM_EXT_LIBBIN/libccmio$EXT_SO rm -f $FOAM_EXT_LIBBIN/libccmio$EXT_SO

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2012-2016 OpenFOAM Foundation # Copyright (C) 2012-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -58,7 +59,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -236,8 +238,8 @@ else
# Configuration options: # Configuration options:
unset buildOpt unset buildOpt
cd $BOOST_SOURCE_DIR || exit 1 cd "$BOOST_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $BOOST_ARCH_PATH rm -rf $BOOST_ARCH_PATH
@ -462,8 +464,8 @@ fi
fi fi
mkdir -p $CGAL_BUILD_DIR mkdir -p $CGAL_BUILD_DIR
cd $CGAL_BUILD_DIR || exit 1 cd "$CGAL_BUILD_DIR" || exit
export GIT_DIR=$CGAL_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$CGAL_SOURCE_DIR/.git" # Mask seeing our own git-repo
unset configBoost configGmp configMpfr unset configBoost configGmp configMpfr
echo "----" echo "----"

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011 OpenFOAM Foundation # Copyright (C) 2011 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -25,7 +26,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -103,8 +105,8 @@ else
( (
buildDIR=$buildBASE/$cmakePACKAGE buildDIR=$buildBASE/$cmakePACKAGE
cd $CMAKE_SOURCE_DIR || exit 1 cd "$CMAKE_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $buildDIR rm -rf $buildDIR
@ -125,7 +127,7 @@ fi
if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ] if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ]
then then
( (
cd ${CMAKE_ARCH_PATH%/*} || exit 1 cd "${CMAKE_ARCH_PATH%/*}" || exit
if [ -L cmake-system ] if [ -L cmake-system ]
then then
rm cmake-system rm cmake-system

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -38,7 +40,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -140,8 +143,8 @@ else
# ---------------------------- # ----------------------------
buildDIR=$buildBASE/$fftwPACKAGE buildDIR=$buildBASE/$fftwPACKAGE
cd $FFTW_SOURCE_DIR || exit 1 cd "$FFTW_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $FFTW_ARCH_PATH rm -rf $FFTW_ARCH_PATH
rm -rf $buildDIR rm -rf $buildDIR

24
makeGcc
View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -34,7 +35,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -191,8 +193,8 @@ else
sourceDIR=$sourceBASE/$gmpPACKAGE sourceDIR=$sourceBASE/$gmpPACKAGE
buildDIR=$buildBASE/$gmpPACKAGE buildDIR=$buildBASE/$gmpPACKAGE
cd $sourceDIR || exit 1 cd "$sourceDIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $buildDIR rm -rf $buildDIR
@ -243,8 +245,8 @@ else
sourceDIR=$sourceBASE/$mpfrPACKAGE sourceDIR=$sourceBASE/$mpfrPACKAGE
buildDIR=$buildBASE/$mpfrPACKAGE buildDIR=$buildBASE/$mpfrPACKAGE
cd $sourceDIR || exit 1 cd "$sourceDIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $buildDIR rm -rf $buildDIR
@ -299,8 +301,8 @@ else
sourceDIR=$sourceBASE/$mpcPACKAGE sourceDIR=$sourceBASE/$mpcPACKAGE
buildDIR=$buildBASE/$mpcPACKAGE buildDIR=$buildBASE/$mpcPACKAGE
cd $sourceDIR || exit 1 cd "$sourceDIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $buildDIR rm -rf $buildDIR
@ -355,8 +357,8 @@ else
sourceDIR=$sourceBASE/$gccPACKAGE sourceDIR=$sourceBASE/$gccPACKAGE
buildDIR=$buildBASE/$gccPACKAGE buildDIR=$buildBASE/$gccPACKAGE
cd $sourceDIR || exit 1 cd "$sourceDIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $buildDIR rm -rf $buildDIR

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2012 OpenFOAM Foundation # Copyright (C) 2012 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -22,7 +23,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -102,8 +104,8 @@ else
( (
buildDIR=$buildBASE/$gperftoolsPACKAGE buildDIR=$buildBASE/$gperftoolsPACKAGE
cd $GPERFTOOLS_SOURCE_DIR || exit 1 cd "$GPERFTOOLS_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
rm -rf $GPERFTOOLS_ARCH_PATH rm -rf $GPERFTOOLS_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2018-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -49,7 +51,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -149,8 +152,8 @@ echo
# Configuration options: # Configuration options:
unset configOpt unset configOpt
cd $HYPRE_SOURCE_DIR/src || exit 1 cd "$HYPRE_SOURCE_DIR/src" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $HYPRE_ARCH_PATH rm -rf $HYPRE_ARCH_PATH
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -49,7 +51,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -181,11 +184,11 @@ then
echo "Starting build: $kahipPACKAGE ($targetType) using wmake" echo "Starting build: $kahipPACKAGE ($targetType) using wmake"
echo echo
cd $KAHIP_SOURCE_DIR/lib || exit 1 cd "$KAHIP_SOURCE_DIR/lib" || exit
export GIT_DIR=$KAHIP_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$KAHIP_SOURCE_DIR/.git" # Mask seeing our own git-repo
rm -rf $KAHIP_ARCH_PATH rm -rf "$KAHIP_ARCH_PATH"
rm -f $FOAM_EXT_LIBBIN/libkahip$EXT_SO rm -f "$FOAM_EXT_LIBBIN/libkahip$EXT_SO"
libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -40,7 +41,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -135,8 +137,8 @@ then
echo "Starting build: $llvmPACKAGE (using configure)" echo "Starting build: $llvmPACKAGE (using configure)"
echo echo
( (
cd $LLVM_SOURCE_DIR || exit 1 cd "$LLVM_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
make distclean 2>/dev/null make distclean 2>/dev/null
rm -rf $LLVM_BUILD_DIR rm -rf $LLVM_BUILD_DIR
@ -167,8 +169,8 @@ else
# Configuration options: # Configuration options:
unset configOpt unset configOpt
cd $LLVM_SOURCE_DIR || exit 1 cd "$LLVM_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
if [ -f tools/openmp/CMakeLists.txt ] if [ -f tools/openmp/CMakeLists.txt ]
then then

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -49,7 +51,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -165,8 +168,8 @@ echo
configOpt="shared=1" configOpt="shared=1"
fi fi
cd $METIS_SOURCE_DIR || exit 1 cd "$METIS_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $METIS_ARCH_PATH rm -rf $METIS_ARCH_PATH
rm -f $FOAM_EXT_LIBBIN/libmetis$EXT_SO rm -f $FOAM_EXT_LIBBIN/libmetis$EXT_SO

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -20,6 +22,7 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from ThirdParty directory only # Run from ThirdParty directory only
cd "${0%/*}" || exit
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
@ -139,7 +142,7 @@ then
echo echo
else else
( (
cd $MGRIDGEN_SOURCE_DIR || exit 1 cd "$MGRIDGEN_SOURCE_DIR" || exit
[ -e Makefile ] && make realclean 2>/dev/null [ -e Makefile ] && make realclean 2>/dev/null
# Remove any existing build folder and recreate # Remove any existing build folder and recreate
@ -164,6 +167,7 @@ else
&& echo "Built: $mgridgenPACKAGE" && echo "Built: $mgridgenPACKAGE"
) || { ) || {
echo "Error building: $mgridgenPACKAGE" echo "Error building: $mgridgenPACKAGE"
exit 1
} }
fi fi

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -42,7 +44,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -151,8 +154,8 @@ else
buildDIR=$buildBASE/$mpiPACKAGE buildDIR=$buildBASE/$mpiPACKAGE
cd $MPI_SOURCE_DIR || exit 1 cd "$MPI_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
rm -rf $MPI_ARCH_PATH rm -rf $MPI_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -42,7 +44,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -155,8 +158,8 @@ else
buildDIR=$buildBASE/$mpiPACKAGE buildDIR=$buildBASE/$mpiPACKAGE
cd $MPI_SOURCE_DIR || exit 1 cd "$MPI_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
rm -rf $MPI_ARCH_PATH rm -rf $MPI_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -26,7 +28,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -209,8 +212,8 @@ adjustMESA()
# ---------------------------- # ----------------------------
buildDIR=$buildBASE/$mesaPACKAGE buildDIR=$buildBASE/$mesaPACKAGE
cd $MESA_SOURCE_DIR || exit 1 cd "$MESA_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
# Remove any existing build # Remove any existing build
rm -rf $MESA_ARCH_PATH rm -rf $MESA_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2017-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -42,7 +44,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -171,8 +174,8 @@ else
buildDIR=$buildBASE/$mpiPACKAGE buildDIR=$buildBASE/$mpiPACKAGE
cd $MPI_SOURCE_DIR || exit 1 cd "$MPI_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
rm -rf $MPI_ARCH_PATH rm -rf $MPI_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2018-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -49,7 +51,8 @@ then
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -167,8 +170,8 @@ echo
configOpt="$configOpt --with-precision=double" configOpt="$configOpt --with-precision=double"
fi fi
cd $PETSC_SOURCE_DIR || exit 1 cd "$PETSC_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
rm -rf $PETSC_ARCH_PATH rm -rf $PETSC_ARCH_PATH

View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -27,7 +28,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1

14
makeQt
View File

@ -3,10 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# | Copyright (C) 2011 OpenFOAM Foundation # Copyright (C) 2011 OpenFOAM Foundation
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -22,7 +23,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -133,8 +135,8 @@ else
# ---------------------------- # ----------------------------
buildDIR=$buildBASE/$qtPACKAGE buildDIR=$buildBASE/$qtPACKAGE
cd $QT_SOURCE_DIR || exit 1 cd "$QT_SOURCE_DIR" || exit
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
[ -e Makefile ] && make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
# Remove any existing build folder and recreate # Remove any existing build folder and recreate
@ -147,7 +149,7 @@ else
rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.h" 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 "$QT_SOURCE_DIR/src/corelib/global/qconfig.cpp" 2>/dev/null
cd $buildDIR || exit 1 cd "$buildDIR" || exit
# Compile as opensource, accepting LGPL conditions (yes) # Compile as opensource, accepting LGPL conditions (yes)
echo yes | $QT_SOURCE_DIR/configure \ echo yes | $QT_SOURCE_DIR/configure \

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -22,7 +24,8 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1
@ -154,9 +157,9 @@ then
exit 1 exit 1
} }
cd $SCOTCH_SOURCE_DIR/src || exit 1 cd "$SCOTCH_SOURCE_DIR/src" || exit
export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$SCOTCH_SOURCE_DIR/.git" # Mask seeing our own git-repo
rm -rf $SCOTCH_ARCH_PATH rm -rf "$SCOTCH_ARCH_PATH"
applyPatch "$scotchPACKAGE" .. # patch at parent-level applyPatch "$scotchPACKAGE" .. # patch at parent-level
@ -239,8 +242,8 @@ else
exit 1 exit 1
} }
cd $SCOTCH_SOURCE_DIR/src || exit 1 cd "$SCOTCH_SOURCE_DIR/src" || exit
export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo export GIT_DIR="$SCOTCH_SOURCE_DIR/.git" # Mask seeing our own git-repo
echo echo
prefixDIR=$SCOTCH_ARCH_PATH prefixDIR=$SCOTCH_ARCH_PATH

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -27,7 +29,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1

View File

@ -3,9 +3,11 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -20,7 +22,8 @@
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Run from third-party directory only # 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 "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
echo " Check your OpenFOAM environment and installation" echo " Check your OpenFOAM environment and installation"
exit 1 exit 1