applications/.*/Allwmake: Updated to support "stop on 1st error"

Patch contributed by Bruno Santos Resolved bug-report http://www.openfoam.org/mantisbt/view.php?id=2042
2016-04-04 09:03:40 +01:00
parent 1fbd362faa
commit 94e9b05edd
30 changed files with 162 additions and 44 deletions
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@ -3,6 +3,9 @@
 # Build optional components (eg, may depend on third-party libraries)
 #------------------------------------------------------------------------------
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 # build libccmio and create lnInclude directory
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 # Get CGAL and boost versions
 . $WM_PROJECT_DIR/etc/config.sh/functions
 _foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
@ -15,7 +18,7 @@ wmake -all snappyHexMesh

 if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
 then
-    foamyMesh/Allwmake
+    foamyMesh/Allwmake $*
 fi


--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

-wmake libso extrude2DMesh
+wmake $targetType extrude2DMesh
 wmake

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

-wmake libso conformalVoronoiMesh
-wmake libso conformalVoronoi2DMesh
+wmake $targetType conformalVoronoiMesh
+wmake $targetType conformalVoronoi2DMesh
 wmake foamyQuadMesh
 wmake foamyHexMesh
 #wmake foamyHexMeshBackgroundMesh
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
@ -1,5 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@ -1,6 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+set -x
+
 export COMPILE_FLAGS=''
 export LINK_FLAGS=''

--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 unset COMP_FLAGS LINK_FLAGS

 #
--- a/applications/utilities/miscellaneous/foamHelp/Allwmake
+++ b/applications/utilities/miscellaneous/foamHelp/Allwmake
@ -1,7 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

-wmake libso helpTypes
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+set -x
+
+wmake $targetType helpTypes
 wmake


--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

+# Parse arguments for application compilation (at least for error control)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 if [ ! -d ${WM_THIRD_PARTY_DIR}/tecio ]
 then
    echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@ -1,5 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 #set -x

 case "$ParaView_VERSION" in
@ -14,9 +18,9 @@ case "$ParaView_VERSION" in
        # ensure CMake gets the correct C++ compiler
        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"

-        wmake libso vtkPV3Readers
-        PV3blockMeshReader/Allwmake
-        PV3FoamReader/Allwmake
+        wmake $targetType vtkPV3Readers
+        PV3blockMeshReader/Allwmake $*
+        PV3FoamReader/Allwmake $*
    else
        echo "ERROR: ParaView not found in $ParaView_DIR"
    fi
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV3Foam
+    wmake $targetType vtkPV3Foam
    (
        cd PV3FoamReader
        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV3blockMesh
+    wmake $targetType vtkPV3blockMesh
    (
        cd PV3blockMeshReader
        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@ -1,5 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 #set -x

 case "$ParaView_VERSION" in
@ -14,9 +18,9 @@ case "$ParaView_VERSION" in
        # ensure CMake gets the correct C++ compiler
        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"

-        wmake libso vtkPVReaders
-        PVblockMeshReader/Allwmake
-        PVFoamReader/Allwmake
+        wmake $targetType vtkPVReaders
+        PVblockMeshReader/Allwmake $*
+        PVFoamReader/Allwmake $*
    else
        echo "ERROR: ParaView not found in $ParaView_DIR"
    fi
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPVFoam
+    wmake $targetType vtkPVFoam
    (
        cd PVFoamReader
        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPVblockMesh
+    wmake $targetType vtkPVblockMesh
    (
        cd PVblockMeshReader
        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
@ -1,6 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

-wmake libso
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake $targetType

 #------------------------------------------------------------------------------
--- a/applications/utilities/preProcessing/wallFunctionTable/Allwmake
+++ b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x

-wmake libso tabulatedWallFunction
+wmake $targetType tabulatedWallFunction
 wmake

 #------------------------------------------------------------------------------