mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: Updated foamInstallationTest
This commit is contained in:
@ -32,8 +32,6 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Base settings
|
# Base settings
|
||||||
FOAM_VERSION=1.6
|
|
||||||
SUPPLIED_VERSION_GCC=4.4.3
|
|
||||||
MIN_VERSION_GCC=4.3.3
|
MIN_VERSION_GCC=4.3.3
|
||||||
|
|
||||||
# General
|
# General
|
||||||
@ -247,19 +245,54 @@ reportExecutable()
|
|||||||
VERSION=`$1 -case /dev/null 2>&1 \
|
VERSION=`$1 -case /dev/null 2>&1 \
|
||||||
| sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p'`
|
| sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p'`
|
||||||
;;
|
;;
|
||||||
|
flex)
|
||||||
|
VERSION=`$1 --version /dev/null 2>&1 \
|
||||||
|
| sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p' `
|
||||||
|
;;
|
||||||
gcc)
|
gcc)
|
||||||
VERSION=`$1 -v 2>&1 \
|
VERSION=`$1 -v 2>&1 \
|
||||||
| sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p' `
|
| sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p' `
|
||||||
|
|
||||||
if [ "$VERSION" != "$SUPPLIED_VERSION_GCC" ]
|
MINV1=`echo $MIN_VERSION_GCC | cut -d. -f1`
|
||||||
then
|
MINV2=`echo $MIN_VERSION_GCC | cut -d. -f2`
|
||||||
echo "WARNING: gcc version does not match gcc supplied" \
|
MINV3=`echo $MIN_VERSION_GCC | cut -d. -f3`
|
||||||
"with this release of OpenFOAM"
|
|
||||||
echo " Supplied version: $SUPPLIED_VERSION_GCC"
|
V1=`echo $VERSION | cut -d. -f1`
|
||||||
echo " User version : $VERSION"
|
V2=`echo $VERSION | cut -d. -f2`
|
||||||
echo " Minimum required: $MIN_VERSION_GCC"
|
V3=`echo $VERSION | cut -d. -f3`
|
||||||
echo ""
|
|
||||||
|
|
||||||
|
gccOK=""
|
||||||
|
pass=""
|
||||||
|
if [ $V1 -lt $MINV1 ]; then
|
||||||
|
gccOk="ERROR"
|
||||||
|
elif [ $V1 -gt $MINV1 ]; then
|
||||||
|
pass="yes"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$pass" == "" ] && [ "$gccOk" == "" ]; then
|
||||||
|
if [ $V2 -lt $MINV2 ]; then
|
||||||
|
gccOk="ERROR"
|
||||||
|
elif [ $V2 -gt $MINV2 ]; then
|
||||||
|
pass="yes"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$pass" == "" ] && [ "$gccOk" == "" ] && [ $V3 != "" ] && [ $MINV3 != "" ]; then
|
||||||
|
if [ $V3 -lt $MINV3 ]; then
|
||||||
|
gccOk="ERROR"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$gccOk" != "" ]; then
|
||||||
|
echo "ERROR: gcc version is too old for this release of OpenFOAM"
|
||||||
|
echo " User version : $VERSION"
|
||||||
|
echo " Minimum required: $MIN_VERSION_GCC"
|
||||||
|
echo ""
|
||||||
|
fatalError=`expr $fatalError + 1`
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
gtar)
|
gtar)
|
||||||
VERSION=`$APP_PATH --version | head -1`
|
VERSION=`$APP_PATH --version | head -1`
|
||||||
@ -304,7 +337,7 @@ checkOpenFOAMEnvironment()
|
|||||||
echo "FATAL ERROR: OpenFOAM environment not configured."
|
echo "FATAL ERROR: OpenFOAM environment not configured."
|
||||||
echo ""
|
echo ""
|
||||||
echo " Please refer to the installation section of the README file:"
|
echo " Please refer to the installation section of the README file:"
|
||||||
echo " <OpenFOAM installation dir>/OpenFOAM-${FOAM_VERSION}/README"
|
echo " <OpenFOAM installation dir>/OpenFOAM-${WM_PROJECT_VERSION}/README"
|
||||||
echo " to source the OpenFOAM environment."
|
echo " to source the OpenFOAM environment."
|
||||||
echo ""
|
echo ""
|
||||||
exit 1
|
exit 1
|
||||||
@ -320,7 +353,7 @@ checkUserShell()
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "FATAL ERROR: Cannot identify the shell you are running."
|
echo "FATAL ERROR: Cannot identify the shell you are running."
|
||||||
echo " OpenFOAM ${FOAM_VERSION} is compatible with "
|
echo " OpenFOAM ${WM_PROJECT_VERSION} is compatible with "
|
||||||
echo " csh, tcsh, ksh and bash."
|
echo " csh, tcsh, ksh and bash."
|
||||||
echo
|
echo
|
||||||
fatalError=`expr $fatalError + 1`
|
fatalError=`expr $fatalError + 1`
|
||||||
@ -336,7 +369,7 @@ checkHostName()
|
|||||||
then
|
then
|
||||||
echo "FATAL ERROR: Cannot stat hostname."
|
echo "FATAL ERROR: Cannot stat hostname."
|
||||||
echo " Contact your system administrator, "
|
echo " Contact your system administrator, "
|
||||||
echo " OpenFOAM ${FOAM_VERSION} needs a valid "
|
echo " OpenFOAM ${WM_PROJECT_VERSION} needs a valid "
|
||||||
echo " hostname to function."
|
echo " hostname to function."
|
||||||
echo
|
echo
|
||||||
fatalError=`expr $fatalError + 1`
|
fatalError=`expr $fatalError + 1`
|
||||||
@ -352,7 +385,7 @@ checkOS()
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "FATAL ERROR: Incompatible operating system \"$OSTYPE\"."
|
echo "FATAL ERROR: Incompatible operating system \"$OSTYPE\"."
|
||||||
echo " OpenFOAM $FOAM_VERSION is currently "
|
echo " OpenFOAM ${FWM_PROJECT_VERSION} is currently "
|
||||||
echo " available for Linux and SunOS only."
|
echo " available for Linux and SunOS only."
|
||||||
echo
|
echo
|
||||||
fatalError=`expr $fatalError + 1`
|
fatalError=`expr $fatalError + 1`
|
||||||
@ -423,6 +456,7 @@ COL3=`fixlen Location 10`
|
|||||||
hline
|
hline
|
||||||
echo "$COL1 $COL2 $COL3"
|
echo "$COL1 $COL2 $COL3"
|
||||||
hline
|
hline
|
||||||
|
reportExecutable flex
|
||||||
reportExecutable gcc
|
reportExecutable gcc
|
||||||
reportExecutable gzip
|
reportExecutable gzip
|
||||||
if [ "$OSTYPE" = Linux ]
|
if [ "$OSTYPE" = Linux ]
|
||||||
|
|||||||
Reference in New Issue
Block a user