From 1dd5b938977ce8b61a13f92a815823f1bc6b5beb Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sat, 10 Jan 2015 21:58:19 +0000
Subject: [PATCH] wmake/scripts/AllwmakeParseArguments: Handle stop-on-error
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1485
---
src/fvAgglomerationMethods/Allwmake | 5 -----
wmake/scripts/AllwmakeParseArguments | 12 +++++++++++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index f03db10d3f9..16340f0efb8 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -27,10 +27,5 @@ else
echo
fi
-if [ -n "$SCOTCH_ARCH_PATH" ]
-then
- wmake $targetType scotchGamgAgglomeration
-fi
-
# ----------------------------------------------------------------- end-of-file
diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index 0c8197c7d4c..cbd5aa01e9b 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -144,6 +144,16 @@ do
done
+#------------------------------------------------------------------------------
+# If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
+#------------------------------------------------------------------------------
+
+if [ -z "${WM_CONTINUE_ON_ERROR}" ]
+then
+ set -e
+fi
+
+
#------------------------------------------------------------------------------
# Cleanup local variables and functions
#------------------------------------------------------------------------------
--
GitLab