X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d8c83dc28cbbbcbf2c66f644f003813d465f248c;hb=6532b1b92b7402d4dd563e6e0c5940d5f3ba6ee9;hp=f2ce8d71f87b4306ac3834daef2aff0c2f34b899;hpb=9a3b3d2580c18a1ddfc242987b7178d9e841bc14;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index f2ce8d7..d8c83dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#
+#           
 # The XWT 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
 
@@ -61,8 +61,8 @@ update-build:
 	echo -n "Next build will be "
 	cat next.build
 	cvs update CHANGES
-	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo "" >> CHANGES
+	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo committing...
 	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	echo committed.
@@ -149,26 +149,29 @@ 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 '' > /dev/null
+
 	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 verbose=$(verbose) /home/xwt/dist \
+			| grep -v "make...:.\(Entering\|Leaving\).directory"
+
+	(test `uname -n` = gosset.megacz.com) && \
+		(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)
 
 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