X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=34809622994032afbdfbd7939361adb79e7fd095;hb=beb3ff5bfb0e042cf7233f85d45a3298a5e70028;hp=f164467e3ed59d6f20ea98ed85ad711a517746e9;hpb=b283a9b8bc0fbf21b56879c32a20acfdc3a79ca7;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index f164467..3480962 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#
+#           
 # The XWT Makefile
 #
 
@@ -31,17 +31,20 @@ all_platforms          := Win32 Linux Java2
 
 ## Platform-Neutral ###########################################################################
 
-.SILENT: new-release update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar
+ifneq ($(verbose),true)
+.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
+#silent := --silent
+endif
 
 compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
 $(jikes_java_objects): $(jikes_java_sources)
-	echo -ne " .java -> .class:\\r"
+	echo -ne "compiling  .java -> .class:\\r"
 	mkdir -p bin
 	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
-	echo " .java -> .class: done"
+	echo "compiling  .java -> .class: done"
 
 bin/org/xwt/builtin.xwar: $(xwar_sources)
 	mkdir -p bin/org/xwt
@@ -57,8 +60,11 @@ update-build:
 	mv next.build- next.build
 	echo -n "Next build will be "
 	cat next.build
+	cvs update CHANGES
+	echo "" >> CHANGES
+	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo committing...
-	cvs commit -m 'updated next.build' next.build
+	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	echo committed.
 
 
@@ -71,31 +77,32 @@ $(shell pwd)/gcc/bin/$(target)-gcj:
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
 link: $(gcj_java_objects) $(cc_objects)
+	echo "linking       .o -> $(target_bin)"
 	$(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
 	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
 
 .headers: $(jikes_java_objects)
 	cd bin; for A in `find * -name \*.class`; do \
-		echo -ne "\033[K\\r.class -> .h:     $$A\\r"; \
+		echo -ne "\033[K\\rextracting .class -> .h:     $$A\\r"; \
 		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
 		done
-	echo -e "\033[K\\r.class -> .h:     done"
+	echo -e "\033[K\\rextracting .class -> .h:     done"
 	touch .headers
 
 # turn off optimization of Trap.java due to a compiler bug
 bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
 
 $(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects)
-	echo -ne "\033[K\\r .java -> .o:     $<\\r"
+	echo -ne "\033[K\\rcompiling  .java -> .o:     $<\\r"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "\033[K\\r   .cc -> .o:     $$A\\r"
+	echo -ne "\033[K\\rcompiling  .cc -> .o:     $$A\\r"
 	$(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-	echo "bundling         -> .xwar"
+	echo "archiving   .xwt -> .xwar"
 	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
 
 
@@ -121,12 +128,15 @@ Win32:
 		platform_java_sources=src/org/xwt/plat/Win32.java
 
 Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
-	mkdir -p bin-Java12
+	echo -e "\\n=== Java2 ========================================="
+	echo "archiving .class -> .jar"
+	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd bin; fastjar cvf ../bin-Java12/xwt.jar -m .manifest \
+	cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .manifest \
                 org/xwt/builtin.xwar \
 		`find . -name \*.class | grep -v org/xwt/plat/` \
-		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
+		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
+	echo
 
 $(java2_objects:bin/%=%)
 
@@ -139,31 +149,49 @@ PalmOS:
 
 current_build         := $(shell cat next.build)
 
-new-release:
-	test `uname -n` = gosset.megacz.com || \
-		(echo -e "um, new-release is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
+dist:
+	# 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 new-release-private &> .make-new-release.out) || \
-		(cat .make-new-release.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-	cat .make-new-release.out | \
-		mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org
+	(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
 
-new-release-private:
 	# preserve gcc across builds so we don't have to remake it
 	mv gcc/Makefile Makefile.gcc
-	mkdir -p ~/dist.xwt.org-gcc
+	mkdir -p $(HOME)/dist.xwt.org-gcc
 	rm -rf gcc
-	ln -s ~/dist.xwt.org-gcc gcc
+	ln -s $(HOME)/dist.xwt.org-gcc gcc
 	mv Makefile.gcc gcc/Makefile
 
 	# build it
 	nice -n 19 make all
 
+	echo
+	echo === dist.xwt.org ==================================
+
+	echo "copying xwt.jar to distribution area..."
 	cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
+
+	echo "copying xwt.exe to distribution area..."
 	cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
+
+	echo "copying xwt.linux to distribution area..."
 	cp bin-Linux/xwt.linux /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
 
+	echo
+	echo "*** DONE ******************************************"