2003/03/14 05:24:55

darcs-hash:20040130065644-2ba56-091c9ef27ef373261b3d62c62beaae6158648f79.gz

diff --git a/Makefile b/Makefile
index 25cc0ed..d0454b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,13 @@
 ## Configurables ###########################################################################
 
 # inputs
-jikes_java_sources     := $(shell find src -name *.java)
+javac_java_sources     := $(shell find src -name *.java)
 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
-jikes_java_objects     := $(jikes_java_sources:src/%.java=bin/%.class)
+javac_java_objects     := $(javac_java_sources:src/%.java=bin/%.class)
 cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
 gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
 
@@ -25,35 +25,54 @@ 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
 all_platforms          := Win32 Linux Java2
 
+# path
+PATH                   := jikes-1.18/bin:$(PATH)
+
 
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath
+.SILENT: $(javac_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
 silent := --silent
 endif
 
-compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+compile: $(javac_java_objects) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
-.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
+.javac:
+       if \
+               type jikes && (jikes --version | grep "Version 1.18"); \
+       then \
+               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.*; \
+               echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+               cat .bootclasspath >> .javac; \
+       else \
+               echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
+               echo javac > .javac; \
+       fi \
+
+jikes:
+       wget ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 -O jikes-1.18.tar.bz2
+       bunzip2 jikes-1.18.tar.bz2
+       tar xvf jikes-1.18.tar && rm jikes-1.18.tar
+       cd jikes-1.18; ./configure --prefix=`pwd`
+       cd jikes; make && make install
+       ln -s jikes-1.18/bin/jikes .jikes
+
+$(javac_java_objects): $(javac_java_sources) .javac
        test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
        echo "compiling  .java -> .class:"
        mkdir -p bin
-       $(jikes) -bootclasspath $(shell cat .bootclasspath) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
+       $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(javac_java_sources) -d bin/
        echo "compiling  .java -> .class: done"
 
 bin/org/xwt/builtin.xwar: $(xwar_sources)
@@ -92,7 +111,7 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
        $(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)
+.headers: $(javac_java_objects)
        cd bin; for A in `find * -name \*.class`; do \
                echo "extracting .class -> .h:     $$A"; \
                $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
@@ -103,7 +122,7 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 # 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)
+$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
        echo -ne "compiling  .java -> .o:     $<"
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
@@ -138,7 +157,7 @@ Win32:
                platform_link="-Wl,--subsystem,windows -lcomdlg32" \
                platform_java_sources=src/org/xwt/plat/Win32.java
 
-Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
        echo -e "\\n=== Java2 ========================================="
        echo "archiving .class -> .jar"
        mkdir -p bin-Java2