diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2011-03-14 22:08:07.000000000 +0000
+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2011-04-22 00:44:23.902652962 +0100
@@ -131,26 +131,14 @@
CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
JAVACFLAGS += $(CLASS_VERSION)
JAVACFLAGS += -encoding ascii
-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
+JAVACFLAGS += -classpath $(BOOTDIR)/lib/rt.jar
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Langtools
-ifdef LANGTOOLS_DIST
- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
- JAVAC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAC_JAR)" \
- -jar $(JAVAC_JAR) $(JAVACFLAGS)
- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
- -jar $(JAVADOC_JAR)
-else
- # If no explicit tools, use boot tools (add VM flags in this case)
- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
-endif
+# If no explicit tools, use boot tools (add VM flags in this case)
+JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ $(JAVACFLAGS)
+JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
# Override of what javac to use (see deploy workspace)
ifdef JAVAC
diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2011-04-21 23:24:38.000000000 +0100
+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2011-04-22 00:45:22.723492812 +0100
@@ -147,7 +147,7 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
-JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCEFLAGS)"
+JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCEFLAGS):$(ICEDTEA_RT):$(CLASSDESTDIR)"
# Needed for javadoc to ensure it builds documentation
# against the newly built classes
@@ -158,27 +158,15 @@
# Langtools
ifdef LANGTOOLS_DIST
- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
- JAVAC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAC_JAR)" \
- -jar $(JAVAC_JAR) $(JAVACFLAGS)
- JAVAH_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
JAVADOC_CMD = $(BOOT_JAVA_CMD) \
"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-jar $(JAVADOC_JAR) $(JAVADOCFLAGS)
-else
- # If no explicit tools, use boot tools (add VM flags in this case)
JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
$(JAVACFLAGS)
JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
$(JAVAHFLAGS)
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
- $(JAVADOCFLAGS)
endif
# Override of what javac to use (see deploy workspace)
diff -Nru openjdk-boot.orig/jdk/make/java/text/base/Makefile openjdk-boot/jdk/make/java/text/base/Makefile
--- openjdk-boot.orig/jdk/make/java/text/base/Makefile 2011-04-20 04:40:20.000000000 +0100
+++ openjdk-boot/jdk/make/java/text/base/Makefile 2011-04-22 00:44:23.918653190 +0100
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
$(MKDIR) -p $(TEXT_CLASSDIR)
- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
+ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ABS_OUTPUTDIR)/classes \
+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
-o $(TEXT_CLASSDIR) \
-spec $(UNICODEDATA)/UnicodeData.txt
@$(java-vm-cleanup)
diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
--- openjdk-boot.orig/jdk/make/sun/text/Makefile 2011-04-20 04:40:21.000000000 +0100
+++ openjdk-boot/jdk/make/sun/text/Makefile 2011-04-22 00:44:23.918653190 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
$(BIRULES) $(BIINFO)
- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
+ $(BOOT_JAVA_CMD) \
+ -cp $(TEXT_CLASSES):$(ABS_OUTPUTDIR)/classes:$(GENERATEBREAKITERATORDATA_JARFILE) \
+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
-o $(CLASSDESTDIR)/sun/text/resources \
-spec $(UNICODEDATA)/UnicodeData.txt \
-language th
diff -r 8e26c4aee63c make/build.xml
--- openjdk-boot/langtools/make/build.xml Wed Apr 20 04:37:56 2011 +0100
+++ openjdk-boot/langtools/make/build.xml Tue Apr 26 10:38:14 2011 +0100
@@ -868,10 +868,8 @@
executable="${boot.java.home}/bin/javac"
srcdir="${make.tools.dir}/GenStubs"
destdir="${build.toolclasses.dir}/"
- classpath="${ant.core.lib}"
- includeantruntime="false">
- <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
- </javac>
+ classpath="${build.bootstrap.dir}/classes:${ant.core.lib}"
+ includeantruntime="false"/>
<taskdef name="genstubs"
classname="GenStubs$$Ant"
classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>