Allwmake: Remove 'set -x' which generates a lot of noise

'set -x' should be used for debugging.

Added command printing into wmake and Allwmake as a replacement for
'set -x' to log current target.

applications/Allwmake

@@ -17,10 +17,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
     exit 1
 }
 
-set -x
-
 wmake -all $targetType solvers
 wmake -all $targetType utilities
 
-
 #------------------------------------------------------------------------------

applications/solvers/compressible/rhoCentralFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso BCs
 wclean

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 (wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
 

applications/solvers/lagrangian/DPMFoam/Allwclean

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 cd ${0%/*} || exit 1
-set -x
 
 wclean libso DPMTurbulenceModels
 wclean

applications/solvers/lagrangian/DPMFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType DPMTurbulenceModels
 

applications/solvers/multiphase/compressibleInterFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso twoPhaseMixtureThermo
 wclean

applications/solvers/multiphase/compressibleInterFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType twoPhaseMixtureThermo
 

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso multiphaseMixtureThermo
 wclean

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType multiphaseMixtureThermo
 wmake $targetType

applications/solvers/multiphase/driftFluxFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso mixtureViscosityModels
 wclean libso relativeVelocityModels

applications/solvers/multiphase/driftFluxFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType mixtureViscosityModels
 wmake $targetType relativeVelocityModels

applications/solvers/multiphase/interPhaseChangeFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso phaseChangeTwoPhaseMixtures
 wclean

applications/solvers/multiphase/interPhaseChangeFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType phaseChangeTwoPhaseMixtures
 wmake $targetType

applications/solvers/multiphase/multiphaseEulerFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso multiphaseSystem
 wclean libso interfacialModels

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmakeLnInclude interfacialModels
 wmake $targetType multiphaseSystem

applications/solvers/multiphase/multiphaseInterFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso multiphaseMixture
 wclean

applications/solvers/multiphase/multiphaseInterFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType multiphaseMixture
 wmake $targetType

applications/solvers/multiphase/reactingEulerFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso phaseSystems
 wclean libso interfacialModels

applications/solvers/multiphase/reactingEulerFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmakeLnInclude interfacialModels
 wmakeLnInclude interfacialCompositionModels

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso multiphaseSystem
 wclean libso multiphaseCompressibleTurbulenceModels

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType multiphaseSystem
 wmake $targetType multiphaseCompressibleTurbulenceModels

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso twoPhaseSystem
 wclean libso twoPhaseCompressibleTurbulenceModels

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType twoPhaseSystem
 wmake $targetType twoPhaseCompressibleTurbulenceModels

applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso twoPhaseSystem
 wclean libso interfacialModels

applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmakeLnInclude interfacialModels
 wmake $targetType twoPhaseSystem

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -6,7 +6,6 @@ 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
 $WM_THIRD_PARTY_DIR/AllwmakeLibccmio

applications/utilities/mesh/generation/extrude2DMesh/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso extrude2DMesh
 wclean

applications/utilities/mesh/generation/extrude2DMesh/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType extrude2DMesh
 wmake $targetType

applications/utilities/mesh/generation/foamyMesh/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean conformalVoronoiMesh
 wclean conformalVoronoi2DMesh

applications/utilities/mesh/generation/foamyMesh/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType conformalVoronoiMesh
 wmake $targetType conformalVoronoi2DMesh

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake

@@ -3,7 +3,6 @@ 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}" ]
 then

applications/utilities/mesh/manipulation/setSet/Allwmake

@@ -11,7 +11,7 @@ unset COMP_FLAGS LINK_FLAGS
 #
 if [ -f /usr/include/readline/readline.h ]
 then
-    echo "Found <readline/readline.h>  --  enabling readline support."
+    echo "    found <readline/readline.h>  --  enabling readline support."
     export COMP_FLAGS="-DHAS_READLINE"
     export LINK_FLAGS="-lreadline"
 fi

applications/utilities/miscellaneous/foamHelp/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType helpTypes
 wmake $targetType

applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake

@@ -4,10 +4,8 @@ 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 ]
+if [ -d ${WM_THIRD_PARTY_DIR}/tecio ]
 then
-    echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
-else
     wmake $targetType
 fi
 

applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType foamToVTK
 wmake $targetType

applications/utilities/postProcessing/graphics/PV3Readers/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso vtkPV3Readers
 PV3blockMeshReader/Allwclean

applications/utilities/postProcessing/graphics/PV3Readers/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-#set -x
 
 case "$ParaView_VERSION" in
 3*)
@@ -22,12 +21,9 @@ case "$ParaView_VERSION" in
         PV3blockMeshReader/Allwmake $targetType $*
         PV3FoamReader/Allwmake $targetType $*
     else
-        echo "ERROR: ParaView not found in $ParaView_DIR"
+        echo "    ERROR: ParaView not found in $ParaView_DIR"
     fi
     ;;
-*)
-    echo "WARN: PV3 readers not building: ParaView_VERSION=$ParaView_VERSION"
-    ;;
 esac
 
 #------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 # deal with client/server vs combined plugins
 rm -f $FOAM_LIBBIN/libPV3FoamReader* 2>/dev/null

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 # deal with client/server vs combined plugins
 rm -f $FOAM_LIBBIN/libPV3blockMeshReader*  2>/dev/null

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then

applications/utilities/postProcessing/graphics/PVReaders/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wclean libso vtkPVReaders
 PVblockMeshReader/Allwclean

applications/utilities/postProcessing/graphics/PVReaders/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-#set -x
 
 case "$ParaView_VERSION" in
 4* | 5*)
@@ -22,12 +21,9 @@ case "$ParaView_VERSION" in
         PVblockMeshReader/Allwmake $targetType $*
         PVFoamReader/Allwmake $targetType $*
     else
-        echo "ERROR: ParaView not found in $ParaView_DIR"
+        echo "    ERROR: ParaView not found in $ParaView_DIR"
     fi
     ;;
-*)
-    echo "WARN: PV readers not building: ParaView_VERSION=$ParaView_VERSION"
-    ;;
 esac
 
 #------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 # deal with client/server vs combined plugins
 rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 # deal with client/server vs combined plugins
 rm -f $FOAM_LIBBIN/libPVblockMeshReader*  2>/dev/null

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then

applications/utilities/preProcessing/wallFunctionTable/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType tabulatedWallFunction
 wmake $targetType

doc/Allwmake

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 # fix permissions (NB: '+X' and not '+x'!)
 chmod a+rX $WM_PROJECT_DIR $WM_PROJECT_DIR/doc Doxygen

doc/Doxygen/Allwmake

@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 [ -d "$WM_PROJECT_DIR" ] || {
-    echo "Error: WM_PROJECT_DIR directory does not exist"
+    echo "    Error: WM_PROJECT_DIR directory does not exist"
     echo "        Check the OpenFOAM entries in your dot-files and source them."
     echo "        WM_PROJECT_DIR=$WM_PROJECT_DIR"
     exit 1
@@ -62,8 +62,6 @@ done
 
 #------------------------------------------------------------------------------
 
-set -x
-
 rm -rf latex man
 
 # remove html directory in background

doc/tools/find-its

@@ -1,17 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# Script
-#     find-its
-#
-# Description
-#     Search for files with "it's"
-#     This contraction (== "it is") looks too much like "its" (possesive)
-#     and confuses non-native (and some native) English speakers.
-#
-#------------------------------------------------------------------------------
-set -x
-cd $WM_PROJECT_DIR || exit 1
-
-git grep -e "it's"
-
-#------------------------------------------------------------------------------

doc/tools/find-trailingspace

@@ -7,7 +7,6 @@
 #     Search for files with trailing whitesapce
 #
 #------------------------------------------------------------------------------
-set -x
 cd $WM_PROJECT_DIR || exit 1
 
 tab=$'\t'

src/Allwmake

@@ -17,8 +17,6 @@ wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
     exit 1
 }
 
-set -x
-
 # Update OpenFOAM version strings if required
 wmakePrintBuild -check || wrmo OpenFOAM/global/global.o 2>/dev/null
 

src/OSspecific/POSIX/Allwmake

@@ -12,7 +12,7 @@ unset COMP_FLAGS LINK_FLAGS
 #
 if [ -f /usr/include/sys/inotify.h ]
 then
-    echo "Found <sys/inotify.h>  --  enabling inotify for file monitoring."
+    echo "    found <sys/inotify.h>  --  enabling inotify for file monitoring."
     export COMP_FLAGS="-DFOAM_USE_INOTIFY"
 else
     unset COMP_FLAGS

src/Pstream/Allwclean

@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # clean the qualified directory
 wcleanMpiLib()
 {
-    set +x
     for libName
     do
     (
@@ -13,15 +12,12 @@ wcleanMpiLib()
         wclean $libName
     )
     done
-    set -x
 }
 
-set -x
 wclean dummy
 
 case "$WM_MPLIB" in
 *MPI*)
-    set +x
     wcleanMpiLib mpi
     ;;
 esac

src/Pstream/Allwmake

@@ -10,27 +10,22 @@ cd ${0%/*} || exit 1    # Run from this directory
 # use sentinel file to handle version changes
 wmakeMpiLib()
 {
-    set +x
     for libName
     do
     (
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
         whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/Pstream/$libName/using:$FOAM_MPI"
         [ -e "$whichmpi" ] || wclean $libName
-        echo "wmake $targetType $libName"
         wmake $targetType $libName
         touch "$whichmpi"
     )
     done
-    set -x
 }
 
-set -x
 wmake $targetType dummy
 
 case "$WM_MPLIB" in
 *MPI*)
-    set +x
     wmakeMpiLib mpi
     ;;
 esac

src/TurbulenceModels/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType turbulenceModels
 wmake $targetType incompressible

src/conversion/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType
 

src/dummyThirdParty/Allwmake

@@ -3,12 +3,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType scotchDecomp
 wmake $targetType ptscotchDecomp
 wmake $targetType metisDecomp
 wmake $targetType MGridGen
 
-
 #------------------------------------------------------------------------------

src/functionObjects/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType field
 wmake $targetType forces

src/fvAgglomerationMethods/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
 
@@ -14,5 +13,4 @@ fi
 
 wmake $targetType pairPatchAgglomeration
 
-
 #------------------------------------------------------------------------------

src/lagrangian/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType distributionModels
 wmake $targetType basic

src/lagrangian/molecularDynamics/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType potential
 wmake $targetType molecularMeasurements

src/mesh/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType snappyHexMesh
 wmake $targetType blockMesh

src/parallel/Allwmake

@@ -3,11 +3,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 decompose/Allwmake $targetType $*
 reconstruct/Allwmake $targetType $*
 wmake $targetType distributed
 
-
 #------------------------------------------------------------------------------

src/parallel/decompose/Allwclean

@@ -5,20 +5,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
 then
     . $settings
-    echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
+    echo "    using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
 else
     echo
-    echo "Error: no config.sh/scotch settings"
+    echo "    Error: no config.sh/scotch settings"
     echo
 fi
 
 
-#
+# Define how to clean an mpi-versioned library
-# define how to clean an mpi-versioned library
-#
 wcleanMpiLib()
 {
-    set +x
     for libName
     do
     (
@@ -28,11 +25,8 @@ wcleanMpiLib()
         wclean $libName
     )
     done
-    set -x
 }
 
-set -x
-
 if [ -n "$SCOTCH_ARCH_PATH" ]
 then
     wclean scotchDecomp
@@ -42,16 +36,11 @@ then
         wcleanMpiLib ptscotchDecomp
     fi
 else
-    echo
+    echo "    skipping scotchDecomp (ptscotchDecomp)"
-    echo "Skipping scotchDecomp (ptscotchDecomp)"
-    echo
 fi
 
-
 wclean metisDecomp
-
 wclean decompositionMethods
-
 wclean decompose
 
 #------------------------------------------------------------------------------

src/parallel/decompose/Allwmake

@@ -4,26 +4,24 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
+
+# Get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
 then
     . $settings
-    echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
+    echo "    using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
 else
     echo
-    echo "Error: no config.sh/scotch settings"
+    echo "    Error: no config.sh/scotch settings"
     echo
 fi
 
 
-#
+# Define how to create an mpi-versioned library of $targetType
-# define how to create an mpi-versioned library of $targetType
 # compile into qualified directory
 # use sentinel file to handle version changes
-#
 wmakeMpiLib()
 {
-    set +x
     for libName
     do
     (
@@ -36,11 +34,8 @@ wmakeMpiLib()
         touch "$whichmpi" "$whichscotch"
     )
     done
-    set -x
 }
 
-set -x
-
 wmakeLnInclude decompositionMethods
 
 if [ -n "$SCOTCH_ARCH_PATH" ]
@@ -52,18 +47,15 @@ then
         wmakeMpiLib ptscotchDecomp
     fi
 else
-    echo
+    echo "    skipping scotchDecomp (ptscotchDecomp)"
-    echo "Skipping scotchDecomp (ptscotchDecomp)"
-    echo
 fi
 
 
 # Try and build metisDecomp (has own logic)
 (cd metisDecomp && ./Allwmake $targetType)
 
-
 wmake $targetType decompositionMethods
-
 wmake $targetType decompose
 
+
 #------------------------------------------------------------------------------

src/parallel/decompose/AllwmakeLnInclude

@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-set -x
 
 wmakeLnInclude decompositionMethods
 wmakeLnInclude metisDecomp

src/parallel/decompose/metisDecomp/Allwmake

@@ -8,14 +8,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
 then
     . $settings
-    echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
+    echo "    using METIS_ARCH_PATH=$METIS_ARCH_PATH"
     if [ -r $METIS_ARCH_PATH/lib/libmetis.so ]
     then
         wmake $targetType
     fi
 else
     echo
-    echo "Error: no config.sh/metis settings"
+    echo "    Error: no config.sh/metis settings"
     echo
 fi
 

src/parallel/reconstruct/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType reconstruct
 

src/regionModels/Allwclean

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 makeType=${1:-libso}
-set -x
 
 wclean $makeType regionModel
 wclean $makeType pyrolysisModels
@@ -9,5 +8,4 @@ wclean $makeType surfaceFilmModels
 wclean $makeType thermalBaffleModels
 wclean $makeType regionCoupling
 
-
 #------------------------------------------------------------------------------

src/regionModels/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType regionModel
 wmake $targetType pyrolysisModels
@@ -12,5 +11,4 @@ wmake $targetType surfaceFilmModels/derivedFvPatchFields/wallFunctions
 wmake $targetType thermalBaffleModels
 wmake $targetType regionCoupling
 
-
 #------------------------------------------------------------------------------

src/renumber/Allwmake

@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-wmake $targetType renumberMethods
-
 # Deprecate SloanRenumber due to dependency on BOOST causing build and
 # installation problems on a range of legacy systems.
 # wmake $targetType SloanRenumber
@@ -14,9 +12,9 @@ if [ -n "$ZOLTAN_ARCH_PATH" ]
 then
     wmake $targetType zoltanRenumber
 else
-    echo
+    echo "    skipping zoltanRenumber"
-    echo "Skipping zoltanRenumber"
-    echo
 fi
 
+wmake $targetType renumberMethods
+
 #------------------------------------------------------------------------------

src/thermophysicalModels/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType specie
 wmake $targetType solidSpecie

src/thermophysicalModels/properties/Allwmake

@@ -3,12 +3,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType liquidProperties
 wmake $targetType liquidMixtureProperties
 wmake $targetType solidProperties
 wmake $targetType solidMixtureProperties
 
-
 #------------------------------------------------------------------------------

src/transportModels/Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
 wmake $targetType twoPhaseMixture
 wmake $targetType interfaceProperties

tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-set -x
-
 m4 < system/blockMeshDict.m4 > system/blockMeshDict
 blockMesh > log.blockMesh 2>&1
 

wmake/scripts/AllwmakeParseArguments

@@ -90,6 +90,14 @@ do
 done
 
 
+#------------------------------------------------------------------------------
+# Print command
+#------------------------------------------------------------------------------
+
+[ -z "$targetType" ] || targetSpace=" "
+echo "$Script $targetType$targetSpace$(echo $PWD | sed s%$WM_PROJECT_DIR/%% )"
+
+
 #------------------------------------------------------------------------------
 # Execute wmake -all if not called from wmake
 #------------------------------------------------------------------------------

wmake/wclean

@@ -122,8 +122,9 @@ then
         }
     fi
 
-    # Provide some feedback
+    # Print command
-    echo "$Script $targetType ${dir:-.}"
+    [ -z "$targetType" ] || targetSpace=" "
+    echo "$Script $targetType$targetSpace${dir:-.}"
 fi
 
 
@@ -164,7 +165,7 @@ then
 
         if [ -d $objectsDir ]
         then
-            echo "Removing redundant object directories in $objectsDir"
+            echo "    Removing redundant object directories in $objectsDir"
 
             find $objectsDir -name 'variables' -print | \
             while read variablesFile
@@ -253,7 +254,7 @@ unset targetType
 if [ -d $MakeDir ]
 then
     objectsDir=$MakeDir/$WM_OPTIONS
-    if echo $PWD | grep "$WM_PROJECT_DIR"
+    if [ $(echo $PWD | grep "$WM_PROJECT_DIR") ]
     then
         platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
         objectsDir=$platformPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )

wmake/wmake

@@ -268,6 +268,10 @@ then
             exit 1
         }
     fi
+
+    # Print command
+    [ -z "$targetType" ] || targetSpace=" "
+    echo "$Script $targetType$targetSpace${dir:-.}"
 fi
 
 
@@ -386,7 +390,7 @@ fi
 #------------------------------------------------------------------------------
 
 objectsDir=$MakeDir/$WM_OPTIONS
-if echo $PWD | grep "$WM_PROJECT_DIR"
+if [ $(echo $PWD | grep "$WM_PROJECT_DIR") ]
 then
     platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
     objectsDir=$platformPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )