STYLE: use 'foamCompiler' instead of 'compilerInstall'

- more obvious in its meaning
This commit is contained in:
Mark Olesen
2010-12-23 06:28:49 +01:00
parent 603aa1e61c
commit 312d15c701
5 changed files with 35 additions and 30 deletions

View File

@ -75,7 +75,7 @@ do
_inlineSed \
etc/bashrc \
'/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" \
"Replacing foamInstall setting by $foamInstall"
"Replacing foamInstall setting by '$foamInstall'"
shift 2
;;
--projectName)
@ -84,7 +84,7 @@ do
_inlineSed \
etc/bashrc \
'/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" \
"Replacing WM_PROJECT_DIR setting by $projectName"
"Replacing WM_PROJECT_DIR setting by '$projectName'"
shift 2
;;
--archOption)
@ -93,7 +93,7 @@ do
_inlineSed \
etc/bashrc \
'/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" \
"Replacing WM_ARCH_OPTION setting by $archOption"
"Replacing WM_ARCH_OPTION setting by '$archOption'"
shift 2
;;
--paraviewInstall)
@ -102,7 +102,7 @@ do
_inlineSed \
etc/apps/paraview3/bashrc \
'/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \
"Replacing ParaView_DIR setting by $paraviewInstall"
"Replacing ParaView_DIR setting by '$paraviewInstall'"
shift 2
;;
*)
@ -113,18 +113,18 @@ done
[ -n "$foamInstall" -o -n "$projectName" -o -n "$archOption" -o -n "$paraviewInstall" ] || usage "Please specify at least one configure option"
#echo "Replacing WM_PROJECT setting by $projectName"
#echo "Replacing WM_PROJECT setting by '$projectName'"
#sed -i -e 's@WM_PROJECT=.*@WM_PROJECT='"$projectName@" etc/bashrc
# Replace the WM_MPLIB always
_inlineSed \
etc/bashrc \
'/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' \
"Replacing WM_MPLIB setting by SYSTEMOPENMPI"
# Replace the compilerInstall always
"Replacing WM_MPLIB setting by 'SYSTEMOPENMPI'"
# Replace the foamCompiler always
_inlineSed \
etc/settings.sh \
'/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' \
"Replacing compilerInstall setting by system"
'/^[^#]/s@: ${foamCompiler:=.*}@foamCompiler=system@' \
"Replacing foamCompiler setting by 'system'"
#------------------------------------------------------------------------------