Commit 0b41521d authored by Mark Olesen's avatar Mark Olesen
Browse files

CONFIG: avoid triggering dash expansion bug (fixes #1757)

- use long form to avoid dash 0.5.8 error (ubuntu bionic)

- consolidate the prefix handling into modules/Allwmake
parent 968ce029
...@@ -80,18 +80,6 @@ then ...@@ -80,18 +80,6 @@ then
echo echo
elif [ -d "$WM_PROJECT_DIR/modules" ] elif [ -d "$WM_PROJECT_DIR/modules" ]
then then
echo "========================================"
echo "Compile OpenFOAM modules"
echo " ignoring possible compilation errors"
echo " make certain to check the output file"
echo
set +e
export WM_CONTINUE_ON_ERROR=true
# Default build into OpenFOAM project locations
: "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
export FOAM_MODULE_PREFIX
(cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all) (cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all)
fi fi
......
...@@ -7,9 +7,22 @@ targetType=libso ...@@ -7,9 +7,22 @@ targetType=libso
# Default build into OpenFOAM project locations unless specified with # Default build into OpenFOAM project locations unless specified with
# -prefix or FOAM_MODULE_PREFIX env varable # -prefix or FOAM_MODULE_PREFIX env varable
: "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}" # Long form to avoid dash 0.5.8 error (issue #1757)
[ -n "$FOAM_MODULE_PREFIX" ] || FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}"
export FOAM_MODULE_PREFIX export FOAM_MODULE_PREFIX
echo "========================================"
echo "Compile OpenFOAM modules"
echo "prefix = $FOAM_MODULE_PREFIX"
echo
echo " ignoring possible compilation errors"
echo " make certain to check the output file"
echo
set +e
export WM_CONTINUE_ON_ERROR=true
#------------------------------------------------------------------------------
for moduleName in $(./list-modules) for moduleName in $(./list-modules)
do do
if [ -d "$moduleName" ] if [ -d "$moduleName" ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment