Mercurial > hg > release > icedtea6-1.8
changeset 1138:be559c26fdbc
Ensure Java class files have debug information.
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* HACKING: Add new patch.
* Makefile.am: Compile PulseAudio Java
files with debugging information.
* patches/icedtea-ecj.patch: Regenerated.
* patches/icedtea-javac-debuginfo.patch:
Ensure JAXWS, JAXP, CORBA and the language
tools include debugging information.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 20 Oct 2008 19:30:04 +0100 |
| parents | 2b6b9ce244bc |
| children | 5fabd5969958 |
| files | ChangeLog HACKING Makefile.am patches/icedtea-ecj.patch patches/icedtea-javac-debuginfo.patch |
| diffstat | 5 files changed, 908 insertions(+), 765 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 20 12:47:37 2008 -0400 +++ b/ChangeLog Mon Oct 20 19:30:04 2008 +0100 @@ -1,3 +1,13 @@ +2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * HACKING: Add new patch. + * Makefile.am: Compile PulseAudio Java + files with debugging information. + * patches/icedtea-ecj.patch: Regenerated. + * patches/icedtea-javac-debuginfo.patch: + Ensure JAXWS, JAXP, CORBA and the language + tools include debugging information. + 2008-10-20 Lillian Angel <langel@redhat.com> * Makefile.am
--- a/HACKING Mon Oct 20 12:47:37 2008 -0400 +++ b/HACKING Mon Oct 20 19:30:04 2008 +0100 @@ -29,6 +29,7 @@ * icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name. * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) * icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. +* icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. * icedtea-javafiles.patch: Add missing Java files to list. * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. * icedtea-lcms-leak.patch: Fix LCMS memory leak.
--- a/Makefile.am Mon Oct 20 12:47:37 2008 -0400 +++ b/Makefile.am Mon Oct 20 19:30:04 2008 +0100 @@ -530,7 +530,8 @@ patches/icedtea-6open-6616825.patch \ patches/icedtea-6open-6651382.patch \ patches/icedtea-6open-6756202.patch \ - $(VISUALVM_PATCH) + $(VISUALVM_PATCH) \ + patches/icedtea-javac-debuginfo.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -1478,14 +1479,14 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ (cd $(PULSE_JAVA_JAVA_SRCDIR); \ - $(JAVAC) -d $(PULSE_JAVA_CLASS_DIR) \ + $(JAVAC) -g -d $(PULSE_JAVA_CLASS_DIR) \ -bootclasspath \ '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ org/classpath/icedtea/pulseaudio/*.java\ ) \ else \ (cd $(PULSE_JAVA_JAVA_SRCDIR); \ - $(ICEDTEA_BOOT_DIR)/bin/javac -d $(PULSE_JAVA_CLASS_DIR)\ + $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\ -bootclasspath \ '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \ org/classpath/icedtea/pulseaudio/*.java\
--- a/patches/icedtea-ecj.patch Mon Oct 20 12:47:37 2008 -0400 +++ b/patches/icedtea-ecj.patch Mon Oct 20 19:30:04 2008 +0100 @@ -1,271 +1,18 @@ ---- openjdk.old/hotspot/build/linux/Makefile 2007-10-12 03:46:24.000000000 -0400 -+++ openjdk-ecj/hotspot/build/linux/Makefile 2007-10-19 10:27:52.000000000 -0400 -@@ -244,28 +244,24 @@ - - $(TARGETS_C2): $(SUBDIRS_C2) - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_TIERED): $(SUBDIRS_TIERED) - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_C1): $(SUBDIRS_C1) - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install +diff -Nru openjdk-ecj.orig/control/make/make/jdk-rules.gmk openjdk-ecj/control/make/make/jdk-rules.gmk +--- openjdk-ecj.orig/control/make/make/jdk-rules.gmk 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/control/make/make/jdk-rules.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -58,7 +58,7 @@ endif - $(TARGETS_CORE): $(SUBDIRS_CORE) - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + ifndef DEV_ONLY +- JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images ++ JDK_BUILD_TARGETS = sanity all images + else + JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET) endif ---- openjdk.old/jdk/make/common/BuildToolJar.gmk 2007-10-12 03:54:05.000000000 -0400 -+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2007-10-19 10:51:47.000000000 -0400 -@@ -43,7 +43,8 @@ - @$(prep-target) - @$(MKDIR) -p $(BUILDTOOLCLASSDIR) - $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \ -- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE) -+ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \ -+ $(BUILDTOOL_MAIN_SOURCE_FILE) - $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \ - -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ - $(JAR_JFLAGS) || $(RM) $@ ---- iopenjdk.old/jdk/make/Makefile 2007-10-12 03:54:03.000000000 -0400 -+++ openjdk-ecj/jdk/make/Makefile 2007-10-19 13:10:02.000000000 -0400 -@@ -239,7 +239,7 @@ - - all build:: sanity-all post-sanity-all - --SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers -+SUBDIRS = tools java javax org sun sunw com jpda mksample launchers - all build:: - $(SUBDIRS-loop) - ---- openjdk.old/corba/make/org/omg/sources/Makefile 2007-10-12 03:49:14.000000000 -0400 -+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2007-10-30 11:57:03.000000000 -0400 -@@ -93,8 +93,6 @@ - POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) - - $(POAGENERATEDFILES):: $(POA.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL) -- $(RM) -r $(POAHELHOLFILES) - - poa.compile: $(POAGENERATEDFILES) - -@@ -110,10 +108,6 @@ - - # Generating and deleting unused files to reduce images size - $(DYNANYFILES): $(DYNAMIC_ANY.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL) -- $(RM) $(DYNANY_DIR)/*POA* -- $(RM) $(DYNANY_DIR)/*Holder* -- $(RM) $(DYNANYDELETEFILES) - - dynany.compile: $(DYNANYFILES) - -@@ -125,12 +119,6 @@ - TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions" - - $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL) --# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) --# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) --# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) --# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) - - tr.compile: $(TRGENERATEDFILES) - -@@ -144,7 +132,6 @@ - # _NamingContextImplBase.java and _BindingIteratorImplBase.java files - # to GENSRC directory. Note that these two classes are deprecated. - $(NSGENERATEDFILES): $(NAMESERVICE.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL) - - ns.compile: $(NSGENERATEDFILES) - -@@ -156,8 +143,6 @@ - IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%) - - $(IOPGENERATEDFILES):: $(IOP.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL) -- $(RM) -r $(IOPDELETEFILES) - - iop.compile: $(IOPGENERATEDFILES) - -@@ -169,8 +154,6 @@ - CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%) - - $(CORBAXGENERATEDFILES):: $(CORBAX.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL) -- $(RM) $(CORBAXDUPLICATEFILES) - - corbax.compile: $(CORBAXGENERATEDFILES) - -@@ -181,7 +164,6 @@ - MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%) - - $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL) - - messaging.compile: $(MESSAGINGGENERATEDFILES) - -@@ -195,8 +177,6 @@ - PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) - - $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL) -- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL) -- $(RM) $(PIHELHOLFILES) - - pi.compile: $(PIGENERATEDFILES) - ---- openjdk.old/corba/make/sun/rmi/corbalogsources/Makefile 2007-10-12 03:49:14.000000000 -0400 -+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2007-10-30 11:57:25.000000000 -0400 -@@ -173,7 +173,6 @@ - ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) - - $(ACTIVATIONFILES): $(ACTIVATION.IDL) -- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) - - activation.idl.compile: $(ACTIVATIONFILES) - -@@ -196,7 +195,6 @@ - - # REVISIT: remove -oldImplBase - $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) -- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) - - portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) - ---- openjdk.old/jdk/make/sun/javazic/Makefile 2007-10-12 03:54:08.000000000 -0400 -+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2007-10-30 14:32:25.000000000 -0400 -@@ -62,7 +62,8 @@ - $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) - $(RM) -r $(@D) - $(prep-target) -- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) -+ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \ -+ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) - @$(java-vm-cleanup) - - $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) ---- openjdk.old/jdk/make/sun/awt/Makefile 2007-10-30 15:27:06.000000000 -0400 -+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2007-10-30 15:30:02.000000000 -0400 -@@ -400,10 +400,9 @@ - COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar - - $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ -- $(COMPILEFONTCONFIG_JARFILE) -- $(prep-target) -- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@ -- $(CHMOD) 444 $(@) -+ $(COMPILEFONTCONFIG_JARFILE) -+ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR) -+ $(CHMOD) 444 $(LIBDIR)/*.bfc - @$(java-vm-cleanup) - - fontconfigs.clean : ---- openjdk.old/jdk/make/sun/text/Makefile 2007-10-12 03:54:08.000000000 -0400 -+++ openjdk-ecj/jdk/make/sun/text/Makefile 2007-10-30 15:32:46.000000000 -0400 -@@ -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):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \ -+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ - -o $(CLASSDESTDIR)/sun/text/resources \ - -spec $(UNICODEDATA)/UnicodeData.txt \ - -language th ---- openjdk.old/jdk/make/java/text/Makefile 2007-10-12 03:54:05.000000000 -0400 -+++ openjdk-ecj/jdk/make/java/text/Makefile 2007-10-30 14:26:53.000000000 -0400 -@@ -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):$(ICEDTEA_CLS_DIR) \ -+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ - -o $(TEXT_CLASSDIR) \ - -spec $(UNICODEDATA)/UnicodeData.txt - @$(java-vm-cleanup) ---- openjdk.old/jdk/make/java/nio/Makefile 2007-10-12 03:54:05.000000000 -0400 -+++ openjdk-ecj/jdk/make/java/nio/Makefile 2007-10-31 16:55:26.000000000 -0400 -@@ -31,7 +31,7 @@ - PACKAGE = java.nio - LIBRARY = nio - PRODUCT = java --OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xlint:serial -Werror - include $(BUILDDIR)/common/Defs.gmk - - NIO_SRC = $(SHARE_SRC)/classes/java/nio ---- openjdk.old/corba/make/common/Rules.gmk 2007-10-12 03:49:14.000000000 -0400 -+++ openjdk-ecj/corba/make/common/Rules.gmk 2007-11-01 11:31:47.000000000 -0400 -@@ -197,8 +197,10 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ - $(CAT) $(JAVA_SOURCE_LIST); \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ -+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ -+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - fi - @$(java-vm-cleanup) - ---- openjdk.old/corba/make/common/Defs.gmk 2007-10-12 03:49:14.000000000 -0400 -+++ openjdk-ecj/corba/make/common/Defs.gmk 2007-11-01 12:24:59.000000000 -0400 -@@ -53,6 +53,13 @@ - - _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) - -+ -+ifdef ALT_LANGTOOLS_DIST -+ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST)) -+else -+ LANGTOOLS_DIST = -+endif -+ - # - # Get platform definitions - # -@@ -129,8 +136,6 @@ - # for build tool jar files - BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars - ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars --# for generated java source files --GENSRCDIR = $(OUTPUTDIR)/gensrc - # for generated C source files (not javah) - GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc - # for imported source files -@@ -231,7 +236,7 @@ - # We define an intermediate variable for Java files because - # we use its value later to help define $SOURCEPATH - --VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes -+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes - VPATH.java = $(VPATH0.java) - vpath %.java $(VPATH.java) - vpath %.class $(CLASSBINDIR) -diff -ruN openjdk.old/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile ---- openjdk.old/corba/make/com/sun/corba/se/Makefile 2007-10-12 03:49:13.000000000 -0400 -+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2007-11-06 15:07:45.000000000 -0500 +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-08-28 09:24:03.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-20 18:50:20.000000000 +0100 @@ -42,7 +42,7 @@ # the rmic iiop backend needs some classes that are part of the impl/util # package. These classes use log wrappers, so they must be built after @@ -275,9 +22,9 @@ all build clean clobber:: $(SUBDIRS-loop) -diff -ruN openjdk.old/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile ---- openjdk.old/corba/make/com/sun/corba/se/org/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2007-11-06 15:07:20.000000000 -0500 +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-10-20 18:50:20.000000000 +0100 @@ -0,0 +1,38 @@ +# +# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. @@ -317,499 +64,9 @@ +# Include +# +include $(BUILDDIR)/common/Classes.gmk ---- iopenjdk/jdk/make/common/Rules.gmk 2007-10-12 03:54:05.000000000 -0400 -+++ openjdk-ecj/jdk/make/common/Rules.gmk 2007-11-07 11:02:53.000000000 -0500 -@@ -235,8 +235,9 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ - $(CAT) $(JAVA_SOURCE_LIST); \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ -+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - fi - @$(java-vm-cleanup) - -@@ -302,6 +303,8 @@ - $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ - $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) - @$(java-vm-cleanup) -+ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \ -+ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h - @$(TOUCH) $@ - - classheaders.clean: -diff -ru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties ---- openjdk-ecj.orig/langtools/make/build.properties 2007-10-12 08:47:30.000000000 +0100 -+++ openjdk-ecj/langtools/make/build.properties 2007-11-09 10:25:54.000000000 +0000 -@@ -66,7 +66,7 @@ - # set the following to -version to verify the versions of javac being used - javac.version.opt = - # in time, there should be no exceptions to -Xlint:all --javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror -+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial - - # options for the <javadoc> task for javac - javadoc.jls3.url=http://java.sun.com/docs/books/jls/ ---- openjdk.old/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2007-10-12 03:54:09.000000000 -0400 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2007-11-13 10:29:46.000000000 -0500 -@@ -647,9 +647,6 @@ - throws FileNotFoundException, IOException { - BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); - PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName))); -- out.println(commentStart + -- " This file was generated AUTOMATICALLY from a template file " + -- new java.util.Date() + commentEnd); - int marklen = commandMarker.length(); - LOOP: while(true) { - try { -@@ -876,7 +873,6 @@ - // liu : Add a comment showing the source of this table - result.append(commentStart + " The following tables and code generated using:" + - commentEnd + "\n "); -- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n "); - - if (plane == 0 && bLatin1 == false) { - genCaseMapTableDeclaration(result); ---- openjdk.old/jaxws/make/build.properties 2007-10-12 03:52:21.000000000 -0400 -+++ openjdk-ecj/jaxws/make/build.properties 2007-11-12 14:34:54.000000000 -0500 -@@ -37,7 +37,7 @@ - # set the following to -version to verify the versions of javac being used - javac.version.opt = - # in time, there should be no exceptions to -Xlint:all --javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror -+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial - - # JVM memory size - javac.memoryInitialSize = 128m ---- oipenjdk/make/jdk-rules.gmk 2007-10-30 04:00:10.000000000 -0400 -+++ openjdk-ecj/control/make/make/jdk-rules.gmk 2007-11-13 14:54:50.000000000 -0500 -@@ -63,7 +63,7 @@ - endif - - ifndef DEV_ONLY -- JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images -+ JDK_BUILD_TARGETS = sanity all images - else - JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET) - endif ---- oipenjdk/jdk/make/common/shared/Defs-java.gmk 2007-11-13 15:08:08.000000000 -0500 -+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2007-11-13 15:06:58.000000000 -0500 -@@ -118,30 +118,19 @@ - JAVACFLAGS += $(OTHER_JAVACFLAGS) - - # Needed for javah --JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) -+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) - - # 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)$(JAVADOC_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) --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%) - endif - - # Override of what javac to use (see deploy workspace) ---- oipenjdk/jdk/make/common/Release.gmk 2008-08-28 03:10:47.000000000 -0500 -+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-09-16 17:53:16.000000000 -0500 -@@ -655,10 +655,23 @@ - $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) - $(prep-target) - $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ --$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) -+$(RESOURCES_JAR): \ -+ $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \ -+ $(JAR_MANIFEST_FILE) - $(prep-target) -+ifneq (,$(JAR_KNOWS_ATFILE)) -+ (cd $(CLASSBINDIR) && \ - $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ -- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS) -+ $(JAR_JFLAGS) @$(RES_JAR_FILELIST)) -+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) -+ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ -+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ -+ $(JAR_JFLAGS)) -+else -+ (cd $(CLASSBINDIR) && \ -+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ -+ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) -+endif - @$(java-vm-cleanup) - - # Create jsse.jar containing SunJSSE implementation classes -@@ -714,10 +727,22 @@ - $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST) - $(prep-target) - $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ --$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE) -+$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \ -+ $(JAR_MANIFEST_FILE) - $(prep-target) -+ifneq (,$(JAR_KNOWS_ATFILE)) -+ (cd $(CLASSBINDIR) && \ - $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ -- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS) -+ $(JAR_JFLAGS) @$(RT_JAR_FILELIST)) -+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) -+ (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \ -+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ -+ $(JAR_JFLAGS)) -+else -+ (cd $(CLASSBINDIR) && \ -+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ -+ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`) -+endif - @$(java-vm-cleanup) - - # Meta-index construction to make core class loaders lazier -@@ -949,19 +951,6 @@ - @$(java-vm-cleanup) - $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar - @# -- @# lib/ct.sym -- @# -- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym -- $(JAVAC_CMD) -XDprocess.packages -proc:only \ -- -processor com.sun.tools.javac.sym.CreateSymbols \ -- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ -- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ -- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) -- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ -- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS) -- @$(java-vm-cleanup) -- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym -- @# - @# CORBA supported orb.idl and ir.idl should be copied to lib - @# - $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl -@@ -1040,16 +1029,6 @@ - $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher - $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip * - $(RM) -r $(JDK_IMAGE_DIR)/src -- @# -- @# demo, include -- @# -- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) -- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) -- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) -- @# -- @# Swing BeanInfo generation -- @# -- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans - ifneq ($(PLATFORM), windows) - $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) - endif # !windows ---- opeiinjdk/jdk/src/share/classes/java/lang/Float.java 2007-10-30 04:36:02.000000000 -0400 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2007-11-13 16:53:02.000000000 -0500 -@@ -76,7 +76,7 @@ - * {@code 0x1.fffffeP+127f} and also equal to - * {@code Float.intBitsToFloat(0x7f7fffff)}. - */ -- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f -+ public static final float MAX_VALUE = 3.4028235e+38f; - - /** - * A constant holding the smallest positive normal value of type -@@ -86,7 +86,7 @@ - * - * @since 1.6 - */ -- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f -+ public static final float MIN_NORMAL = 1.17549435E-38f; - - /** - * A constant holding the smallest positive nonzero value of type -@@ -94,7 +94,7 @@ - * hexadecimal floating-point literal {@code 0x0.000002P-126f} - * and also equal to {@code Float.intBitsToFloat(0x1)}. - */ -- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f -+ public static final float MIN_VALUE = 1.4e-45f; - - /** - * Maximum exponent a finite {@code float} variable may have. It ---- opienjdk/jdk/src/share/classes/java/lang/Double.java 2007-10-30 04:36:02.000000000 -0400 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2007-11-13 16:53:02.000000000 -0500 -@@ -76,7 +76,7 @@ - * {@code 0x1.fffffffffffffP+1023} and also equal to - * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. - */ -- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 -+ public static final double MAX_VALUE = 1.7976931348623157e+308; - - /** - * A constant holding the smallest positive normal value of type -@@ -86,7 +86,7 @@ - * - * @since 1.6 - */ -- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 -+ public static final double MIN_NORMAL = 2.2250738585072014E-308; - - /** - * A constant holding the smallest positive nonzero value of type -@@ -95,7 +95,7 @@ - * {@code 0x0.0000000000001P-1022} and also equal to - * {@code Double.longBitsToDouble(0x1L)}. - */ -- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 -+ public static final double MIN_VALUE = 4.9e-324; - - /** - * Maximum exponent a finite {@code double} variable may have. ---- openjdk.old/langtools/make/Makefile 2008-01-16 10:23:52.000000000 -0500 -+++ openjdk-ecj/langtools/make/Makefile 2008-01-16 10:42:51.000000000 -0500 -@@ -113,7 +113,7 @@ - - ifdef ALT_BOOTDIR - ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR) -- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) -+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac - endif - - ifdef ALT_OUTPUTDIR ---- openjdk.old/langtools/make/build.xml 2008-01-07 10:12:20.000000000 -0500 -+++ openjdk-ecj/langtools/make/build.xml 2008-01-16 10:40:54.000000000 -0500 -@@ -497,7 +497,10 @@ - includes="@{includes}" - sourcepath="" - includeAntRuntime="no" -- target="@{javac.target}"> -+ target="@{javac.target}" -+ executable="${javac.executable}" -+ source="1.5"> -+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> - <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="-Xlint"/> -@@ -511,7 +514,10 @@ - includeAntRuntime="no" - target="@{javac.target}" - debug="${javac.debug}" -- debuglevel="${javac.debuglevel}"> -+ executable="${javac.executable}" -+ debuglevel="${javac.debuglevel}" -+ source="1.5"> -+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> - <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> - <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> - <compilerarg line="${javac.no.jdk.warnings}"/> -@@ -562,8 +568,11 @@ - <target name="-def-pcompile"> - <mkdir dir="${build.toolclasses.dir}"/> - <javac srcdir="${make.tools.dir}/CompileProperties" -+ fork="true" - destdir="${build.toolclasses.dir}/" -- classpath="${ant.home}/lib/ant.jar"/> -+ classpath="${ant.home}/lib/ant.jar" -+ executable="${javac.executable}" -+ source="1.5"/> - <taskdef name="pcompile" - classname="CompilePropertiesTask" - classpath="${build.toolclasses.dir}/"/> ---- openjdk.old/jaxp/make/build.xml 2008-01-07 10:07:02.000000000 -0500 -+++ openjdk-ecj/jaxp/make/build.xml 2008-01-16 10:59:22.000000000 -0500 -@@ -71,7 +71,10 @@ - <mkdir dir="${build.toolclasses.dir}"/> - <javac srcdir="${make.tools.dir}/StripProperties" - destdir="${build.toolclasses.dir}/" -- classpath="${ant.home}/lib/ant.jar"/> -+ classpath="${ant.home}/lib/ant.jar" -+ fork="true" -+ executable="${javac.executable}" -+ source="1.5"/> - <taskdef name="pstrip" - classname="StripPropertiesTask" - classpath="${build.toolclasses.dir}/"/> -@@ -85,7 +88,9 @@ - destdir="${build.classes.dir}" - memoryInitialSize="${javac.memoryInitialSize}" - memoryMaximumSize="${javac.memoryMaximumSize}" -- target="${javac.target}"> -+ target="${javac.target}" -+ executable="${javac.executable}" -+ source="1.5"> - <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - </javac> ---- openjdk.old/jaxws/make/build.xml 2008-01-16 10:23:52.000000000 -0500 -+++ openjdk-ecj/jaxws/make/build.xml 2008-01-16 11:01:00.000000000 -0500 -@@ -84,7 +84,10 @@ - <mkdir dir="${build.toolclasses.dir}"/> - <javac srcdir="${make.tools.dir}/StripProperties" - destdir="${build.toolclasses.dir}/" -- classpath="${ant.home}/lib/ant.jar"/> -+ fork="true" -+ executable="${javac.executable}" -+ classpath="${ant.home}/lib/ant.jar" -+ source="1.5"/> - <taskdef name="pstrip" - classname="StripPropertiesTask" - classpath="${build.toolclasses.dir}/"/> -@@ -96,12 +99,14 @@ - <javac fork="true" - srcdir="${src.classes.dir}" - destdir="${build.classes.dir}" -+ executable="${javac.executable}" - memoryInitialSize="${javac.memoryInitialSize}" - memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}" -- excludes="com/sun/tools/internal/txw2/**"> -- <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/> -- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> -+ excludes="com/sun/tools/internal/txw2/**" -+ source="1.5"> -+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> -+ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="${javac.no.jdk.warnings}"/> - </javac> ---- openjdk.old/jaxp/make/Makefile 2008-01-16 10:23:52.000000000 -0500 -+++ openjdk-ecj/jaxp/make/Makefile 2008-01-16 11:02:39.000000000 -0500 -@@ -80,7 +80,7 @@ - endif - - ifdef ALT_BOOTDIR -- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) -+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac - endif - - ifdef ALT_OUTPUTDIR ---- openjdk.old/jaxws/make/Makefile 2008-01-16 10:23:52.000000000 -0500 -+++ openjdk-ecj/jaxws/make/Makefile 2008-01-16 11:03:10.000000000 -0500 -@@ -80,8 +80,8 @@ - endif - - ifdef ALT_BOOTDIR -- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) -- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) -+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR) -+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac - endif - - ifdef ALT_OUTPUTDIR ---- openjdk6/hotspot/build/linux/makefiles/sa.make 2008-02-12 04:14:13.000000000 -0500 -+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-02-15 09:23:58.000000000 -0500 -@@ -72,7 +72,7 @@ - $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ - mkdir -p $(SA_CLASSDIR); \ - fi -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES) - $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) - $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . ---- openoldjdk/jdk/make/sun/xawt/Makefile 2008-02-12 04:04:04.000000000 -0500 -+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-02-15 09:48:16.000000000 -0500 -@@ -278,11 +278,7 @@ - - TEMPDIR_CLASSES = $(TEMPDIR)/classes - --$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java -- @$(prep-target) -- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< -- --$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) -+$(TEMPDIR)/.gen_icons: $(ICONS) - $(prep-target) - for i in $(ICONS); do \ - filename=`basename $$i`; \ -@@ -292,22 +288,14 @@ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ -- $(CAT) $$i | \ -- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ -- -Dawt.toolkit=sun.awt.motif.MToolkit \ -- -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ -+ $(ECHO) "0,0" >> $$classname ; \ - $(ECHO) "}; }" >> $$classname; \ -- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ -+ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ -- $(CAT) $$i | \ -- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ -- -Dawt.toolkit=sun.awt.motif.MToolkit \ -- -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ -+ $(ECHO) "0,0" >> $$classname ; \ - $(ECHO) "}; }" >> $$classname; \ - done - $(TOUCH) $@ ---- oldopenjdk/corba/make/common/shared/Defs-java.gmk 2008-02-12 04:15:10.000000000 -0500 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-02-15 11:01:50.000000000 -0500 -@@ -117,31 +117,13 @@ - JAVACFLAGS += $(OTHER_JAVACFLAGS) - - # Needed for javah --JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) -+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) - --# 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)$(JAVADOC_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) --else -- # If no explicit tools, use boot tools (add VM flags in this case) -- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ -+# 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 \ -+JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ - $(JAVAHFLAGS) -- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) --endif - - # Override of what javac to use (see deploy workspace) - ifdef JAVAC ---- oldopenjdk/corba/make/common/Defs-linux.gmk 2008-02-15 11:02:45.000000000 -0500 -+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-02-15 11:05:09.000000000 -0500 -@@ -261,7 +261,7 @@ - fi; \ - done) - JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm --JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) -+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) - - # - # We want to privatize JVM symbols on Solaris. This is so the user can ---- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 2008-06-09 03:12:48.000000000 +0100 -+++ /dev/null 2008-05-17 00:35:13.224001676 +0100 +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2008-08-28 09:24:03.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,224 +0,0 @@ -# -# Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. @@ -1035,4 +292,776 @@ -# Include -# -include $(BUILDDIR)/common/Rules.gmk - +diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk +--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2008-08-28 09:24:04.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Defs.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -53,6 +53,13 @@ + + _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) + ++ ++ifdef ALT_LANGTOOLS_DIST ++ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST)) ++else ++ LANGTOOLS_DIST = ++endif ++ + # + # Get platform definitions + # +@@ -129,8 +136,6 @@ + # for build tool jar files + BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars + ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars +-# for generated java source files +-GENSRCDIR = $(OUTPUTDIR)/gensrc + # for generated C source files (not javah) + GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc + # for imported source files +@@ -231,7 +236,7 @@ + # We define an intermediate variable for Java files because + # we use its value later to help define $SOURCEPATH + +-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes ++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes + VPATH.java = $(VPATH0.java) + vpath %.java $(VPATH.java) + vpath %.class $(CLASSBINDIR) +diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk +--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -276,7 +276,7 @@ + fi; \ + done) + JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm +-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) ++JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) + + # + # We want to privatize JVM symbols on Solaris. This is so the user can +diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk +--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-08-28 09:24:04.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Rules.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -197,8 +197,10 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ + $(CAT) $(JAVA_SOURCE_LIST); \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ ++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ ++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + fi + @$(java-vm-cleanup) + +diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -110,31 +110,13 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + +-# 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)$(JAVADOC_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) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# 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 \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile +--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2008-08-28 09:24:04.000000000 +0100 ++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -93,8 +93,6 @@ + POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(POAGENERATEDFILES):: $(POA.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL) +- $(RM) -r $(POAHELHOLFILES) + + poa.compile: $(POAGENERATEDFILES) + +@@ -110,10 +108,6 @@ + + # Generating and deleting unused files to reduce images size + $(DYNANYFILES): $(DYNAMIC_ANY.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL) +- $(RM) $(DYNANY_DIR)/*POA* +- $(RM) $(DYNANY_DIR)/*Holder* +- $(RM) $(DYNANYDELETEFILES) + + dynany.compile: $(DYNANYFILES) + +@@ -125,12 +119,6 @@ + TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions" + + $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) + + tr.compile: $(TRGENERATEDFILES) + +@@ -144,7 +132,6 @@ + # _NamingContextImplBase.java and _BindingIteratorImplBase.java files + # to GENSRC directory. Note that these two classes are deprecated. + $(NSGENERATEDFILES): $(NAMESERVICE.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL) + + ns.compile: $(NSGENERATEDFILES) + +@@ -156,8 +143,6 @@ + IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%) + + $(IOPGENERATEDFILES):: $(IOP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL) +- $(RM) -r $(IOPDELETEFILES) + + iop.compile: $(IOPGENERATEDFILES) + +@@ -169,8 +154,6 @@ + CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%) + + $(CORBAXGENERATEDFILES):: $(CORBAX.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL) +- $(RM) $(CORBAXDUPLICATEFILES) + + corbax.compile: $(CORBAXGENERATEDFILES) + +@@ -181,7 +164,6 @@ + MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%) + + $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL) + + messaging.compile: $(MESSAGINGGENERATEDFILES) + +@@ -195,8 +177,6 @@ + PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL) +- $(RM) $(PIHELHOLFILES) + + pi.compile: $(PIGENERATEDFILES) + +diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile +--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-08-28 09:24:04.000000000 +0100 ++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -172,7 +172,6 @@ + ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) + + $(ACTIVATIONFILES): $(ACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) + + activation.idl.compile: $(ACTIVATIONFILES) + +@@ -195,7 +194,6 @@ + + # REVISIT: remove -oldImplBase + $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) + + portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) + +diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile +--- openjdk-ecj.orig/hotspot/build/linux/Makefile 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/hotspot/build/linux/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -257,28 +257,24 @@ + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif +diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make +--- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-10-20 18:50:20.000000000 +0100 +@@ -72,7 +72,7 @@ + $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ + mkdir -p $(SA_CLASSDIR); \ + fi +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES) + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) + $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . +diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml +--- openjdk-ecj.orig/jaxp/make/build.xml 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jaxp/make/build.xml 2008-10-20 18:50:52.000000000 +0100 +@@ -71,7 +71,10 @@ + <mkdir dir="${build.toolclasses.dir}"/> + <javac srcdir="${make.tools.dir}/StripProperties" + destdir="${build.toolclasses.dir}/" +- classpath="${ant.home}/lib/ant.jar"/> ++ classpath="${ant.home}/lib/ant.jar" ++ fork="true" ++ executable="${javac.executable}" ++ source="1.5"/> + <taskdef name="pstrip" + classname="StripPropertiesTask" + classpath="${build.toolclasses.dir}/"/> +@@ -86,6 +89,8 @@ + memoryInitialSize="${javac.memoryInitialSize}" + memoryMaximumSize="${javac.memoryMaximumSize}" + target="${javac.target}" ++ executable="${javac.executable}" ++ source="1.5" + debug="${javac.debug}"> + <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> + <compilerarg line="${javac.version.opt}"/> +diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile +--- openjdk-ecj.orig/jaxp/make/Makefile 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jaxp/make/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -75,7 +75,7 @@ + endif + + ifdef ALT_BOOTDIR +- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) ++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac + endif + + ifdef ALT_OUTPUTDIR +diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties +--- openjdk-ecj.orig/jaxws/make/build.properties 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.properties 2008-10-20 18:50:20.000000000 +0100 +@@ -37,7 +37,7 @@ + # set the following to -version to verify the versions of javac being used + javac.version.opt = + # in time, there should be no exceptions to -Xlint:all +-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror ++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial + + # JVM memory size + javac.memoryInitialSize = 128m +diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml +--- openjdk-ecj.orig/jaxws/make/build.xml 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.xml 2008-10-20 18:52:28.000000000 +0100 +@@ -93,7 +93,10 @@ + <mkdir dir="${build.toolclasses.dir}"/> + <javac srcdir="${make.tools.dir}/StripProperties" + destdir="${build.toolclasses.dir}/" +- classpath="${ant.home}/lib/ant.jar"/> ++ fork="true" ++ executable="${javac.executable}" ++ classpath="${ant.home}/lib/ant.jar" ++ source="1.5"/> + <taskdef name="pstrip" + classname="StripPropertiesTask" + classpath="${build.toolclasses.dir}/"/> +@@ -105,13 +108,15 @@ + <javac fork="true" + srcdir="${src.classes.dir}" + destdir="${build.classes.dir}" ++ executable="${javac.executable}" + memoryInitialSize="${javac.memoryInitialSize}" + memoryMaximumSize="${javac.memoryMaximumSize}" + target="${javac.target}" + debug="${javac.debug}" +- excludes="com/sun/tools/internal/txw2/**"> +- <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/> +- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> ++ excludes="com/sun/tools/internal/txw2/**" ++ source="1.5"> ++ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> ++ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> + </javac> +diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile +--- openjdk-ecj.orig/jaxws/make/Makefile 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jaxws/make/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -75,8 +75,8 @@ + endif + + ifdef ALT_BOOTDIR +- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH) +- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) ++ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR) ++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac + endif + + ifdef ALT_OUTPUTDIR +diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk +--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2008-08-28 09:10:46.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -43,7 +43,8 @@ + @$(prep-target) + @$(MKDIR) -p $(BUILDTOOLCLASSDIR) + $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \ +- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE) ++ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \ ++ $(BUILDTOOL_MAIN_SOURCE_FILE) + $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \ + -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ + $(JAR_JFLAGS) || $(RM) $@ +diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk +--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/Release.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -649,10 +649,23 @@ + $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RESOURCES_JAR): \ ++ $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ +- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS) ++ $(JAR_JFLAGS) @$(RES_JAR_FILELIST)) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) ++endif + @$(java-vm-cleanup) + + # Create jsse.jar containing SunJSSE implementation classes +@@ -708,10 +721,22 @@ + $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ +- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS) ++ $(JAR_JFLAGS) @$(RT_JAR_FILELIST)) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`) ++endif + @$(java-vm-cleanup) + + # Meta-index construction to make core class loaders lazier +@@ -941,19 +966,6 @@ + @$(java-vm-cleanup) + $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar + @# +- @# lib/ct.sym +- @# +- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym +- $(JAVAC_CMD) -XDprocess.packages -proc:only \ +- -processor com.sun.tools.javac.sym.CreateSymbols \ +- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ +- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ +- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) +- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ +- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS) +- @$(java-vm-cleanup) +- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym +- @# + @# CORBA supported orb.idl and ir.idl should be copied to lib + @# + $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl +@@ -1032,16 +1044,6 @@ + $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher + $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip * + $(RM) -r $(JDK_IMAGE_DIR)/src +- @# +- @# demo, include +- @# +- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) +- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) +- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) +- @# +- @# Swing BeanInfo generation +- @# +- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans + ifneq ($(PLATFORM), windows) + $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) + endif # !windows +diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2008-08-28 09:10:47.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -235,8 +235,9 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ + $(CAT) $(JAVA_SOURCE_LIST); \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ ++ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + fi + @$(java-vm-cleanup) + +@@ -302,6 +303,8 @@ + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ + $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) + @$(java-vm-cleanup) ++ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \ ++ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h + @$(TOUCH) $@ + + classheaders.clean: +diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-20 18:50:20.000000000 +0100 +@@ -118,30 +118,19 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + + # 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)$(JAVADOC_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) +-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%) + endif + + # Override of what javac to use (see deploy workspace) +diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile +--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2008-08-28 09:10:49.000000000 +0100 ++++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -31,7 +31,7 @@ + PACKAGE = java.nio + LIBRARY = nio + PRODUCT = java +-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial -Werror + include $(BUILDDIR)/common/Defs.gmk + + NIO_SRC = $(SHARE_SRC)/classes/java/nio +diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile +--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2008-08-28 09:10:50.000000000 +0100 ++++ openjdk-ecj/jdk/make/java/text/Makefile 2008-10-20 18:50:20.000000000 +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):$(ICEDTEA_CLS_DIR) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(TEXT_CLASSDIR) \ + -spec $(UNICODEDATA)/UnicodeData.txt + @$(java-vm-cleanup) +diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile +--- openjdk-ecj.orig/jdk/make/Makefile 2008-08-28 09:10:41.000000000 +0100 ++++ openjdk-ecj/jdk/make/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -247,7 +247,7 @@ + + all build:: sanity-all post-sanity-all + +-SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers ++SUBDIRS = tools java javax org sun sunw com jpda mksample launchers + all build:: + $(SUBDIRS-loop) + +diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-08-28 09:10:56.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -432,10 +432,9 @@ + COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar + + $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ +- $(COMPILEFONTCONFIG_JARFILE) +- $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@ +- $(CHMOD) 444 $(@) ++ $(COMPILEFONTCONFIG_JARFILE) ++ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR) ++ $(CHMOD) 444 $(LIBDIR)/*.bfc + @$(java-vm-cleanup) + + fontconfigs.clean : +diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile +--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2008-08-28 09:10:58.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -62,7 +62,8 @@ + $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) + $(RM) -r $(@D) + $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) ++ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \ ++ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) + @$(java-vm-cleanup) + + $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) +diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile +--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2008-08-28 09:11:02.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-10-20 18:50:20.000000000 +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):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(CLASSDESTDIR)/sun/text/resources \ + -spec $(UNICODEDATA)/UnicodeData.txt \ + -language th +diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2008-08-28 09:11:02.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -278,11 +278,7 @@ + + TEMPDIR_CLASSES = $(TEMPDIR)/classes + +-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java +- @$(prep-target) +- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< +- +-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) ++$(TEMPDIR)/.gen_icons: $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ +@@ -292,22 +288,14 @@ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public static int[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ +- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ ++ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public static long[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ +diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java +--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-08-28 09:11:05.000000000 +0100 ++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-20 18:50:20.000000000 +0100 +@@ -647,9 +647,6 @@ + throws FileNotFoundException, IOException { + BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); + PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName))); +- out.println(commentStart + +- " This file was generated AUTOMATICALLY from a template file " + +- new java.util.Date() + commentEnd); + int marklen = commandMarker.length(); + LOOP: while(true) { + try { +@@ -876,7 +873,6 @@ + // liu : Add a comment showing the source of this table + result.append(commentStart + " The following tables and code generated using:" + + commentEnd + "\n "); +- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n "); + + if (plane == 0 && bLatin1 == false) { + genCaseMapTableDeclaration(result); +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-08-28 09:12:52.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-10-20 18:50:20.000000000 +0100 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffffffffffP+1023} and also equal to + * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. + */ +- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 ++ public static final double MAX_VALUE = 1.7976931348623157e+308; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 ++ public static final double MIN_NORMAL = 2.2250738585072014E-308; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -95,7 +95,7 @@ + * {@code 0x0.0000000000001P-1022} and also equal to + * {@code Double.longBitsToDouble(0x1L)}. + */ +- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 ++ public static final double MIN_VALUE = 4.9e-324; + + /** + * Maximum exponent a finite {@code double} variable may have. +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-08-28 09:12:52.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-10-20 18:50:20.000000000 +0100 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffeP+127f} and also equal to + * {@code Float.intBitsToFloat(0x7f7fffff)}. + */ +- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f ++ public static final float MAX_VALUE = 3.4028235e+38f; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f ++ public static final float MIN_NORMAL = 1.17549435E-38f; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -94,7 +94,7 @@ + * hexadecimal floating-point literal {@code 0x0.000002P-126f} + * and also equal to {@code Float.intBitsToFloat(0x1)}. + */ +- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f ++ public static final float MIN_VALUE = 1.4e-45f; + + /** + * Maximum exponent a finite {@code float} variable may have. It +diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties +--- openjdk-ecj.orig/langtools/make/build.properties 2008-08-28 09:27:31.000000000 +0100 ++++ openjdk-ecj/langtools/make/build.properties 2008-10-20 18:50:20.000000000 +0100 +@@ -66,7 +66,7 @@ + # set the following to -version to verify the versions of javac being used + javac.version.opt = + # in time, there should be no exceptions to -Xlint:all +-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror ++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial + + # options for the <javadoc> task for javac + javadoc.jls3.url=http://java.sun.com/docs/books/jls/ +diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml +--- openjdk-ecj.orig/langtools/make/build.xml 2008-08-28 09:27:31.000000000 +0100 ++++ openjdk-ecj/langtools/make/build.xml 2008-10-20 18:50:20.000000000 +0100 +@@ -497,7 +497,10 @@ + includes="@{includes}" + sourcepath="" + includeAntRuntime="no" +- target="@{javac.target}"> ++ target="@{javac.target}" ++ executable="${javac.executable}" ++ source="1.5"> ++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="-Xlint"/> +@@ -511,7 +514,10 @@ + includeAntRuntime="no" + target="@{javac.target}" + debug="${javac.debug}" +- debuglevel="${javac.debuglevel}"> ++ executable="${javac.executable}" ++ debuglevel="${javac.debuglevel}" ++ source="1.5"> ++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> +@@ -562,8 +568,11 @@ + <target name="-def-pcompile"> + <mkdir dir="${build.toolclasses.dir}"/> + <javac srcdir="${make.tools.dir}/CompileProperties" ++ fork="true" + destdir="${build.toolclasses.dir}/" +- classpath="${ant.home}/lib/ant.jar"/> ++ classpath="${ant.home}/lib/ant.jar" ++ executable="${javac.executable}" ++ source="1.5"/> + <taskdef name="pcompile" + classname="CompilePropertiesTask" + classpath="${build.toolclasses.dir}/"/> +diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile +--- openjdk-ecj.orig/langtools/make/Makefile 2008-10-20 18:45:00.000000000 +0100 ++++ openjdk-ecj/langtools/make/Makefile 2008-10-20 18:50:20.000000000 +0100 +@@ -108,7 +108,7 @@ + + ifdef ALT_BOOTDIR + ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR) +- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) ++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac + endif + + ifdef ALT_OUTPUTDIR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-javac-debuginfo.patch Mon Oct 20 19:30:04 2008 +0100 @@ -0,0 +1,102 @@ +diff -Nru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk +--- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2008-10-20 18:06:13.000000000 +0100 ++++ openjdk/corba/make/common/shared/Defs-java.gmk 2008-10-20 18:07:05.000000000 +0100 +@@ -91,15 +91,8 @@ + # -- Use JAVAC_CMD if you want to take the defaults given to you. + # + +-ifndef DEBUG_CLASSFILES +- ifeq ($(VARIANT), DBG) +- DEBUG_CLASSFILES = true +- endif +-endif +-JAVACFLAGS = +-ifeq ($(DEBUG_CLASSFILES),true) +- JAVACFLAGS += -g +-endif ++# Always include debug info ++JAVACFLAGS += -g + ifeq ($(COMPILER_WARNINGS_FATAL), true) + JAVACFLAGS += -Werror + endif +diff -Nru openjdk.orig/jaxp/make/build.xml openjdk/jaxp/make/build.xml +--- openjdk.orig/jaxp/make/build.xml 2008-10-20 18:41:39.000000000 +0100 ++++ openjdk/jaxp/make/build.xml 2008-10-20 18:42:12.000000000 +0100 +@@ -85,7 +85,8 @@ + destdir="${build.classes.dir}" + memoryInitialSize="${javac.memoryInitialSize}" + memoryMaximumSize="${javac.memoryMaximumSize}" +- target="${javac.target}"> ++ target="${javac.target}" ++ debug="${javac.debug}"> + <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> + <compilerarg line="${javac.version.opt}"/> + </javac> +diff -Nru openjdk.orig/jaxp/make/Makefile openjdk/jaxp/make/Makefile +--- openjdk.orig/jaxp/make/Makefile 2008-10-20 17:58:09.000000000 +0100 ++++ openjdk/jaxp/make/Makefile 2008-10-20 17:59:19.000000000 +0100 +@@ -61,13 +61,8 @@ + endif + endif + +-ifeq ($(VARIANT), DBG) +- ANT_OPTIONS += -Djavac.debug=true +-else +- ifeq ($(VARIANT), OPT) +- ANT_OPTIONS += -Djavac.debug=false +- endif +-endif ++# Always include debug info ++ANT_OPTIONS += -Djavac.debug=true + + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) + # and the somewhat misnamed CLASS_VERSION (-target NN) +diff -Nru openjdk.orig/jaxws/make/build.xml openjdk/jaxws/make/build.xml +--- openjdk.orig/jaxws/make/build.xml 2008-10-20 18:41:44.000000000 +0100 ++++ openjdk/jaxws/make/build.xml 2008-10-20 18:42:46.000000000 +0100 +@@ -99,6 +99,7 @@ + memoryInitialSize="${javac.memoryInitialSize}" + memoryMaximumSize="${javac.memoryMaximumSize}" + target="${javac.target}" ++ debug="${javac.debug}" + excludes="com/sun/tools/internal/txw2/**"> + <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/> + <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> +diff -Nru openjdk.orig/jaxws/make/Makefile openjdk/jaxws/make/Makefile +--- openjdk.orig/jaxws/make/Makefile 2008-10-20 17:58:18.000000000 +0100 ++++ openjdk/jaxws/make/Makefile 2008-10-20 17:59:03.000000000 +0100 +@@ -61,13 +61,8 @@ + endif + endif + +-ifeq ($(VARIANT), DBG) +- ANT_OPTIONS += -Djavac.debug=true +-else +- ifeq ($(VARIANT), OPT) +- ANT_OPTIONS += -Djavac.debug=false +- endif +-endif ++# Always include debug info ++ANT_OPTIONS += -Djavac.debug=true + + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) + # and the somewhat misnamed CLASS_VERSION (-target NN) +diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile +--- openjdk.orig/langtools/make/Makefile 2008-10-20 18:06:46.000000000 +0100 ++++ openjdk/langtools/make/Makefile 2008-10-20 17:59:54.000000000 +0100 +@@ -93,13 +93,8 @@ + endif + endif + +-ifeq ($(VARIANT), DBG) +- ANT_OPTIONS += -Djavac.debug=true +-else +- ifeq ($(VARIANT), OPT) +- ANT_OPTIONS += -Djavac.debug=false +- endif +-endif ++# Always include debug info ++ANT_OPTIONS += -Djavac.debug=true + + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) + # and the somewhat misnamed CLASS_VERSION (-target NN)