X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6bcc599be688b8bd6289fea6623000f592be77bd;hb=3948d2b537117e75c4ee1927f2d70e21a83a1717;hp=d8afc98420124d9ccf26c044ca617edacccd8262;hpb=aefc12ca6c6dc286f89501abac9b27c6c49b2e05;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index d8afc98..6bcc599 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # inputs
 jikes_java_sources     := $(shell find src -name *.java)
 gcj_java_sources       := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources           := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 
 # outputs
@@ -23,6 +23,7 @@ gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags
 gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
+strip                  := $(gcc_path)/$(target)/bin/strip
 jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
@@ -77,7 +78,7 @@ $(shell pwd)/gcc/bin/$(target)-gcj:
 
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-link: $(gcj_java_objects) $(cc_objects)
+link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 	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
@@ -102,8 +103,8 @@ $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
 	echo -ne "compiling  .cc -> .o:     $$A"
 	$(gcc) -Ibin -c $< -o $@
 
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-	echo "archiving   .xwt -> .xwar"
+bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
+	echo "wrapping   .xwar -> .o"
 	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
 
 
@@ -146,29 +147,28 @@ PalmOS:
 	false
 
 
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
 
 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 '' > /dev/null
+	cvs commit -m '' > /dev/null
 
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
 
-	(test `uname -n` = gosset.megacz.com) || \
+        ifeq ($(shell uname -n),gosset.megacz.com)
+		(make $(silent) dist-private 2>&1) >> .make-dist.out || \
+			(tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
+		tail -n 200 .make-dist.out | \
+			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
+        else
 		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
 			| grep -v "make...:.\(Entering\|Leaving\).directory"
+        endif
 
-	(test `uname -n` = gosset.megacz.com) && \
-		(((make $(silent) dist-private 2>&1) >> .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
@@ -184,16 +184,16 @@ dist-private:
 	nice -n 19 make all
 
 	echo
-	echo === dist.xwt.org ==================================
+	echo === master.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
+	cp bin-Java2/xwt.jar /var/www/master.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 "stripping xwt.exe and copying it to the distribution area..."
+	$(strip) bin-Win32/xwt.exe -o /var/www/master.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
+	$(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
 
 	echo
 	echo "*** DONE ******************************************"