X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d8c83dc28cbbbcbf2c66f644f003813d465f248c;hb=89ad4bf2952bb0ffd41100fd07ed97813ee1abc4;hp=8540ad7deface1c191a43d213a83f0d598ccfcc6;hpb=a637f4a40ed43ad5d3bc9f66a74a5d6eb9038f6b;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 8540ad7..d8c83dc 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ all_platforms := Win32 Linux Java2 ## Platform-Neutral ########################################################################### ifneq ($(verbose),true) -.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar nohup-dist +.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar silent := --silent endif @@ -151,22 +151,23 @@ current_build := $(shell cat next.build) dist: # this will fail if we haven't checked-in since the comment is null; we want this. - cvs commit -m '' +# cvs commit -m '' > /dev/null echo "***********************************************************" echo "* This build is $(current_build)" echo "***********************************************************" (test `uname -n` = gosset.megacz.com) || \ - ssh xwt@xwt.org /home/xwt/dist | grep -v "make...:.\(Entering\|Leaving\).directory" + ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \ + | grep -v "make...:.\(Entering\|Leaving\).directory" (test `uname -n` = gosset.megacz.com) && \ - make $(silent) dist-private &> .make-dist.out || \ - (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false) + (make $(silent) dist-private 2>> .make-dist.out >> .make-dist.out || \ + (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)) (test `uname -n` = gosset.megacz.com) && \ - cat .make-dist.out | \ - mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null + (cat .make-dist.out | \ + mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null) dist-private: make $(silent) update-build