2003/03/13 02:03:06

darcs-hash:20040130065638-2ba56-71f11875224bc027327b777cc678b300e4c0797f.gz

diff --git a/Makefile b/Makefile
index 852955c..25cc0ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
-jikes                  := jikes -bootclasspath /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/classes.jar -extdirs ${JAVA_HOME}/jre/lib -nowarn
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
 all_platforms          := Win32 Linux Java2
@@ -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)
+.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
@@ -135,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
@@ -151,6 +159,7 @@ PalmOS:
 ## 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.
@@ -167,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 $(current_build) \
+               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
                        | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif