X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=25cc0ed29e3b5a78143e14e3dce16a72e945d848;hb=7c813d580712473e9b663fd0858cd72ef8258a3b;hp=ad4544107c6a694dc9497d067ce5184cdf167d5f;hpb=5d21679728c5f98163696094cc2c73308d743a3c;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index ad45441..25cc0ed 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@
 
 # 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)
+gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+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
@@ -21,9 +21,10 @@ gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-siblin
 gcj_flags              := -fCLASSPATH=bin 
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
+gcjh                   := $(gcc_path)/bin/gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
@@ -33,7 +34,7 @@ all_platforms          := Win32 Linux Java2
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
+.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath
 silent := --silent
 endif
 
@@ -41,16 +42,23 @@ compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
-$(jikes_java_objects): $(jikes_java_sources)
-	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false)
+.bootclasspath:
+	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
+	echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java
+	javac GetBootClassPath.java
+	java -cp . GetBootClassPath > .bootclasspath
+	rm GetBootClassPath.*
+
+$(jikes_java_objects): $(jikes_java_sources) .bootclasspath
+	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
 	echo "compiling  .java -> .class:"
 	mkdir -p bin
-	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
+	$(jikes) -bootclasspath $(shell cat .bootclasspath) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
 	echo "compiling  .java -> .class: done"
 
 bin/org/xwt/builtin.xwar: $(xwar_sources)
 	mkdir -p bin/org/xwt
-	cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+	cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
 
 clean:
 	rm -rf bin-* bin
@@ -58,6 +66,7 @@ clean:
 	find . -name \#\*\# | xargs rm -f
 
 update-build:
+	cvs tag -F xwt-$(current_build)
 	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
 	mv next.build- next.build
 	echo -n "Next build will be "
@@ -78,7 +87,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
@@ -103,8 +112,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 $@
 
 
@@ -134,7 +143,7 @@ Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 	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-Java2/xwt.jar -m .manifest \
+	cd bin; $(jar) 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 | tr \\012 \\015
@@ -147,13 +156,15 @@ PalmOS:
 	false
 
 
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
 
 current_build         := $(shell cat next.build)
+this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
 
 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
+	cvs tag -F xwt-$(current_build)
 
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
@@ -165,7 +176,7 @@ dist:
 		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 \
+		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
 			| grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
@@ -184,16 +195,21 @@ 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 "stripping xwt.exe and copying it to the distribution area..."
-	$(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
+	$(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
 	echo "copying xwt.linux to distribution area..."
-	$(strip) bin-Linux/xwt.linux -o /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 "creating source tarball in distribution area..."
+	CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
+	mv xwt xwt-$(current_build)
+	tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
 
 	echo
 	echo "*** DONE ******************************************"