ENH: provide log option for top-level builds (issue #333)

This commit is contained in:
Mark Olesen
2016-12-09 14:44:26 +00:00
parent 27ae7d5b00
commit eb00c8021d

View File

@ -46,6 +46,10 @@ Usage: $Script [OPTIONS]
Executing $Script is equivalent to Executing $Script is equivalent to
wmake -all [OPTIONS] wmake -all [OPTIONS]
With these additional options:
-l | -log
USAGE USAGE
wmake -help wmake -help
@ -57,8 +61,7 @@ USAGE
# Parse the arguments and options # Parse the arguments and options
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
fromWmake= unset fromWmake optLog optQueue
qOpt=
for arg in "$@" for arg in "$@"
do do
@ -70,17 +73,20 @@ do
usage usage
exit 0 exit 0
;; ;;
# Check if called from wmake to avoid recusion
-fromWmake) -fromWmake)
fromWmake="fromWmake" # If called from wmake (to avoid recursion)
fromWmake=true
;; ;;
-q) -l | -log)
qOpt="-q" optLog=true
# Permanently remove arg continue # Permanently remove arg
continue ;;
-q | -queue)
optQueue="-q"
continue # Permanently remove arg
;; ;;
# Target type
lib | libo | libso | dep | objects) lib | libo | libso | dep | objects)
# Target type
targetType=$arg targetType=$arg
;; ;;
esac esac
@ -96,7 +102,13 @@ done
if [ -z "$fromWmake" ] if [ -z "$fromWmake" ]
then then
exec wmake -all $qOpt $* if [ -z "$optLog" ]
then
exec wmake -all $optQueue $*
else
echo "logging wmake -all output to 'log.Allwmake'" 1>&2
exec wmake -all $optQueue $* 2>&1 | tee log.Allwmake
fi
fi fi
@ -114,7 +126,8 @@ fi
# Cleanup local variables and functions # Cleanup local variables and functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
unset Script usage fromWmake unset Script fromWmake optLog optQueue
unset -f usage
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------