zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

settings.sh - bugfix

Browse Source 
- let _foamAddPath and _foamAddLib handle ':'-separated variables
    This unfortunately gets the order backwards, but at least doesn't
    try making really stupid directory names

  TODO:
  - settings.csh still has the same bug
  - perhaps _foamAddExistingLib function (or with a switch) to avoid the mkdir
This commit is contained in:
Mark Olesen
2008-10-06 10:05:02 +02:00
parent 6437f3dbad
commit 9f107b6a01
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
etc/settings.sh
View File

@ -33,22 +33,40 @@
_foamAddPath() _foamAddPath()
{ {
while [ $# -ge 1 ] if [ $# -eq 1 ]
do then
[ -d $1 ] || mkdir -p $1 oldIFS="$IFS"
export PATH=$1:$PATH IFS=':' # split on ':'
shift set -- $1
done IFS="$oldIFS"
unset oldIFS
fi
while [ $# -ge 1 ]
do
[ -d $1 ] || mkdir -p $1
export PATH=$1:$PATH
shift
done
} }
_foamAddLib() _foamAddLib()
{ {
while [ $# -ge 1 ] if [ $# -eq 1 ]
do then
[ -d $1 ] || mkdir -p $1 oldIFS="$IFS"
export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH IFS=':' # split on ':'
shift set -- $1
done IFS="$oldIFS"
unset oldIFS
fi
while [ $# -ge 1 ]
do
[ -d $1 ] || mkdir -p $1
export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
shift
done
} }
@ -99,7 +117,6 @@ case "$WM_COMPILER_INST" in
OpenFOAM) OpenFOAM)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc) Gcc)
#export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
@ -127,7 +144,7 @@ esac
if [ -d "$WM_COMPILER_BIN" ]; then if [ -d "$WM_COMPILER_BIN" ]; then
_foamAddPath $WM_COMPILER_BIN _foamAddPath $WM_COMPILER_BIN
_foamAddLib $WM_COMPILER_LIB _foamAddLib $WM_COMPILER_LIB
fi fi
unset WM_COMPILER_BIN WM_COMPILER_LIB unset WM_COMPILER_BIN WM_COMPILER_LIB