From 697c80d8d408f7ed2e90ae7ef3831839c562a560 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Jun 2022 12:01:19 +0200
Subject: [PATCH] STYLE: add note about compilation location into Allwmake
---
Allwclean | 2 +-
Allwmake | 17 +++++++++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Allwclean b/Allwclean
index 9d7fe664..af0fbbf0 100755
--- a/Allwclean
+++ b/Allwclean
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
+cd "${0%/*}" || exit # Run from this directory
#------------------------------------------------------------------------------
diff --git a/Allwmake b/Allwmake
index 55dcc618..5efdf50a 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,13 +1,18 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
-fi
+cd "${0%/*}" || exit # Run from this directory
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------
+# Build into FOAM_USER_{APPBIN,LIBBIN} unless otherwise specified with
+# -prefix or FOAM_MODULE_{APPBIN,LIBBIN} env varables
+#------------------------------------------------------------------------------
+moduleName="cfmesh"
+
+#------------------------------------------------------------------------------
+
echo "========================================"
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
-echo "Starting compile of cfMesh with ${WM_PROJECT_DIR##*/} ${0##*}"
+echo "Starting compile of $moduleName with ${WM_PROJECT_DIR##*/} ${0##*}"
echo " $WM_COMPILER $WM_COMPILER_TYPE compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo " prefix = ${FOAM_MODULE_PREFIX:-default (user)}"
@@ -21,7 +26,7 @@ wmake -all utilities
echo
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
echo "========================================"
-echo " Finished compile of cfMesh with ${WM_PROJECT_DIR##*/}"
+echo " Finished compile of $moduleName with ${WM_PROJECT_DIR##*/}"
echo " $WM_COMPILER $WM_COMPILER_TYPE compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo
--
GitLab