2003/02/25 22:09:41

darcs-hash:20040130065302-2ba56-01864f7b98e6bf77de0f4eb968f4a0ea65d3a8e5.gz

diff --git a/Makefile b/Makefile
index a433bcd..1c257d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ar                     := $(gcc_path)/$(target)/bin/ar
 jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
-all_platforms          := Win32 Linux Java
+all_platforms          := Win32 Linux Java2
 
 
 ## Platform-Neutral ###########################################################################
@@ -48,7 +48,7 @@ bin/org/xwt/builtin.xwar: $(xwar_sources)
        cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
 
 clean:
-       rm -rf bin-*
+       rm -rf bin-* bin
        find . -name \*~ | xargs rm -f
        find . -name \#\*\# | xargs rm -f
 
@@ -111,7 +111,15 @@ Win32:
                platform_link="-Wl,--subsystem,windows -lcomdlg32" \
                platform_java_sources=src/org/xwt/plat/Win32.java
 
-Java: compile
+Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+       mkdir -p bin-Java12
+       echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
+       cd bin; fastjar cvf ../bin-Java12/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
+
+$(java2_objects:bin/%=%)
 
 PalmOS:
        echo "PalmOS is not yet supported"

diff --git a/README b/README
index c7821a8..3ead8bd 100644 (file)
--- a/README
+++ b/README
@@ -72,7 +72,7 @@ Public build targets:
     compile       - compiles all .java files into bin/*.class
     Win32         - Win95 or later (bin-Win32/xwt.exe)
     Linux         - Linux 2.2 or later (bin-Linux/xwt.linux)
-    Java          - Any Java 1.1+ compliant JVM
+    Java2         - Any Java 1.2+ compliant JVM
     clean         - cleanup
 
 

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 43d043c..1b6056a 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -63,8 +63,7 @@ public class Platform {
                 else platform_class = "X11";
             } else if (version.startsWith("1.1") && vendor.startsWith("Netscape")) platform_class = "Netscape";
             else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
-            else if (version.startsWith("1.4")) platform_class = "Java14";
-            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12";
+            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
 
         // Disable 2d hardware acceleration on Jaguar
         if (os_name.equals("Mac OS X") && os_version.equals("10.2"))