zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

foamInstallationTest: Add support for gcc named with extension

Browse Source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=452
This commit is contained in:
Henry
2015-01-31 22:39:23 +00:00
parent cb23867daa
commit 88a021bd4f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/foamInstallationTest
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -232,7 +232,7 @@ reportExecutable()
echo "`fixlen "$1" 9`" "*** not installed ***" echo "`fixlen "$1" 9`" "*** not installed ***"
VERSION="" VERSION=""
case "$1" in case "$1" in
gcc | $foamTestApp) gcc* | $foamTestApp)
echo " CRITICAL ERROR" echo " CRITICAL ERROR"
criticalError=`expr $criticalError + 1` criticalError=`expr $criticalError + 1`
;; ;;
@ -249,10 +249,19 @@ reportExecutable()
VERSION=`$1 --version /dev/null 2>&1 \ VERSION=`$1 --version /dev/null 2>&1 \
| sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p' ` | sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p' `
;; ;;
gcc) gcc* | g++*)
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' `
case "$1" in
gcc*)
BINARYCODENAME=gcc
;;
g++*)
BINARYCODENAME=g++
;;
esac
MINV1=`echo $MIN_VERSION_GCC | cut -d. -f1` MINV1=`echo $MIN_VERSION_GCC | cut -d. -f1`
MINV2=`echo $MIN_VERSION_GCC | cut -d. -f2` MINV2=`echo $MIN_VERSION_GCC | cut -d. -f2`
MINV3=`echo $MIN_VERSION_GCC | cut -d. -f3` MINV3=`echo $MIN_VERSION_GCC | cut -d. -f3`
@ -285,14 +294,13 @@ reportExecutable()
fi fi
if [ "$gccOk" != "" ]; then if [ "$gccOk" != "" ]; then
echo "ERROR: gcc version is too old for this release of OpenFOAM" echo "ERROR: $BINARYCODENAME version is too old for this release of OpenFOAM"
echo " User version : $VERSION" echo " User version : $VERSION"
echo " Minimum required: $MIN_VERSION_GCC" echo " Minimum required: $MIN_VERSION_GCC"
echo "" echo ""
fatalError=`expr $fatalError + 1` fatalError=`expr $fatalError + 1`
fi fi
;; ;;
gtar) gtar)
VERSION=`$APP_PATH --version | head -1` VERSION=`$APP_PATH --version | head -1`
@ -458,6 +466,7 @@ echo "$COL1 $COL2 $COL3"
hline hline
reportExecutable flex reportExecutable flex
reportExecutable "$WM_CC" reportExecutable "$WM_CC"
reportExecutable "$WM_CXX"
reportExecutable gzip reportExecutable gzip
if [ "$OSTYPE" = Linux ] if [ "$OSTYPE" = Linux ]
then then