wmake/Allwmake: Completed support for targetType 'objects'

Patch contributed by Mattijs Janssens
2025-11-28 03:28:01 +00:00 · 2016-06-24 15:25:11 +01:00
parent 186b2c1c69
commit dea6a3c6e8
54 changed files with 103 additions and 125 deletions
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@ -14,7 +14,7 @@ $WM_THIRD_PARTY_DIR/AllwmakeLibccmio
 # if the library built properly, the headers should exist too
 if [ -e $FOAM_EXT_LIBBIN/libccmio.so ]
 then
-    wmake ccm26ToFoam
+    wmake $targetType ccm26ToFoam
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@ -11,14 +11,14 @@ _foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \

 set -x

-wmake -all blockMesh
-wmake -all extrude
-wmake -all extrude2DMesh
-wmake -all snappyHexMesh
+wmake -all $targetType blockMesh
+wmake -all $targetType extrude
+wmake -all $targetType extrude2DMesh
+wmake -all $targetType snappyHexMesh

 if [ -n "$FOAMY_HEX_MESH" ]
 then
-    foamyMesh/Allwmake $*
+    foamyMesh/Allwmake $targetType $*
 fi


--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
@ -2,11 +2,10 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

 wmake $targetType extrude2DMesh
-wmake
+wmake $targetType

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
@ -2,17 +2,16 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

 wmake $targetType conformalVoronoiMesh
 wmake $targetType conformalVoronoi2DMesh
-wmake foamyQuadMesh
-wmake foamyHexMesh
-#wmake foamyHexMeshBackgroundMesh
-#(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
-#wmake cellSizeAndAlignmentGrid

+wmake $targetType foamyQuadMesh
+wmake $targetType foamyHexMesh
+#wmake $targetType foamyHexMeshBackgroundMesh
+#(cd foamyHexMeshSurfaceSimplify && ./Allwmake $targetType $*)
+#wmake $targetType cellSizeAndAlignmentGrid

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
@ -7,7 +7,7 @@ set -x

 if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
 then
-    wmake
+    wmake $targetType
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@ -21,6 +21,6 @@ then
    export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
 fi

-wmake
+wmake $targetType

 #------------------------------------------------------------------------------
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@ -16,6 +16,6 @@ then
    export LINK_FLAGS="-lreadline"
 fi

-wmake
+wmake $targetType

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

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

 wmake $targetType helpTypes
-wmake
-
+wmake $targetType

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
@ -8,7 +8,7 @@ if [ ! -d ${WM_THIRD_PARTY_DIR}/tecio ]
 then
    echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
 else
-    wmake
+    wmake $targetType
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
@ -2,11 +2,10 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

 wmake $targetType foamToVTK
-wmake
+wmake $targetType

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

@ -19,8 +18,8 @@ case "$ParaView_VERSION" in
        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"

        wmake $targetType vtkPV3Readers
-        PV3blockMeshReader/Allwmake $*
-        PV3FoamReader/Allwmake $*
+        PV3blockMeshReader/Allwmake $targetType $*
+        PV3FoamReader/Allwmake $targetType $*
    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
@ -2,20 +2,23 @@
 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 $targetType vtkPV3Foam
-    (
-        cd PV3FoamReader
-        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-        cd Make/$WM_OPTIONS
-        cmake ../..
-        make
-    )
+
+    if [ "$targetType" != "objects" ]
+    then
+        (
+            cd PV3FoamReader
+            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+            cd Make/$WM_OPTIONS
+            cmake ../..
+            make
+        )
+    fi
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@ -2,20 +2,23 @@
 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 $targetType vtkPV3blockMesh
-    (
-        cd PV3blockMeshReader
-        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-        cd Make/$WM_OPTIONS
-        cmake ../..
-        make
-    )
+
+    if [ "$targetType" != "objects" ]
+    then
+        (
+            cd PV3blockMeshReader
+            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+            cd Make/$WM_OPTIONS
+            cmake ../..
+            make
+        )
+    fi
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

@ -19,8 +18,8 @@ case "$ParaView_VERSION" in
        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"

        wmake $targetType vtkPVReaders
-        PVblockMeshReader/Allwmake $*
-        PVFoamReader/Allwmake $*
+        PVblockMeshReader/Allwmake $targetType $*
+        PVFoamReader/Allwmake $targetType $*
    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
@ -2,20 +2,23 @@
 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 $targetType vtkPVFoam
-    (
-        cd PVFoamReader
-        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-        cd Make/$WM_OPTIONS
-        cmake ../..
-        make
-    )
+
+    if [ "$targetType" != "objects" ]
+    then
+        (
+            cd PVFoamReader
+            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+            cd Make/$WM_OPTIONS
+            cmake ../..
+            make
+        )
+    fi
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@ -2,20 +2,23 @@
 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 $targetType vtkPVblockMesh
-    (
-        cd PVblockMeshReader
-        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-        cd Make/$WM_OPTIONS
-        cmake ../..
-        make
-    )
+
+    if [ "$targetType" != "objects" ]
+    then
+        (
+            cd PVblockMeshReader
+            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+            cd Make/$WM_OPTIONS
+            cmake ../..
+            make
+        )
+    fi
 fi

 #------------------------------------------------------------------------------
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory

 # 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
@ -2,11 +2,10 @@
 cd ${0%/*} || exit 1    # Run from this directory

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

 wmake $targetType tabulatedWallFunction
-wmake
+wmake $targetType

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