zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
'set -x' should be used for debugging.

Added command printing into wmake and Allwmake as a replacement for
'set -x' to log current target.
This commit is contained in:
Henry Weller
2016-11-13 18:08:22 +00:00
parent 1d6637a81b
commit 48e3fb7805
80 changed files with 42 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wmake/scripts/AllwmakeParseArguments
View File

@ -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
#------------------------------------------------------------------------------

9
wmake/wclean
View File

@ -122,8 +122,9 @@ then
}
fi
# Provide some feedback
echo "$Script $targetType ${dir:-.}"
# Print command
[ -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%% )

6
wmake/wmake
View File

@ -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%% )