2003/02/27 09:52:14

darcs-hash:20040130065516-2ba56-7b17b875b25b5daf88cf20bbd238ee283864f291.gz

diff --git a/Makefile b/Makefile
index ba1c4e0..d3916b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,26 +149,28 @@ PalmOS:
 
 current_build         := $(shell cat next.build)
 
-nohup-dist:
-       rm .make-dist.out
-       touch .make-dist.out
-       nice -n 19 nohup make dist & \
-               tail -f .make-dist.out | grep -v "make...:.\(Entering\|Leaving\).directory"
-
 dist:
-       test `uname -n` = gosset.megacz.com || \
-               (echo -e "um, dist is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
+       # this will fail if we haven't checked-in since the comment is null; we want this.
+       cvs commit -m ''
+
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
-       make $(silent) update-build
-       (make $(silent) dist-private &> .make-dist.out) || \
-               (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-       cat .make-dist.out | \
-               mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org < /dev/null
+       test `uname -n` = gosset.megacz.com || \
+               ssh xwt@xwt.org /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)
+
+       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
 
 dist-private:
+       make $(silent) update-build
+
        # preserve gcc across builds so we don't have to remake it
        mv gcc/Makefile Makefile.gcc
        mkdir -p $(HOME)/dist.xwt.org-gcc