Mercurial > hg > release > icedtea7-2.6
changeset 1991:43acec61d3e9
Makefile reorganisation and naming update.
2009-10-01 Andrew John Hughes <ahughes@redhat.com>
Reorganise Makefile and rename some
targets to better refer to the two stages
of the build (stage1/bootstrap and stage2/final).
* patches/ecj/icedtea-dbcs.patch,
* patches/ecj/icedtea-dyn.patch,
* patches/ecj/icedtea-euctw.patch,
* patches/ecj/icedtea-hotspot-default.patch,
* patches/ecj/icedtea-jopt.patch,
* patches/ecj/icedtea-pr39408.patch,
* patches/ecj/icedtea-pr40188.patch,
* patches/ecj/icedtea-pr40616.patch,
* patches/ecj/icedtea-sbcs.patch,
* patches/ecj/icedtea-spp.patch,
* patches/ecj/icedtea.patch: Moved to...
* Makefile.am:
Reorganise Makefile, change openjdk-ecj
to openjdk-boot and patches/ecj to patches/boot.
icedtea-against-icedtea is now icedtea-stage2.
icedtea-against-ecj is now icedtea-stage1.
Remove stage2 dependency on plugs.stamp and
hotspot-tools.stamp. Move visualvm to a
complete separate target depended on by
icedtea-stage2.
* patches/boot/icedtea-dbcs.patch,
* patches/boot/icedtea-dyn.patch,
* patches/boot/icedtea-euctw.patch,
* patches/boot/icedtea-hotspot-default.patch,
* patches/boot/icedtea-jopt.patch,
* patches/boot/icedtea-pr39408.patch,
* patches/boot/icedtea-pr40188.patch,
* patches/boot/icedtea-pr40616.patch,
* patches/boot/icedtea-sbcs.patch,
* patches/boot/icedtea-spp.patch,
* patches/boot/icedtea.patch: here.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 01 Oct 2009 18:05:17 +0100 |
| parents | 5195537c2fa0 |
| children | 176ef4125901 |
| files | ChangeLog Makefile.am patches/boot/icedtea-dbcs.patch patches/boot/icedtea-dyn.patch patches/boot/icedtea-euctw.patch patches/boot/icedtea-hotspot-default.patch patches/boot/icedtea-jopt.patch patches/boot/icedtea-pr39408.patch patches/boot/icedtea-pr40188.patch patches/boot/icedtea-pr40616.patch patches/boot/icedtea-sbcs.patch patches/boot/icedtea-spp.patch patches/boot/icedtea.patch patches/ecj/icedtea-dbcs.patch patches/ecj/icedtea-dyn.patch patches/ecj/icedtea-euctw.patch patches/ecj/icedtea-hotspot-default.patch patches/ecj/icedtea-jopt.patch patches/ecj/icedtea-pr39408.patch patches/ecj/icedtea-pr40188.patch patches/ecj/icedtea-pr40616.patch patches/ecj/icedtea-sbcs.patch patches/ecj/icedtea-spp.patch patches/ecj/icedtea.patch |
| diffstat | 24 files changed, 2262 insertions(+), 3487 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 30 13:02:58 2009 +0100 +++ b/ChangeLog Thu Oct 01 18:05:17 2009 +0100 @@ -1,3 +1,40 @@ +2009-10-01 Andrew John Hughes <ahughes@redhat.com> + + Reorganise Makefile and rename some + targets to better refer to the two stages + of the build (stage1/bootstrap and stage2/final). + * patches/ecj/icedtea-dbcs.patch, + * patches/ecj/icedtea-dyn.patch, + * patches/ecj/icedtea-euctw.patch, + * patches/ecj/icedtea-hotspot-default.patch, + * patches/ecj/icedtea-jopt.patch, + * patches/ecj/icedtea-pr39408.patch, + * patches/ecj/icedtea-pr40188.patch, + * patches/ecj/icedtea-pr40616.patch, + * patches/ecj/icedtea-sbcs.patch, + * patches/ecj/icedtea-spp.patch, + * patches/ecj/icedtea.patch: Moved to... + * Makefile.am: + Reorganise Makefile, change openjdk-ecj + to openjdk-boot and patches/ecj to patches/boot. + icedtea-against-icedtea is now icedtea-stage2. + icedtea-against-ecj is now icedtea-stage1. + Remove stage2 dependency on plugs.stamp and + hotspot-tools.stamp. Move visualvm to a + complete separate target depended on by + icedtea-stage2. + * patches/boot/icedtea-dbcs.patch, + * patches/boot/icedtea-dyn.patch, + * patches/boot/icedtea-euctw.patch, + * patches/boot/icedtea-hotspot-default.patch, + * patches/boot/icedtea-jopt.patch, + * patches/boot/icedtea-pr39408.patch, + * patches/boot/icedtea-pr40188.patch, + * patches/boot/icedtea-pr40616.patch, + * patches/boot/icedtea-sbcs.patch, + * patches/boot/icedtea-spp.patch, + * patches/boot/icedtea.patch: here. + 2009-09-30 Andrew John Hughes <ahughes@redhat.com> * generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java,
--- a/Makefile.am Wed Sep 30 13:02:58 2009 +0100 +++ b/Makefile.am Thu Oct 01 18:05:17 2009 +0100 @@ -1,3 +1,5 @@ +# Dependencies + OPENJDK_VERSION = b72 CORBA_CHANGESET = 5fdcfb25dbb4 @@ -19,9 +21,138 @@ CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa +NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ +NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 + +VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/ +VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe +OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot + +ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 +OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 +CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ +CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ +CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/ +BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port +NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ + +OPENJDK_URL = $(ICEDTEA_HG_URL) +CORBA_URL = $(ICEDTEA_HG_URL)/corba +JAXP_URL = $(ICEDTEA_HG_URL)/jaxp +JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws +JDK_URL = $(ICEDTEA_HG_URL)/jdk +LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools +HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot + +CACAO_BASE_URL = http://www.complang.tuwien.ac.at +CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ + +JDK_SHARE = openjdk/jdk/src/share/classes +JDK_SOLARIS = openjdk/jdk/src/solaris/classes +LANGTOOLS = openjdk/langtools/src/share/classes +JAXP = openjdk/jaxp/src/share/classes +CORBA = openjdk/corba/src/share/classes +JAXWS = openjdk/jaxws/src/share/classes + +OPENJDK_SOURCEPATH_DIRS = \ + $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) + +SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS) + +NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge +NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources + +IT_LANGUAGE_SOURCE_VERSION=5 +IT_CLASS_TARGET_VERSION=5 +IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) +IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) + +OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) +BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR) +BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR) +ICEDTEA_BUILD_DIR = \ + $(abs_top_builddir)/$(BUILD_OUTPUT_DIR) +ICEDTEA_RT = \ + $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar +ICEDTEA_BOOT_DIR= \ + $(abs_top_builddir)/bootstrap/jdk1.6.0 +ICEDTEA_ENDORSED_DIR = \ + $(ICEDTEA_BOOT_DIR)/lib/endorsed +ICEDTEA_BUILD_DIR_BOOT = \ + $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/ +ICEDTEA_CLS_DIR_BOOT = \ + $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes +SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server +BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) +BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + +# Conditional defintions + +if USE_HG + OPENJDK_SRC_ZIP = + CORBA_SRC_ZIP = + JAXP_SRC_ZIP = + JAXWS_SRC_ZIP = + JDK_SRC_ZIP = + LANGTOOLS_SRC_ZIP = + HOTSPOT_SRC_ZIP = +else +if USE_ALT_OPENJDK_SRC_ZIP + OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) +else + OPENJDK_SRC_ZIP = openjdk.tar.gz +endif +if USE_ALT_CORBA_SRC_ZIP + CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) +else + CORBA_SRC_ZIP = corba.tar.gz +endif +if USE_ALT_JAXP_SRC_ZIP + JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) +else + JAXP_SRC_ZIP = jaxp.tar.gz +endif +if USE_ALT_JAXWS_SRC_ZIP + JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) +else + JAXWS_SRC_ZIP = jaxws.tar.gz +endif +if USE_ALT_JDK_SRC_ZIP + JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) +else + JDK_SRC_ZIP = jdk.tar.gz +endif +if USE_ALT_LANGTOOLS_SRC_ZIP + LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) +else + LANGTOOLS_SRC_ZIP = langtools.tar.gz +endif +if USE_ALT_HOTSPOT_SRC_ZIP + HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) +else + HOTSPOT_SRC_ZIP = hotspot.tar.gz +endif +endif + +if WITH_ALT_HSBUILD + HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" + HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" + HS_URL = $(OPENJDK_HOTSPOT_URL) +else + HS_MD5SUM = $(HOTSPOT_MD5SUM) + HS_CHANGESET = $(HOTSPOT_CHANGESET) + HS_URL = $(HOTSPOT_URL) +endif + +if USE_ALT_CACAO_SRC_ZIP + CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) +else + CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 +endif + if ENABLE_NPPLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so @@ -61,1337 +192,353 @@ PULSE_JAVA_CLASS_DIR = endif -JDK_SHARE = openjdk/jdk/src/share/classes -JDK_SOLARIS = openjdk/jdk/src/solaris/classes -LANGTOOLS = openjdk/langtools/src/share/classes -JAXP = openjdk/jaxp/src/share/classes -CORBA = openjdk/corba/src/share/classes -JAXWS = openjdk/jaxws/src/share/classes - -OPENJDK_SOURCEPATH_DIRS = \ - $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) +if BOOTSTRAPPING + MEMORY_LIMIT = +else + MEMORY_LIMIT = -J-Xmx1024m +endif -SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS) +if WITH_CACAO + ICEDTEA_BUILD_TARGET=jdk_only + ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only +else + ICEDTEA_BUILD_TARGET= + ICEDTEA_DEBUG_BUILD_TARGET=debug_build +endif -IT_LANGUAGE_SOURCE_VERSION=5 -IT_CLASS_TARGET_VERSION=5 -IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) -IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) - -# Top-Level Targets -# ================= - -all-local: icedtea-against-icedtea +# Patch list -distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java - rm -rf stamps - rm -f rt-source-files.txt \ - hotspot-tools-source-files.txt \ - extra-source-files.txt \ - netx-source-files.txt - rm -rf bootstrap - rm -rf lib - rm -rf extra-lib - rm -rf openjdk-ecj - rm -rf openjdk - rm -rf hotspot-tools - rm -rf rt/netscape - rm -rf visualvm - rm -rf netbeans - rm -rf netx.build -if ENABLE_PLUGIN - rm -f IcedTeaPlugin.o IcedTeaPlugin.so +ICEDTEA_PATCHES = \ + patches/icedtea-version.patch \ + patches/hotspot/$(HSBUILD)/icedtea-version.patch \ + patches/icedtea-copy-plugs.patch \ + patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ + patches/icedtea-ssl.patch \ + $(PLUGIN_PATCH) \ + patches/icedtea-webstart.patch \ + patches/icedtea-webstart-umask.patch \ + patches/icedtea-rmi_amd64.patch \ + patches/icedtea-tools.patch \ + patches/icedtea-demos.patch \ + patches/icedtea-use-system-tzdata.patch \ + patches/icedtea-headers.patch \ + patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ + patches/icedtea-ant.patch \ + patches/icedtea-gcc-suffix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \ + patches/icedtea-bytebuffer-compact.patch \ + patches/icedtea-float-double-trailing-zeros.patch \ + patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ + patches/icedtea-sunsrc.patch \ + patches/icedtea-libraries.patch \ + patches/icedtea-core-build.patch \ + patches/icedtea-zero-build.patch \ + patches/icedtea-print-lsb-release.patch \ + patches/icedtea-jpegclasses.patch \ + patches/icedtea-uname.patch \ + patches/icedtea-ia64-fdlibm.patch \ + patches/icedtea-freetypeversion.patch \ + patches/icedtea-fonts.patch \ + patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \ + patches/icedtea-override-redirect-metacity.patch \ + patches/icedtea-shark-build.patch \ + patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \ + patches/icedtea-security-updates.patch \ + patches/icedtea-jdk-docs-target.patch \ + patches/icedtea-mbeanintrospector.patch \ + patches/icedtea-hotspot-gcc-pr36917.patch \ + patches/icedtea-alpha-fixes.patch \ + patches/icedtea-alt-jar.patch \ + patches/icedtea-jdk-use-ssize_t.patch \ + patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ + patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ + patches/icedtea-clean-crypto.patch \ + patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ + $(GCC_PATCH) \ + patches/cacao/arch.patch \ + patches/icedtea-signed-types.patch \ + patches/icedtea-lc_ctype.patch \ + patches/icedtea-xjc.patch \ + patches/icedtea-renderer-crossing.patch \ + patches/icedtea-tests-jdk.patch \ + patches/icedtea-stroker-finish.patch \ + patches/icedtea-alsa-default-device.patch \ + patches/icedtea-linker-libs-order.patch \ + patches/icedtea-testenv.patch \ + patches/icedtea-samejvm-safe.patch \ + patches/icedtea-pr261.patch \ + patches/icedtea-doc-headers.patch \ + patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-test-atomic-operations.patch \ + patches/icedtea-ia64-bugfix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ + patches/security/icedtea-6592792.patch \ + patches/security/icedtea-6733959.patch \ + patches/security/icedtea-6755943.patch \ + patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ + patches/icedtea-demo-swingapplet.patch \ + patches/icedtea-jvmtiEnv.patch \ + patches/icedtea-xml-encodinginfo.patch \ + patches/icedtea-cc-interp-backedge.patch \ + patches/icedtea-netx.patch \ + patches/icedtea-disable-intree-ec.patch + +if WITH_RHINO +ICEDTEA_PATCHES += \ + patches/icedtea-rhino.patch endif -if ENABLE_NPPLUGIN - rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so -endif + if BUILD_CACAO - rm -rf cacao +ICEDTEA_PATCHES += \ + patches/cacao/launcher.patch \ + patches/cacao/no-mmap-first-page.patch \ + patches/cacao/native-resolve.patch \ + patches/cacao/xxoption-warning.patch \ + patches/cacao/no-strict-aliasing.patch \ + patches/cacao/openjdk7.patch \ + patches/cacao/version.patch \ + patches/cacao/versioninfo.patch endif - rm -f jni-common.o -if ADD_ZERO_BUILD - rm -rf zerovm + +if WITH_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/ignore-tests.patch endif -if BUILD_NATIVE_ECJ - rm -f native-ecj + +if ENABLE_PULSE_JAVA +ICEDTEA_PATCHES += \ + patches/icedtea-pulse-soundproperties.patch endif - if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ - rm -rf $(abs_top_builddir)/generated ; \ - fi + +if ENABLE_XRENDER +# match against $(abs_top_srcdir) and then remove it again, +# because stamps/patch.stamp target will also add it +XRENDER_PATCHES = patches/xrender/icedtea-???.patch +XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES))) +ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES))) +endif + +if !USE_CVMI +ICEDTEA_PATCHES += \ + patches/icedtea-javafiles.patch +endif -install: +if ENABLE_SYSTEMTAP +ICEDTEA_PATCHES += patches/icedtea-systemtap.patch +endif + +if ENABLE_PLUGIN +ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +else +if ENABLE_NPPLUGIN +ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +endif +endif + +if ENABLE_NSS +ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \ + patches/icedtea-nss-6763530.patch +endif + +ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) -.PHONY: \ - env env-ecj snapshot clean-clone clean-patch \ - clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \ - clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \ - clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ - clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \ - clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \ - clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ - $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ - clean-jtreg-reports +# Bootstrapping patches + +ICEDTEA_BOOT_PATCHES = patches/boot/icedtea.patch \ + patches/boot/icedtea-hotspot-$(HSBUILD).patch \ + patches/boot/icedtea-jopt.patch \ + patches/boot/icedtea-dyn.patch + +if CP39408_JAVAH +ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch +endif + +if CP40188_JAVAH +ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40188.patch +endif + +if CP40616 +ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40616.patch +endif -GENERATED_FILES = generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java \ - generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_es.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_it.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_de.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java \ - generated/com/sun/java/swing/plaf/motif/resources/motif.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_it.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_de.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_es.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java \ - generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoHelper.java \ - generated/com/sun/corba/se/spi/activation/Server.java \ - generated/com/sun/corba/se/spi/activation/ServerIdHelper.java \ - generated/com/sun/corba/se/spi/activation/BadServerDefinition.java \ - generated/com/sun/corba/se/spi/activation/EndpointInfoListHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerIdsHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java \ - generated/com/sun/corba/se/spi/activation/_ServerStub.java \ - generated/com/sun/corba/se/spi/activation/ServerManagerHolder.java \ - generated/com/sun/corba/se/spi/activation/ActivatorOperations.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java \ - generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerHelper.java \ - generated/com/sun/corba/se/spi/activation/TCPPortHelper.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPoint.java \ - generated/com/sun/corba/se/spi/activation/EndPointInfo.java \ - generated/com/sun/corba/se/spi/activation/_ServerManagerImplBase.java \ - generated/com/sun/corba/se/spi/activation/Repository.java \ - generated/com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java \ - generated/com/sun/corba/se/spi/activation/ORBidListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerHeldDownHelper.java \ - generated/com/sun/corba/se/spi/activation/EndpointInfoListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java \ - generated/com/sun/corba/se/spi/activation/RepositoryOperations.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActiveHelper.java \ - generated/com/sun/corba/se/spi/activation/_LocatorStub.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerHolder.java \ - generated/com/sun/corba/se/spi/activation/_ServerImplBase.java \ - generated/com/sun/corba/se/spi/activation/_InitialNameServiceStub.java \ - generated/com/sun/corba/se/spi/activation/ActivatorHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java \ - generated/com/sun/corba/se/spi/activation/EndPointInfoHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActive.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java \ - generated/com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java \ - generated/com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java \ - generated/com/sun/corba/se/spi/activation/LocatorOperations.java \ - generated/com/sun/corba/se/spi/activation/_ActivatorStub.java \ - generated/com/sun/corba/se/spi/activation/ServerHeldDownHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyActive.java \ - generated/com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerManagerOperations.java \ - generated/com/sun/corba/se/spi/activation/ServerNotActiveHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java \ - generated/com/sun/corba/se/spi/activation/_ServerManagerStub.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHelper.java \ - generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHolder.java \ - generated/com/sun/corba/se/spi/activation/ActivatorHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalled.java \ - generated/com/sun/corba/se/spi/activation/InvalidORBidHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHolder.java \ - generated/com/sun/corba/se/spi/activation/EndPointInfoHolder.java \ - generated/com/sun/corba/se/spi/activation/Activator.java \ - generated/com/sun/corba/se/spi/activation/ServerManager.java \ - generated/com/sun/corba/se/spi/activation/ORBidHelper.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServiceHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerOperations.java \ - generated/com/sun/corba/se/spi/activation/RepositoryHelper.java \ - generated/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHelper.java \ - generated/com/sun/corba/se/spi/activation/LocatorHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHolder.java \ - generated/com/sun/corba/se/spi/activation/POANameHelper.java \ - generated/com/sun/corba/se/spi/activation/_RepositoryImplBase.java \ - generated/com/sun/corba/se/spi/activation/ServerIdsHelper.java \ - generated/com/sun/corba/se/spi/activation/_ActivatorImplBase.java \ - generated/com/sun/corba/se/spi/activation/InvalidORBidHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerManagerHelper.java \ - generated/com/sun/corba/se/spi/activation/ServerHeldDown.java \ - generated/com/sun/corba/se/spi/activation/ORBPortInfo.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServiceHolder.java \ - generated/com/sun/corba/se/spi/activation/InvalidORBid.java \ - generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalled.java \ - generated/com/sun/corba/se/spi/activation/_LocatorImplBase.java \ - generated/com/sun/corba/se/spi/activation/InitialNameService.java \ - generated/com/sun/corba/se/spi/activation/ORBAlreadyRegistered.java \ - generated/com/sun/corba/se/spi/activation/RepositoryHolder.java \ - generated/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHolder.java \ - generated/com/sun/corba/se/spi/activation/LocatorHolder.java \ - generated/com/sun/corba/se/spi/activation/Locator.java \ - generated/com/sun/corba/se/spi/activation/InitialNameServiceOperations.java \ - generated/com/sun/corba/se/spi/activation/_RepositoryStub.java \ - generated/com/sun/corba/se/spi/activation/BadServerDefinitionHelper.java \ - generated/com/sun/corba/se/spi/activation/ORBidListHelper.java \ - generated/com/sun/corba/se/spi/activation/POANameHolder.java \ - generated/com/sun/corba/se/spi/activation/ServerNotRegistered.java \ - generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.resource \ - generated/com/sun/corba/se/impl/logging/ActivationSystemException.java \ - generated/com/sun/corba/se/impl/logging/LogStrings.properties \ - generated/com/sun/corba/se/impl/logging/IORSystemException.resource \ - generated/com/sun/corba/se/impl/logging/UtilSystemException.resource \ - generated/com/sun/corba/se/impl/logging/NamingSystemException.resource \ - generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ - generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ - generated/com/sun/corba/se/impl/logging/ActivationSystemException.resource \ - generated/com/sun/corba/se/impl/logging/POASystemException.java \ - generated/com/sun/corba/se/impl/logging/IORSystemException.java \ - generated/com/sun/corba/se/impl/logging/POASystemException.resource \ - generated/com/sun/corba/se/impl/logging/OMGSystemException.java \ - generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.resource \ - generated/com/sun/corba/se/impl/logging/NamingSystemException.java \ - generated/com/sun/corba/se/impl/logging/UtilSystemException.java \ - generated/com/sun/corba/se/impl/logging/OMGSystemException.resource \ - generated/com/sun/corba/se/PortableActivationIDL/ORBProxyHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinition.java \ - generated/com/sun/corba/se/PortableActivationIDL/EndpointInfoListHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerIdsHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerManagerHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ActivatorOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerType.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORB.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/TCPPortHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerProxyOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPoint.java \ - generated/com/sun/corba/se/PortableActivationIDL/EndPointInfo.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ServerManagerImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerProxyHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/Repository.java \ - generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBidListHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBProxyHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDownHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ORBProxyStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/EndpointInfoListHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotActiveHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/_LocatorStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ServerProxyStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/_InitialNameServiceStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/ActivatorHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/EndPointInfoHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotActive.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerProxyHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBound.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/_InitialNameServiceImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ActivatorStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDownHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActive.java \ - generated/com/sun/corba/se/PortableActivationIDL/IIOP_CLEAR_TEXT.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerManagerOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotActiveHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegistered.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ServerManagerStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ORBProxyImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDef.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ActivatorHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalled.java \ - generated/com/sun/corba/se/PortableActivationIDL/InvalidORBidHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/EndPointInfoHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/Activator.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerManager.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBProxy.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBProxyOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ServerProxyImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/_RepositoryImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerIdsHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/_ActivatorImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/InvalidORBidHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerManagerHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDown.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfo.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/InvalidORBid.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalled.java \ - generated/com/sun/corba/se/PortableActivationIDL/_LocatorImplBase.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameService.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegistered.java \ - generated/com/sun/corba/se/PortableActivationIDL/RepositoryHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/LocatorHolder.java \ - generated/com/sun/corba/se/PortableActivationIDL/Locator.java \ - generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceOperations.java \ - generated/com/sun/corba/se/PortableActivationIDL/_RepositoryStub.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerProxy.java \ - generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ORBidListHelper.java \ - generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegistered.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java \ - generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java \ - generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java \ - generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java \ - generated/com/sun/tools/apt/resources/apt_zh_CN.java \ - generated/com/sun/tools/apt/resources/apt.java \ - generated/com/sun/tools/apt/resources/apt_ja.java \ - generated/com/sun/tools/jdi/JDWP.java \ - generated/com/sun/tools/jdi/resources/jdi_zh_CN.java \ - generated/com/sun/tools/jdi/resources/jdi.java \ - generated/com/sun/tools/jdi/resources/jdi_ja.java \ - generated/com/sun/tools/javac/resources/version.java \ - generated/com/sun/tools/javac/resources/legacy.java \ - generated/com/sun/tools/javac/resources/javac.java \ - generated/com/sun/tools/javac/resources/compiler_ja.java \ - generated/com/sun/tools/javac/resources/compiler_zh_CN.java \ - generated/com/sun/tools/javac/resources/javac_zh_CN.java \ - generated/com/sun/tools/javac/resources/compiler.java \ - generated/com/sun/tools/javac/resources/javac_ja.java \ - generated/com/sun/tools/doclets/formats/html/resources/standard.java \ - generated/com/sun/tools/doclets/formats/html/resources/standard_ja.java \ - generated/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.java \ - generated/com/sun/tools/doclets/internal/toolkit/resources/doclets.java \ - generated/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.java \ - generated/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.java \ - generated/com/sun/tools/javadoc/resources/javadoc_ja.java \ - generated/com/sun/tools/javadoc/resources/javadoc_zh_CN.java \ - generated/com/sun/tools/javadoc/resources/javadoc.java \ - generated/com/sun/accessibility/internal/resources/accessibility_zh_HK.java \ - generated/com/sun/accessibility/internal/resources/accessibility_zh_CN.java \ - generated/com/sun/accessibility/internal/resources/accessibility_ja.java \ - generated/com/sun/accessibility/internal/resources/accessibility_it.java \ - generated/com/sun/accessibility/internal/resources/accessibility_de.java \ - generated/com/sun/accessibility/internal/resources/accessibility_ko.java \ - generated/com/sun/accessibility/internal/resources/accessibility_en.java \ - generated/com/sun/accessibility/internal/resources/accessibility.java \ - generated/com/sun/accessibility/internal/resources/accessibility_es.java \ - generated/com/sun/accessibility/internal/resources/accessibility_zh_TW.java \ - generated/com/sun/accessibility/internal/resources/accessibility_sv.java \ - generated/com/sun/accessibility/internal/resources/accessibility_fr.java \ - generated/org/omg/IOP/TaggedComponent.java \ - generated/org/omg/IOP/Codec.java \ - generated/org/omg/IOP/IORHelper.java \ - generated/org/omg/IOP/MultipleComponentProfileHolder.java \ - generated/org/omg/IOP/CodeSets.java \ - generated/org/omg/IOP/CodecFactory.java \ - generated/org/omg/IOP/TaggedProfileHelper.java \ - generated/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java \ - generated/org/omg/IOP/ServiceContextHelper.java \ - generated/org/omg/IOP/CodecFactoryHelper.java \ - generated/org/omg/IOP/CodecOperations.java \ - generated/org/omg/IOP/IORHolder.java \ - generated/org/omg/IOP/Encoding.java \ - generated/org/omg/IOP/ServiceContext.java \ - generated/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java \ - generated/org/omg/IOP/TAG_CODE_SETS.java \ - generated/org/omg/IOP/TaggedProfileHolder.java \ - generated/org/omg/IOP/ServiceIdHelper.java \ - generated/org/omg/IOP/ServiceContextHolder.java \ - generated/org/omg/IOP/TransactionService.java \ - generated/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java \ - generated/org/omg/IOP/CodecPackage/FormatMismatch.java \ - generated/org/omg/IOP/CodecPackage/FormatMismatchHelper.java \ - generated/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java \ - generated/org/omg/IOP/CodecPackage/TypeMismatchHelper.java \ - generated/org/omg/IOP/CodecPackage/TypeMismatch.java \ - generated/org/omg/IOP/TAG_INTERNET_IOP.java \ - generated/org/omg/IOP/TAG_ORB_TYPE.java \ - generated/org/omg/IOP/TaggedComponentHelper.java \ - generated/org/omg/IOP/TAG_JAVA_CODEBASE.java \ - generated/org/omg/IOP/ProfileIdHelper.java \ - generated/org/omg/IOP/IOR.java \ - generated/org/omg/IOP/ServiceContextListHelper.java \ - generated/org/omg/IOP/RMICustomMaxStreamFormat.java \ - generated/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java \ - generated/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java \ - generated/org/omg/IOP/TaggedComponentHolder.java \ - generated/org/omg/IOP/MultipleComponentProfileHelper.java \ - generated/org/omg/IOP/ENCODING_CDR_ENCAPS.java \ - generated/org/omg/IOP/TaggedProfile.java \ - generated/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java \ - generated/org/omg/IOP/TAG_POLICIES.java \ - generated/org/omg/IOP/ServiceContextListHolder.java \ - generated/org/omg/IOP/ExceptionDetailMessage.java \ - generated/org/omg/IOP/ComponentIdHelper.java \ - generated/org/omg/IOP/CodecFactoryOperations.java \ - generated/org/omg/CORBA/WStringSeqHelper.java \ - generated/org/omg/CORBA/StringSeqHelper.java \ - generated/org/omg/CORBA/WStringSeqHolder.java \ - generated/org/omg/CORBA/StringSeqHolder.java \ - generated/org/omg/CORBA/PolicyErrorHelper.java \ - generated/org/omg/CORBA/ParameterModeHelper.java \ - generated/org/omg/CORBA/ParameterMode.java \ - generated/org/omg/CORBA/PolicyErrorHolder.java \ - generated/org/omg/CORBA/ParameterModeHolder.java \ - generated/org/omg/CORBA/PolicyErrorCodeHelper.java \ - generated/org/omg/PortableInterceptor/ServerIdHelper.java \ - generated/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java \ - generated/org/omg/PortableInterceptor/PolicyFactoryOperations.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceFactory.java \ - generated/org/omg/PortableInterceptor/ACTIVE.java \ - generated/org/omg/PortableInterceptor/CurrentHelper.java \ - generated/org/omg/PortableInterceptor/IORInfo.java \ - generated/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \ - generated/org/omg/PortableInterceptor/AdapterStateHelper.java \ - generated/org/omg/PortableInterceptor/ClientRequestInfoOperations.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java \ - generated/org/omg/PortableInterceptor/RequestInfo.java \ - generated/org/omg/PortableInterceptor/ForwardRequest.java \ - generated/org/omg/PortableInterceptor/IORInfoOperations.java \ - generated/org/omg/PortableInterceptor/PolicyFactory.java \ - generated/org/omg/PortableInterceptor/ServerRequestInterceptor.java \ - generated/org/omg/PortableInterceptor/CurrentOperations.java \ - generated/org/omg/PortableInterceptor/IORInterceptor.java \ - generated/org/omg/PortableInterceptor/IORInterceptorOperations.java \ - generated/org/omg/PortableInterceptor/HOLDING.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \ - generated/org/omg/PortableInterceptor/ServerRequestInfoOperations.java \ - generated/org/omg/PortableInterceptor/DISCARDING.java \ - generated/org/omg/PortableInterceptor/ForwardRequestHelper.java \ - generated/org/omg/PortableInterceptor/ORBInitializerOperations.java \ - generated/org/omg/PortableInterceptor/USER_EXCEPTION.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java \ - generated/org/omg/PortableInterceptor/SUCCESSFUL.java \ - generated/org/omg/PortableInterceptor/ORBInitializer.java \ - generated/org/omg/PortableInterceptor/ORBInitInfoOperations.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \ - generated/org/omg/PortableInterceptor/ClientRequestInterceptor.java \ - generated/org/omg/PortableInterceptor/INACTIVE.java \ - generated/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \ - generated/org/omg/PortableInterceptor/ServerRequestInfo.java \ - generated/org/omg/PortableInterceptor/AdapterNameHelper.java \ - generated/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java \ - generated/org/omg/PortableInterceptor/LOCATION_FORWARD.java \ - generated/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java \ - generated/org/omg/PortableInterceptor/AdapterManagerIdHelper.java \ - generated/org/omg/PortableInterceptor/Current.java \ - generated/org/omg/PortableInterceptor/ORBInitInfo.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java \ - generated/org/omg/PortableInterceptor/ClientRequestInfo.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \ - generated/org/omg/PortableInterceptor/ObjectIdHelper.java \ - generated/org/omg/PortableInterceptor/NON_EXISTENT.java \ - generated/org/omg/PortableInterceptor/Interceptor.java \ - generated/org/omg/PortableInterceptor/InvalidSlot.java \ - generated/org/omg/PortableInterceptor/IORInterceptor_3_0.java \ - generated/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java \ - generated/org/omg/PortableInterceptor/RequestInfoOperations.java \ - generated/org/omg/PortableInterceptor/UNKNOWN.java \ - generated/org/omg/PortableInterceptor/InterceptorOperations.java \ - generated/org/omg/PortableInterceptor/ORBIdHelper.java \ - generated/org/omg/PortableInterceptor/InvalidSlotHelper.java \ - generated/org/omg/PortableInterceptor/ObjectReferenceTemplate.java \ - generated/org/omg/PortableInterceptor/TRANSPORT_RETRY.java \ - generated/org/omg/CosNaming/BindingListHelper.java \ - generated/org/omg/CosNaming/BindingTypeHolder.java \ - generated/org/omg/CosNaming/NameHolder.java \ - generated/org/omg/CosNaming/NamingContextExt.java \ - generated/org/omg/CosNaming/NamingContextPOA.java \ - generated/org/omg/CosNaming/BindingType.java \ - generated/org/omg/CosNaming/NamingContextExtHelper.java \ - generated/org/omg/CosNaming/_BindingIteratorStub.java \ - generated/org/omg/CosNaming/BindingIterator.java \ - generated/org/omg/CosNaming/BindingListHolder.java \ - generated/org/omg/CosNaming/_NamingContextStub.java \ - generated/org/omg/CosNaming/NamingContextExtHolder.java \ - generated/org/omg/CosNaming/IstringHelper.java \ - generated/org/omg/CosNaming/NameComponentHelper.java \ - generated/org/omg/CosNaming/BindingIteratorPOA.java \ - generated/org/omg/CosNaming/NamingContext.java \ - generated/org/omg/CosNaming/_NamingContextExtStub.java \ - generated/org/omg/CosNaming/NamingContextExtOperations.java \ - generated/org/omg/CosNaming/BindingHelper.java \ - generated/org/omg/CosNaming/BindingIteratorHelper.java \ - generated/org/omg/CosNaming/NamingContextHelper.java \ - generated/org/omg/CosNaming/NamingContextExtPOA.java \ - generated/org/omg/CosNaming/NameComponentHolder.java \ - generated/org/omg/CosNaming/BindingIteratorOperations.java \ - generated/org/omg/CosNaming/BindingTypeHelper.java \ - generated/org/omg/CosNaming/NameHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/CannotProceed.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \ - generated/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFound.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/InvalidName.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java \ - generated/org/omg/CosNaming/NamingContextPackage/NotEmpty.java \ - generated/org/omg/CosNaming/NamingContextOperations.java \ - generated/org/omg/CosNaming/Binding.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java \ - generated/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java \ - generated/org/omg/CosNaming/BindingHolder.java \ - generated/org/omg/CosNaming/BindingIteratorHolder.java \ - generated/org/omg/CosNaming/NamingContextHolder.java \ - generated/org/omg/CosNaming/NameComponent.java \ - generated/org/omg/Messaging/SYNC_WITH_TRANSPORT.java \ - generated/org/omg/Messaging/SyncScopeHelper.java \ - generated/org/omg/Dynamic/Parameter.java \ - generated/org/omg/DynamicAny/DynArrayHelper.java \ - generated/org/omg/DynamicAny/DynSequenceOperations.java \ - generated/org/omg/DynamicAny/DynStructHelper.java \ - generated/org/omg/DynamicAny/DynEnum.java \ - generated/org/omg/DynamicAny/DynAnySeqHelper.java \ - generated/org/omg/DynamicAny/DynFixed.java \ - generated/org/omg/DynamicAny/DynStruct.java \ - generated/org/omg/DynamicAny/DynArray.java \ - generated/org/omg/DynamicAny/_DynSequenceStub.java \ - generated/org/omg/DynamicAny/DynSequence.java \ - generated/org/omg/DynamicAny/DynFixedHelper.java \ - generated/org/omg/DynamicAny/NameValuePair.java \ - generated/org/omg/DynamicAny/DynAny.java \ - generated/org/omg/DynamicAny/DynEnumOperations.java \ - generated/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java \ - generated/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \ - generated/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java \ - generated/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java \ - generated/org/omg/DynamicAny/DynUnion.java \ - generated/org/omg/DynamicAny/_DynValueStub.java \ - generated/org/omg/DynamicAny/FieldNameHelper.java \ - generated/org/omg/DynamicAny/NameValuePairSeqHelper.java \ - generated/org/omg/DynamicAny/DynValueCommonOperations.java \ - generated/org/omg/DynamicAny/DynUnionHelper.java \ - generated/org/omg/DynamicAny/_DynUnionStub.java \ - generated/org/omg/DynamicAny/NameDynAnyPair.java \ - generated/org/omg/DynamicAny/DynValueBox.java \ - generated/org/omg/DynamicAny/DynSequenceHelper.java \ - generated/org/omg/DynamicAny/_DynFixedStub.java \ - generated/org/omg/DynamicAny/DynArrayOperations.java \ - generated/org/omg/DynamicAny/DynValueCommon.java \ - generated/org/omg/DynamicAny/DynAnyFactoryOperations.java \ - generated/org/omg/DynamicAny/DynValueBoxOperations.java \ - generated/org/omg/DynamicAny/DynAnyFactory.java \ - generated/org/omg/DynamicAny/_DynArrayStub.java \ - generated/org/omg/DynamicAny/NameDynAnyPairHelper.java \ - generated/org/omg/DynamicAny/DynUnionOperations.java \ - generated/org/omg/DynamicAny/DynValueHelper.java \ - generated/org/omg/DynamicAny/DynAnyOperations.java \ - generated/org/omg/DynamicAny/_DynAnyStub.java \ - generated/org/omg/DynamicAny/DynFixedOperations.java \ - generated/org/omg/DynamicAny/DynValue.java \ - generated/org/omg/DynamicAny/_DynStructStub.java \ - generated/org/omg/DynamicAny/NameValuePairHelper.java \ - generated/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \ - generated/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java \ - generated/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java \ - generated/org/omg/DynamicAny/AnySeqHelper.java \ - generated/org/omg/DynamicAny/_DynAnyFactoryStub.java \ - generated/org/omg/DynamicAny/_DynEnumStub.java \ - generated/org/omg/DynamicAny/DynAnyHelper.java \ - generated/org/omg/DynamicAny/DynStructOperations.java \ - generated/org/omg/DynamicAny/DynValueOperations.java \ - generated/org/omg/DynamicAny/DynAnyFactoryHelper.java \ - generated/org/omg/DynamicAny/DynEnumHelper.java \ - generated/org/omg/PortableServer/ThreadPolicy.java \ - generated/org/omg/PortableServer/LifespanPolicyValue.java \ - generated/org/omg/PortableServer/_ServantLocatorStub.java \ - generated/org/omg/PortableServer/AdapterActivator.java \ - generated/org/omg/PortableServer/ForwardRequest.java \ - generated/org/omg/PortableServer/CurrentPackage/NoContext.java \ - generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java \ - generated/org/omg/PortableServer/ServantManager.java \ - generated/org/omg/PortableServer/IdAssignmentPolicy.java \ - generated/org/omg/PortableServer/_ServantActivatorStub.java \ - generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java \ - generated/org/omg/PortableServer/LifespanPolicyOperations.java \ - generated/org/omg/PortableServer/CurrentOperations.java \ - generated/org/omg/PortableServer/POAManager.java \ - generated/org/omg/PortableServer/ServantLocatorOperations.java \ - generated/org/omg/PortableServer/ForwardRequestHelper.java \ - generated/org/omg/PortableServer/ServantRetentionPolicy.java \ - generated/org/omg/PortableServer/ServantRetentionPolicyValue.java \ - generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java \ - generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java \ - generated/org/omg/PortableServer/ServantManagerOperations.java \ - generated/org/omg/PortableServer/ServantLocatorPOA.java \ - generated/org/omg/PortableServer/ServantActivatorHelper.java \ - generated/org/omg/PortableServer/ImplicitActivationPolicy.java \ - generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java \ - generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java \ - generated/org/omg/PortableServer/THREAD_POLICY_ID.java \ - generated/org/omg/PortableServer/Current.java \ - generated/org/omg/PortableServer/ServantActivatorOperations.java \ - generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java \ - generated/org/omg/PortableServer/POAOperations.java \ - generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java \ - generated/org/omg/PortableServer/POAManagerPackage/State.java \ - generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java \ - generated/org/omg/PortableServer/IdAssignmentPolicyValue.java \ - generated/org/omg/PortableServer/ThreadPolicyValue.java \ - generated/org/omg/PortableServer/POA.java \ - generated/org/omg/PortableServer/ServantLocatorHelper.java \ - generated/org/omg/PortableServer/RequestProcessingPolicyValue.java \ - generated/org/omg/PortableServer/ServantActivator.java \ - generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java \ - generated/org/omg/PortableServer/ServantActivatorPOA.java \ - generated/org/omg/PortableServer/RequestProcessingPolicy.java \ - generated/org/omg/PortableServer/AdapterActivatorOperations.java \ - generated/org/omg/PortableServer/ThreadPolicyOperations.java \ - generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java \ - generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java \ - generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java \ - generated/org/omg/PortableServer/POAPackage/WrongPolicy.java \ - generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java \ - generated/org/omg/PortableServer/POAPackage/NoServant.java \ - generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java \ - generated/org/omg/PortableServer/POAPackage/NoServantHelper.java \ - generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java \ - generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java \ - generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java \ - generated/org/omg/PortableServer/POAPackage/WrongAdapter.java \ - generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java \ - generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java \ - generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java \ - generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java \ - generated/org/omg/PortableServer/POAPackage/ServantNotActive.java \ - generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java \ - generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java \ - generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java \ - generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java \ - generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \ - generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java \ - generated/org/omg/PortableServer/IdUniquenessPolicyValue.java \ - generated/org/omg/PortableServer/POAManagerOperations.java \ - generated/org/omg/PortableServer/LifespanPolicy.java \ - generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java \ - generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java \ - generated/org/omg/PortableServer/ServantLocator.java \ - generated/org/omg/PortableServer/IdUniquenessPolicy.java \ - generated/sun/awt/X11/XSelectionEvent.java \ - generated/sun/awt/X11/XWindowAttributes.java \ - generated/sun/awt/X11/XGCValues.java \ - generated/sun/awt/X11/XCreateWindowEvent.java \ - generated/sun/awt/X11/XMapEvent.java \ - generated/sun/awt/X11/XdbeSwapInfo.java \ - generated/sun/awt/X11/XIMCallback.java \ - generated/sun/awt/X11/XPoint.java \ - generated/sun/awt/X11/awtImageData.java \ - generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java \ - generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java \ - generated/sun/awt/X11/XColormapEvent.java \ - generated/sun/awt/X11/XImage.java \ - generated/sun/awt/X11/XNoExposeEvent.java \ - generated/sun/awt/X11/Depth.java \ - generated/sun/awt/X11/XSelectionClearEvent.java \ - generated/sun/awt/X11/XResizeRequestEvent.java \ - generated/sun/awt/X11/XIMText.java \ - generated/sun/awt/X11/XAnyEvent.java \ - generated/sun/awt/X11/XGraphicsExposeEvent.java \ - generated/sun/awt/X11/XReparentEvent.java \ - generated/sun/awt/X11/Screen.java \ - generated/sun/awt/X11/XmbTextItem.java \ - generated/sun/awt/X11/XErrorEvent.java \ - generated/sun/awt/X11/XIMHotKeyTrigger.java \ - generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ - generated/sun/awt/X11/XKeyboardControl.java \ - generated/sun/awt/X11/XPixmapFormatValues.java \ - generated/sun/awt/X11/XIMStyles.java \ - generated/sun/awt/X11/ColorEntry.java \ - generated/sun/awt/X11/XExposeEvent.java \ - generated/sun/awt/X11/XHostAddress.java \ - generated/sun/awt/X11/PropMwmHints.java \ - generated/sun/awt/X11/XCirculateRequestEvent.java \ - generated/sun/awt/X11/XWindowChanges.java \ - generated/sun/awt/X11/XwcTextItem.java \ - generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java \ - generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java \ - generated/sun/awt/X11/XMotionEvent.java \ - generated/sun/awt/X11/ScreenFormat.java \ - generated/sun/awt/X11/XVisualInfo.java \ - generated/sun/awt/X11/XOMCharSetList.java \ - generated/sun/awt/X11/XIMValuesList.java \ - generated/sun/awt/X11/XStandardColormap.java \ - generated/sun/awt/X11/XVisibilityEvent.java \ - generated/sun/awt/X11/XCrossingEvent.java \ - generated/sun/awt/X11/XButtonEvent.java \ - generated/sun/awt/X11/AwtGraphicsConfigData.java \ - generated/sun/awt/X11/XComposeStatus.java \ - generated/sun/awt/X11/XModifierKeymap.java \ - generated/sun/awt/X11/XCharStruct.java \ - generated/sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ - generated/sun/awt/X11/generator/sizer.32.c \ - generated/sun/awt/X11/generator/sizer.64.c \ - generated/sun/awt/X11/generator/sizer.32 \ - generated/sun/awt/X11/generator/sizer.64 \ - generated/sun/awt/X11/generator/sizes.32 \ - generated/sun/awt/X11/generator/sizes.64 \ - generated/sun/awt/X11/AwtScreenData.java \ - generated/sun/awt/X11/XDestroyWindowEvent.java \ - generated/sun/awt/X11/XChar2b.java \ - generated/sun/awt/X11/Visual.java \ - generated/sun/awt/X11/XMapRequestEvent.java \ - generated/sun/awt/X11/XOMOrientation.java \ - generated/sun/awt/X11/ColorData.java \ - generated/sun/awt/X11/XUnmapEvent.java \ - generated/sun/awt/X11/XRectangle.java \ - generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java \ - generated/sun/awt/X11/XExtCodes.java \ - generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java \ - generated/sun/awt/X11/XIMHotKeyTriggers.java \ - generated/sun/awt/X11/XFontStruct.java \ - generated/sun/awt/X11/XConfigureRequestEvent.java \ - generated/sun/awt/X11/XKeyEvent.java \ - generated/sun/awt/X11/XColor.java \ - generated/sun/awt/X11/XFontProp.java \ - generated/sun/awt/X11/XArc.java \ - generated/sun/awt/X11/XFocusChangeEvent.java \ - generated/sun/awt/X11/XKeymapEvent.java \ - generated/sun/awt/X11/XClientMessageEvent.java \ - generated/sun/awt/X11/XExtData.java \ - generated/sun/awt/X11/XConfigureEvent.java \ - generated/sun/awt/X11/XKeyboardState.java \ - generated/sun/awt/X11/XGravityEvent.java \ - generated/sun/awt/X11/XOMFontInfo.java \ - generated/sun/awt/X11/XSizeHints.java \ - generated/sun/awt/X11/XTextItem.java \ - generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java \ - generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java \ - generated/sun/awt/X11/XSegment.java \ - generated/sun/awt/X11/XIMStringConversionText.java \ - generated/sun/awt/X11/XMappingEvent.java \ - generated/sun/awt/X11/XTimeCoord.java \ - generated/sun/awt/X11/XIMStringConversionCallbackStruct.java \ - generated/sun/awt/X11/XTextItem16.java \ - generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ - generated/sun/awt/X11/XClassHint.java \ - generated/sun/awt/X11/XTextProperty.java \ - generated/sun/awt/X11/XIconSize.java \ - generated/sun/awt/X11/XFontSetExtents.java \ - generated/sun/awt/X11/XSetWindowAttributes.java \ - generated/sun/awt/X11/XPropertyEvent.java \ - generated/sun/awt/X11/XEvent.java \ - generated/sun/awt/X11/XSelectionRequestEvent.java \ - generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java \ - generated/sun/awt/X11/XWMHints.java \ - generated/sun/awt/X11/XCirculateEvent.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_bw16_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_bw24_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_bw32_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_bw48_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_interim16_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_interim24_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_interim32_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_interim48_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_yellow16_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_yellow24_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_yellow32_png.java \ - generated/sun/awt/X11/XAWTIcon32_security_icon_yellow48_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_bw16_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_bw24_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_bw32_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_bw48_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_interim16_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_interim24_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_interim32_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_interim48_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_yellow16_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_yellow24_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_yellow32_png.java \ - generated/sun/awt/X11/XAWTIcon64_security_icon_yellow48_png.java \ - generated/sun/awt/X11/XkbAccessXNotifyEvent.java \ - generated/sun/awt/X11/XkbActionMessageEvent.java \ - generated/sun/awt/X11/XkbAnyEvent.java \ - generated/sun/awt/X11/XkbBellNotifyEvent.java \ - generated/sun/awt/X11/XkbCompatMapNotifyEvent.java \ - generated/sun/awt/X11/XkbControlsNotifyEvent.java \ - generated/sun/awt/X11/XkbEvent.java \ - generated/sun/awt/X11/XkbExtensionDeviceNotifyEvent.java \ - generated/sun/awt/X11/XkbIndicatorNotifyEvent.java \ - generated/sun/awt/X11/XkbMapNotifyEvent.java \ - generated/sun/awt/X11/XkbNamesNotifyEvent.java \ - generated/sun/awt/X11/XkbNewKeyboardNotifyEvent.java \ - generated/sun/awt/X11/XkbStateNotifyEvent.java \ - generated/sun/awt/resources/awt_sv.java \ - generated/sun/awt/resources/awt_fr.java \ - generated/sun/awt/resources/awt.java \ - generated/sun/awt/resources/awt_ja.java \ - generated/sun/awt/resources/awt_zh_TW.java \ - generated/sun/awt/resources/awt_it.java \ - generated/sun/awt/resources/awt_zh_HK.java \ - generated/sun/awt/resources/awt_de.java \ - generated/sun/awt/resources/awt_ko.java \ - generated/sun/awt/resources/awt_zh_CN.java \ - generated/sun/awt/resources/awt_es.java \ - generated/sun/nio/ch/SocketOptionRegistry.java \ - generated/sun/nio/ch/AlreadyBoundException.java \ - generated/sun/nio/cs/StandardCharsets.java \ - generated/sun/misc/Version.java \ - generated/sun/util/LocaleDataMetaInfo.java \ - generated/sun/util/logging/resources/logging_de.java \ - generated/sun/util/logging/resources/logging_ko.java \ - generated/sun/util/logging/resources/logging_es.java \ - generated/sun/util/logging/resources/logging_sv.java \ - generated/sun/util/logging/resources/logging_fr.java \ - generated/sun/util/logging/resources/logging_zh_TW.java \ - generated/sun/util/logging/resources/logging_zh_HK.java \ - generated/sun/util/logging/resources/logging_ja.java \ - generated/sun/util/logging/resources/logging_zh_CN.java \ - generated/sun/util/logging/resources/logging.java \ - generated/sun/util/logging/resources/logging_it.java \ - generated/sun/util/CoreResourceBundleControl.java \ - generated/sun/util/resources/CurrencyNames_es_SV.java \ - generated/sun/util/resources/LocaleNames_ca.java \ - generated/sun/util/resources/LocaleNames_ja.java \ - generated/sun/util/resources/CalendarData_cs.java \ - generated/sun/util/resources/CurrencyNames_ar_JO.java \ - generated/sun/util/resources/CurrencyNames_no_NO.java \ - generated/sun/util/resources/CurrencyNames_sv_SE.java \ - generated/sun/util/resources/LocaleNames_pl.java \ - generated/sun/util/resources/LocaleNames_in.java \ - generated/sun/util/resources/CurrencyNames_en_GB.java \ - generated/sun/util/resources/CurrencyNames_it_CH.java \ - generated/sun/util/resources/CurrencyNames_de_AT.java \ - generated/sun/util/resources/CurrencyNames_fr_CA.java \ - generated/sun/util/resources/CurrencyNames_it_IT.java \ - generated/sun/util/resources/CurrencyNames_ar_YE.java \ - generated/sun/util/resources/CurrencyNames_es_NI.java \ - generated/sun/util/resources/CurrencyNames_da_DK.java \ - generated/sun/util/resources/CurrencyNames_ca_ES.java \ - generated/sun/util/resources/LocaleNames_el_CY.java \ - generated/sun/util/resources/LocaleNames_is.java \ - generated/sun/util/resources/CurrencyNames_zh_TW.java \ - generated/sun/util/resources/CurrencyNames_el_GR.java \ - generated/sun/util/resources/LocaleNames_it.java \ - generated/sun/util/resources/CalendarData_ko.java \ - generated/sun/util/resources/CurrencyNames_ja.java \ - generated/sun/util/resources/LocaleNames_da.java \ - generated/sun/util/resources/CurrencyNames_es_MX.java \ - generated/sun/util/resources/CurrencyNames_ar_LB.java \ - generated/sun/util/resources/LocaleNames_pt.java \ - generated/sun/util/resources/CurrencyNames_ms_MY.java \ - generated/sun/util/resources/CurrencyNames_en_MT.java \ - generated/sun/util/resources/CurrencyNames_ar_SA.java \ - generated/sun/util/resources/CalendarData_ro.java \ - generated/sun/util/resources/LocaleNames_iw.java \ - generated/sun/util/resources/CurrencyNames_fr_CH.java \ - generated/sun/util/resources/CurrencyNames_pl_PL.java \ - generated/sun/util/resources/CurrencyNames_de_CH.java \ - generated/sun/util/resources/CurrencyNames_ar_EG.java \ - generated/sun/util/resources/CurrencyNames_ar_SD.java \ - generated/sun/util/resources/LocaleNames_de.java \ - generated/sun/util/resources/CalendarData_el_CY.java \ - generated/sun/util/resources/CurrencyNames_es_VE.java \ - generated/sun/util/resources/CurrencyNames_es_GT.java \ - generated/sun/util/resources/CurrencyNames_cs_CZ.java \ - generated/sun/util/resources/CalendarData_el.java \ - generated/sun/util/resources/CalendarData_mt_MT.java \ - generated/sun/util/resources/CalendarData_zh.java \ - generated/sun/util/resources/LocaleNames_zh_SG.java \ - generated/sun/util/resources/CurrencyNames_sr_BA.java \ - generated/sun/util/resources/LocaleNames_cs.java \ - generated/sun/util/resources/CalendarData_ru.java \ - generated/sun/util/resources/CurrencyNames_it.java \ - generated/sun/util/resources/CalendarData_en.java \ - generated/sun/util/resources/CurrencyNames_es_US.java \ - generated/sun/util/resources/CalendarData_sk.java \ - generated/sun/util/resources/CurrencyNames_lt_LT.java \ - generated/sun/util/resources/CurrencyNames_hu_HU.java \ - generated/sun/util/resources/CalendarData_sl.java \ - generated/sun/util/resources/CurrencyNames_ar_MA.java \ - generated/sun/util/resources/CurrencyNames_ar_KW.java \ - generated/sun/util/resources/CurrencyNames_es_PA.java \ - generated/sun/util/resources/CurrencyNames_es_HN.java \ - generated/sun/util/resources/CurrencyNames_de_DE.java \ - generated/sun/util/resources/CurrencyNames_ru_RU.java \ - generated/sun/util/resources/CurrencyNames_nl_NL.java \ - generated/sun/util/resources/CurrencyNames_et_EE.java \ - generated/sun/util/resources/CurrencyNames_ar_DZ.java \ - generated/sun/util/resources/CurrencyNames_en_US.java \ - generated/sun/util/resources/CurrencyNames_sl_SI.java \ - generated/sun/util/resources/CalendarData_es.java \ - generated/sun/util/resources/CurrencyNames_de.java \ - generated/sun/util/resources/CurrencyNames_mk_MK.java \ - generated/sun/util/resources/CurrencyNames_es_AR.java \ - generated/sun/util/resources/LocaleNames_pt_BR.java \ - generated/sun/util/resources/CalendarData_fi.java \ - generated/sun/util/resources/CalendarData_et.java \ - generated/sun/util/resources/CurrencyNames_es_UY.java \ - generated/sun/util/resources/CalendarData_sq.java \ - generated/sun/util/resources/LocaleNames_en_SG.java \ - generated/sun/util/resources/CurrencyNames_tr_TR.java \ - generated/sun/util/resources/CurrencyNames_es_PE.java \ - generated/sun/util/resources/CalendarData_sr.java \ - generated/sun/util/resources/CalendarData_lt.java \ - generated/sun/util/resources/LocaleNames_ko.java \ - generated/sun/util/resources/CalendarData_th.java \ - generated/sun/util/resources/CurrencyNames_in_ID.java \ - generated/sun/util/resources/CalendarData_mk.java \ - generated/sun/util/resources/LocaleNames_ro.java \ - generated/sun/util/resources/CalendarData_lv.java \ - generated/sun/util/resources/CurrencyNames_en_IE.java \ - generated/sun/util/resources/CurrencyNames_en_NZ.java \ - generated/sun/util/resources/LocaleNames_pt_PT.java \ - generated/sun/util/resources/CalendarData_sv.java \ - generated/sun/util/resources/CurrencyNames_hi_IN.java \ - generated/sun/util/resources/CurrencyNames_fi_FI.java \ - generated/sun/util/resources/CurrencyNames.java \ - generated/sun/util/resources/CurrencyNames_lv_LV.java \ - generated/sun/util/resources/CurrencyNames_th_TH.java \ - generated/sun/util/resources/CurrencyNames_en_AU.java \ - generated/sun/util/resources/CurrencyNames_es_BO.java \ - generated/sun/util/resources/CurrencyNames_uk_UA.java \ - generated/sun/util/resources/LocaleNames_el.java \ - generated/sun/util/resources/CurrencyNames_en_PH.java \ - generated/sun/util/resources/LocaleNames_zh.java \ - generated/sun/util/resources/CalendarData_fr.java \ - generated/sun/util/resources/CurrencyNames_ar_LY.java \ - generated/sun/util/resources/CurrencyNames_en_CA.java \ - generated/sun/util/resources/LocaleNames_ru.java \ - generated/sun/util/resources/LocaleNames_en.java \ - generated/sun/util/resources/CurrencyNames_nl_BE.java \ - generated/sun/util/resources/LocaleNames_sk.java \ - generated/sun/util/resources/CurrencyNames_ko.java \ - generated/sun/util/resources/CurrencyNames_ar_TN.java \ - generated/sun/util/resources/CurrencyNames_ar_SY.java \ - generated/sun/util/resources/LocaleNames_sl.java \ - generated/sun/util/resources/CurrencyNames_ga_IE.java \ - generated/sun/util/resources/CalendarData_tr.java \ - generated/sun/util/resources/CalendarData_mt.java \ - generated/sun/util/resources/CalendarData_es_ES.java \ - generated/sun/util/resources/CurrencyNames_en_IN.java \ - generated/sun/util/resources/CurrencyNames_is_IS.java \ - generated/sun/util/resources/CalendarData_pt_PT.java \ - generated/sun/util/resources/CurrencyNames_es_PR.java \ - generated/sun/util/resources/CurrencyNames_zh_CN.java \ - generated/sun/util/resources/CurrencyNames_hr_HR.java \ - generated/sun/util/resources/CurrencyNames_ja_JP.java \ - generated/sun/util/resources/LocaleNames_es.java \ - generated/sun/util/resources/CalendarData_nl.java \ - generated/sun/util/resources/CurrencyNames_es_CL.java \ - generated/sun/util/resources/LocaleNames_fi.java \ - generated/sun/util/resources/CalendarData_uk.java \ - generated/sun/util/resources/LocaleNames_et.java \ - generated/sun/util/resources/LocaleNames_sq.java \ - generated/sun/util/resources/LocaleNames_sr.java \ - generated/sun/util/resources/LocaleNames_lt.java \ - generated/sun/util/resources/CalendarData_no.java \ - generated/sun/util/resources/LocaleNames_th.java \ - generated/sun/util/resources/CurrencyNames_es_CO.java \ - generated/sun/util/resources/LocaleNames_ga.java \ - generated/sun/util/resources/LocaleNames_mk.java \ - generated/sun/util/resources/LocaleNames_lv.java \ - generated/sun/util/resources/LocaleNames_zh_TW.java \ - generated/sun/util/resources/CurrencyNames_ar_AE.java \ - generated/sun/util/resources/CurrencyNames_es_PY.java \ - generated/sun/util/resources/LocaleNames_sv.java \ - generated/sun/util/resources/CurrencyNames_es_CR.java \ - generated/sun/util/resources/CalendarData_en_GB.java \ - generated/sun/util/resources/CalendarData_hi.java \ - generated/sun/util/resources/CurrencyNames_sr_CS.java \ - generated/sun/util/resources/LocaleNames_en_MT.java \ - generated/sun/util/resources/CurrencyNames_el_CY.java \ - generated/sun/util/resources/CurrencyNames_fr_LU.java \ - generated/sun/util/resources/CalendarData_fr_CA.java \ - generated/sun/util/resources/CurrencyNames_es.java \ - generated/sun/util/resources/CurrencyNames_mt_MT.java \ - generated/sun/util/resources/CalendarData_vi.java \ - generated/sun/util/resources/LocaleNames_fr.java \ - generated/sun/util/resources/CurrencyNames_de_LU.java \ - generated/sun/util/resources/CurrencyNames_bg_BG.java \ - generated/sun/util/resources/CurrencyNames_sq_AL.java \ - generated/sun/util/resources/CurrencyNames_iw_IL.java \ - generated/sun/util/resources/LocaleNames_ms.java \ - generated/sun/util/resources/CalendarData.java \ - generated/sun/util/resources/CalendarData_be.java \ - generated/sun/util/resources/LocaleNames_tr.java \ - generated/sun/util/resources/LocaleNames_mt.java \ - generated/sun/util/resources/CurrencyNames_ro_RO.java \ - generated/sun/util/resources/CurrencyNames_es_EC.java \ - generated/sun/util/resources/CurrencyNames_es_DO.java \ - generated/sun/util/resources/CalendarData_bg.java \ - generated/sun/util/resources/LocaleNames_es_US.java \ - generated/sun/util/resources/CalendarData_ar.java \ - generated/sun/util/resources/CalendarData_ms_MY.java \ - generated/sun/util/resources/CurrencyNames_ar_OM.java \ - generated/sun/util/resources/CalendarData_en_MT.java \ - generated/sun/util/resources/CurrencyNames_fr_FR.java \ - generated/sun/util/resources/CurrencyNames_sv.java \ - generated/sun/util/resources/CalendarData_hr.java \ - generated/sun/util/resources/LocaleNames_nl.java \ - generated/sun/util/resources/LocaleNames_uk.java \ - generated/sun/util/resources/CurrencyNames_be_BY.java \ - generated/sun/util/resources/CurrencyNames_ar_BH.java \ - generated/sun/util/resources/CurrencyNames_sk_SK.java \ - generated/sun/util/resources/CalendarData_hu.java \ - generated/sun/util/resources/LocaleNames_no.java \ - generated/sun/util/resources/CurrencyNames_fr.java \ - generated/sun/util/resources/CalendarData_ca.java \ - generated/sun/util/resources/CurrencyNames_en_ZA.java \ - generated/sun/util/resources/CalendarData_ja.java \ - generated/sun/util/resources/CalendarData_es_US.java \ - generated/sun/util/resources/CalendarData_pl.java \ - generated/sun/util/resources/LocaleNames_hi.java \ - generated/sun/util/resources/LocaleNames.java \ - generated/sun/util/resources/CurrencyNames_pt_BR.java \ - generated/sun/util/resources/CurrencyNames_vi_VN.java \ - generated/sun/util/resources/CurrencyNames_en_SG.java \ - generated/sun/util/resources/CurrencyNames_ar_QA.java \ - generated/sun/util/resources/LocaleNames_vi.java \ - generated/sun/util/resources/CurrencyNames_sr_ME.java \ - generated/sun/util/resources/CurrencyNames_de_GR.java \ - generated/sun/util/resources/CalendarData_is.java \ - generated/sun/util/resources/CurrencyNames_ko_KR.java \ - generated/sun/util/resources/LocaleNames_be.java \ - generated/sun/util/resources/CurrencyNames_ar_IQ.java \ - generated/sun/util/resources/CalendarData_it.java \ - generated/sun/util/resources/LocaleNames_en_PH.java \ - generated/sun/util/resources/CurrencyNames_es_ES.java \ - generated/sun/util/resources/CurrencyNames_pt_PT.java \ - generated/sun/util/resources/CalendarData_in_ID.java \ - generated/sun/util/resources/CalendarData_da.java \ - generated/sun/util/resources/LocaleNames_bg.java \ - generated/sun/util/resources/LocaleNames_ar.java \ - generated/sun/util/resources/CalendarData_pt.java \ - generated/sun/util/resources/CalendarData_en_IE.java \ - generated/sun/util/resources/CalendarData_iw.java \ - generated/sun/util/resources/LocaleNames_hr.java \ - generated/sun/util/resources/CurrencyNames_fr_BE.java \ - generated/sun/util/resources/CalendarData_de.java \ - generated/sun/util/resources/LocaleNames_hu.java \ - generated/sun/print/resources/serviceui_fr.java \ - generated/sun/print/resources/serviceui_zh_CN.java \ - generated/sun/print/resources/serviceui.java \ - generated/sun/print/resources/serviceui_ja.java \ - generated/sun/print/resources/serviceui_it.java \ - generated/sun/print/resources/serviceui_de.java \ - generated/sun/print/resources/serviceui_ko.java \ - generated/sun/print/resources/serviceui_zh_TW.java \ - generated/sun/print/resources/serviceui_zh_HK.java \ - generated/sun/print/resources/serviceui_es.java \ - generated/sun/print/resources/serviceui_sv.java \ - generated/sun/tools/jar/resources/jar_sv.java \ - generated/sun/tools/jar/resources/jar_zh_CN.java \ - generated/sun/tools/jar/resources/jar_fr.java \ - generated/sun/tools/jar/resources/jar_ja.java \ - generated/sun/tools/jar/resources/jar_it.java \ - generated/sun/tools/jar/resources/jar_de.java \ - generated/sun/tools/jar/resources/jar.java \ - generated/sun/tools/jar/resources/jar_zh_TW.java \ - generated/sun/tools/jar/resources/jar_zh_HK.java \ - generated/sun/tools/jar/resources/jar_ko.java \ - generated/sun/tools/jar/resources/jar_es.java \ - generated/sun/tools/jconsole/Version.java \ - generated/sun/management/resources/agent_it.java \ - generated/sun/management/resources/agent_de.java \ - generated/sun/management/resources/agent_zh_CN.java \ - generated/sun/management/resources/agent.java \ - generated/sun/management/resources/agent_ko.java \ - generated/sun/management/resources/agent_es.java \ - generated/sun/management/resources/agent_sv.java \ - generated/sun/management/resources/agent_fr.java \ - generated/sun/management/resources/agent_zh_TW.java \ - generated/sun/management/resources/agent_zh_HK.java \ - generated/sun/management/resources/agent_ja.java \ - generated/java/nio/HeapCharBufferR.java \ - generated/java/nio/DirectCharBufferS.java \ - generated/java/nio/ByteBufferAsDoubleBufferRB.java \ - generated/java/nio/DirectCharBufferU.java \ - generated/java/nio/ByteBufferAsShortBufferL.java \ - generated/java/nio/HeapByteBuffer.java \ - generated/java/nio/HeapCharBuffer.java \ - generated/java/nio/FloatBuffer.java \ - generated/java/nio/ByteBufferAsDoubleBufferRL.java \ - generated/java/nio/ReadOnlyBufferException.java \ - generated/java/nio/DirectDoubleBufferRS.java \ - generated/java/nio/DirectIntBufferS.java \ - generated/java/nio/DirectDoubleBufferRU.java \ - generated/java/nio/DirectIntBufferU.java \ - generated/java/nio/InvalidMarkException.java \ - generated/java/nio/channels/NonWritableChannelException.java \ - generated/java/nio/channels/AsynchronousCloseException.java \ - generated/java/nio/channels/ConnectionPendingException.java \ - generated/java/nio/channels/AlreadyConnectedException.java \ - generated/java/nio/channels/FileLockInterruptionException.java \ - generated/java/nio/channels/ClosedSelectorException.java \ - generated/java/nio/channels/UnresolvedAddressException.java \ - generated/java/nio/channels/NotYetBoundException.java \ - generated/java/nio/channels/IllegalBlockingModeException.java \ - generated/java/nio/channels/UnsupportedAddressTypeException.java \ - generated/java/nio/channels/NotYetConnectedException.java \ - generated/java/nio/channels/AlreadyBoundException.java \ - generated/java/nio/channels/NonReadableChannelException.java \ - generated/java/nio/channels/CancelledKeyException.java \ - generated/java/nio/channels/NoConnectionPendingException.java \ - generated/java/nio/channels/ClosedChannelException.java \ - generated/java/nio/channels/IllegalSelectorException.java \ - generated/java/nio/channels/OverlappingFileLockException.java \ - generated/java/nio/channels/ClosedByInterruptException.java \ - generated/java/nio/ByteBuffer.java \ - generated/java/nio/HeapLongBuffer.java \ - generated/java/nio/DirectCharBufferRS.java \ - generated/java/nio/HeapDoubleBufferR.java \ - generated/java/nio/CharBuffer.java \ - generated/java/nio/DirectCharBufferRU.java \ - generated/java/nio/HeapDoubleBuffer.java \ - generated/java/nio/ByteBufferAsIntBufferRB.java \ - generated/java/nio/DirectFloatBufferS.java \ - generated/java/nio/DirectFloatBufferU.java \ - generated/java/nio/ByteBufferAsCharBufferRB.java \ - generated/java/nio/DirectByteBufferR.java \ - generated/java/nio/HeapIntBuffer.java \ - generated/java/nio/HeapByteBufferR.java \ - generated/java/nio/ByteBufferAsFloatBufferRB.java \ - generated/java/nio/IntBuffer.java \ - generated/java/nio/ByteBufferAsShortBufferRB.java \ - generated/java/nio/ByteBufferAsIntBufferRL.java \ - generated/java/nio/LongBuffer.java \ - generated/java/nio/DirectLongBufferRS.java \ - generated/java/nio/HeapFloatBufferR.java \ - generated/java/nio/ByteBufferAsFloatBufferB.java \ - generated/java/nio/DirectLongBufferRU.java \ - generated/java/nio/DirectIntBufferRS.java \ - generated/java/nio/HeapShortBuffer.java \ - generated/java/nio/ByteBufferAsDoubleBufferB.java \ - generated/java/nio/ByteBufferAsCharBufferRL.java \ - generated/java/nio/DirectIntBufferRU.java \ - generated/java/nio/ByteBufferAsFloatBufferRL.java \ - generated/java/nio/DirectByteBuffer.java \ - generated/java/nio/ByteBufferAsShortBufferRL.java \ - generated/java/nio/HeapIntBufferR.java \ - generated/java/nio/ByteBufferAsLongBufferRB.java \ - generated/java/nio/BufferUnderflowException.java \ - generated/java/nio/ByteBufferAsFloatBufferL.java \ - generated/java/nio/ByteBufferAsIntBufferB.java \ - generated/java/nio/ByteBufferAsDoubleBufferL.java \ - generated/java/nio/ByteBufferAsLongBufferB.java \ - generated/java/nio/DirectShortBufferS.java \ - generated/java/nio/ByteBufferAsLongBufferRL.java \ - generated/java/nio/DirectFloatBufferRS.java \ - generated/java/nio/DirectShortBufferU.java \ - generated/java/nio/ByteBufferAsCharBufferB.java \ - generated/java/nio/ShortBuffer.java \ - generated/java/nio/DirectFloatBufferRU.java \ - generated/java/nio/DirectShortBufferRS.java \ - generated/java/nio/ByteBufferAsIntBufferL.java \ - generated/java/nio/DirectShortBufferRU.java \ - generated/java/nio/DoubleBuffer.java \ - generated/java/nio/ByteBufferAsLongBufferL.java \ - generated/java/nio/BufferOverflowException.java \ - generated/java/nio/HeapShortBufferR.java \ - generated/java/nio/DirectDoubleBufferS.java \ - generated/java/nio/ByteBufferAsShortBufferB.java \ - generated/java/nio/HeapFloatBuffer.java \ - generated/java/nio/DirectDoubleBufferU.java \ - generated/java/nio/HeapLongBufferR.java \ - generated/java/nio/DirectLongBufferS.java \ - generated/java/nio/charset/CharsetDecoder.java \ - generated/java/nio/charset/IllegalCharsetNameException.java \ - generated/java/nio/charset/CharacterCodingException.java \ - generated/java/nio/charset/CharsetEncoder.java \ - generated/java/nio/charset/UnsupportedCharsetException.java \ - generated/java/nio/ByteBufferAsCharBufferL.java \ - generated/java/nio/DirectLongBufferU.java \ - generated/java/lang/CharacterData00.java \ - generated/java/lang/CharacterData01.java \ - generated/java/lang/CharacterData02.java \ - generated/java/lang/CharacterDataUndefined.java \ - generated/java/lang/CharacterData0E.java \ - generated/java/lang/CharacterDataPrivateUse.java \ - generated/java/lang/CharacterDataLatin1.java \ - generated/java/lang/UNIXProcess.java \ - generated/java/util/CurrencyData.java \ - generated/javax/management/remote/rmi/RMIConnectionImpl_Stub.java \ - generated/javax/management/remote/rmi/RMIServerImpl_Stub.java \ - generated/fontconfig/fontconfig.Fedora.bfc \ - generated/fontconfig/fontconfig.SuSE.bfc \ - generated/fontconfig/fontconfig.Ubuntu.bfc \ - generated/fontconfig/fontconfig.bfc \ - generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ButtonPainter.java \ - generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java \ - generated/javax/swing/plaf/nimbus/CheckBoxPainter.java \ - generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java \ - generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java \ - generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java \ - generated/javax/swing/plaf/nimbus/ComboBoxPainter.java \ - generated/javax/swing/plaf/nimbus/DesktopIconPainter.java \ - generated/javax/swing/plaf/nimbus/DesktopPanePainter.java \ - generated/javax/swing/plaf/nimbus/EditorPanePainter.java \ - generated/javax/swing/plaf/nimbus/FileChooserPainter.java \ - generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java \ - generated/javax/swing/plaf/nimbus/InternalFramePainter.java \ - generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java \ - generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java \ - generated/javax/swing/plaf/nimbus/MenuBarPainter.java \ - generated/javax/swing/plaf/nimbus/MenuItemPainter.java \ - generated/javax/swing/plaf/nimbus/MenuPainter.java \ - generated/javax/swing/plaf/nimbus/NimbusDefaults.java \ - generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java \ - generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java \ - generated/javax/swing/plaf/nimbus/OptionPanePainter.java \ - generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java \ - generated/javax/swing/plaf/nimbus/PopupMenuPainter.java \ - generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java \ - generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java \ - generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java \ - generated/javax/swing/plaf/nimbus/ProgressBarPainter.java \ - generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java \ - generated/javax/swing/plaf/nimbus/RadioButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ScrollBarPainter.java \ - generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java \ - generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java \ - generated/javax/swing/plaf/nimbus/ScrollPanePainter.java \ - generated/javax/swing/plaf/nimbus/SeparatorPainter.java \ - generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java \ - generated/javax/swing/plaf/nimbus/SliderPainter.java \ - generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java \ - generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java \ - generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java \ - generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java \ - generated/javax/swing/plaf/nimbus/SpinnerPainter.java \ - generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java \ - generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java \ - generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java \ - generated/javax/swing/plaf/nimbus/SplitPanePainter.java \ - generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java \ - generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java \ - generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java \ - generated/javax/swing/plaf/nimbus/TabbedPanePainter.java \ - generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java \ - generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java \ - generated/javax/swing/plaf/nimbus/TableEditorPainter.java \ - generated/javax/swing/plaf/nimbus/TableHeaderPainter.java \ - generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java \ - generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java \ - generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java \ - generated/javax/swing/plaf/nimbus/TextAreaPainter.java \ - generated/javax/swing/plaf/nimbus/TextFieldPainter.java \ - generated/javax/swing/plaf/nimbus/TextPanePainter.java \ - generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ToolBarEastState.java \ - generated/javax/swing/plaf/nimbus/ToolBarNorthState.java \ - generated/javax/swing/plaf/nimbus/ToolBarPainter.java \ - generated/javax/swing/plaf/nimbus/ToolBarSouthState.java \ - generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java \ - generated/javax/swing/plaf/nimbus/ToolBarWestState.java \ - generated/javax/swing/plaf/nimbus/ToolTipPainter.java \ - generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java \ - generated/javax/swing/plaf/nimbus/TreePainter.java \ - generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java +# Patches for when java.util.Scanner is missing +# or has the bug #40630 (all these classes rely +# on Scanner#hasNextLine() looping behaviour) +SCANNER_PATCHES = patches/boot/icedtea-spp.patch \ + patches/boot/icedtea-sbcs.patch \ + patches/boot/icedtea-dbcs.patch + +if LACKS_JAVA_UTIL_SCANNER +ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES) \ + patches/boot/icedtea-euctw.patch +else +if CP40630 +ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES) +endif +endif + +# OpenJDK build environment. +if CORE_BUILD + ICEDTEA_CORE_BUILD = true +else + ICEDTEA_CORE_BUILD = +endif +if ZERO_BUILD + ICEDTEA_ZERO_BUILD = true +else + ICEDTEA_ZERO_BUILD = +endif +if SHARK_BUILD + ICEDTEA_SHARK_BUILD = yes +else + ICEDTEA_SHARK_BUILD = +endif + +JDK_UPDATE_VERSION = 0 +COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) + +ICEDTEA_ENV = \ + ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ + ANT_HOME="$(SYSTEM_ANT_DIR)" \ + BUILD_NUMBER="$(OPENJDK_VERSION)" \ + JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ + JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \ + MILESTONE="fcs" \ + LANG="C" \ + PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ + ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \ + BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ + ICEDTEA_RT="$(ICEDTEA_RT)" \ + ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \ + ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \ + CLASSPATH="" \ + LD_LIBRARY_PATH="" \ + CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \ + ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ + ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \ + ZERO_LIBARCH="$(ZERO_LIBARCH)" \ + ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \ + ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \ + ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \ + ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \ + LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \ + LIBFFI_LIBS="$(LIBFFI_LIBS)" \ + LLVM_CFLAGS="$(LLVM_CFLAGS)" \ + LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \ + LLVM_LIBS="$(LLVM_LIBS)" \ + FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \ + FT2_LIB="$(FREETYPE2_LIBS)" \ + ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ + HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ + JAVAC="" \ + JAVA_HOME="" \ + JDK_HOME="" \ + QUIETLY="" \ + ANT_RESPECT_JAVA_HOME="TRUE" \ + RHINO_JAR="$(RHINO_JAR)" \ + DISTRIBUTION_ID="$(DIST_ID)" \ + ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \ + ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ + ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ + DEBUG_CLASSFILES="true" \ + DEBUG_BINARIES="true" \ + DISABLE_INTREE_EC="true" + +if WITH_CACAO +ICEDTEA_ENV += \ + ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" +endif + +if DISABLE_OPTIMIZATIONS +ICEDTEA_ENV += \ + NO_OPTIMIZATIONS="true" \ + CC_NO_OPT="-O0 -g" +endif + +if !ENABLE_DOCS +ICEDTEA_ENV += \ + NO_DOCS="true" +endif + +if USE_ALT_JAR +ICEDTEA_ENV += \ + ALT_JAR_CMD="$(ALT_JAR_CMD)" +endif + +# OpenJDK boot build environment. +ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ + BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT):$(ICEDTEA_RT)" \ + BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT)" \ + BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT):$(SYSTEM_JDK_DIR)/jre/lib/rt.jar" \ + GENSRCDIR="$(abs_top_builddir)/generated" \ + JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ + JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ + JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ + DISABLE_NIMBUS="true" + +# Source files + +GENERATED_FILES = $(top_srcdir)/generated/com/sun/java/swing/plaf/gtk/resources/gtk*.java \ + $(top_srcdir)/generated/com/sun/java/swing/plaf/motif/resources/motif*.java \ + $(top_srcdir)/generated/com/sun/java/swing/plaf/windows/resources/windows*.java \ + $(top_srcdir)/generated/com/sun/corba/se/spi/activation/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/spi/activation/LocatorPackage/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/spi/activation/RepositoryPackage/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.resource \ + $(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.properties \ + $(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/*.java \ + $(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/*.java \ + $(top_srcdir)/generated/com/sun/swing/internal/plaf/basic/resources/basic*.java \ + $(top_srcdir)/generated/com/sun/swing/internal/plaf/metal/resources/metal*.java \ + $(top_srcdir)/generated/com/sun/swing/internal/plaf/synth/resources/synth*.java \ + $(top_srcdir)/generated/com/sun/tools/apt/resources/apt*.java \ + $(top_srcdir)/generated/com/sun/tools/jdi/*.java \ + $(top_srcdir)/generated/com/sun/tools/jdi/resources/jdi*.java \ + $(top_srcdir)/generated/com/sun/tools/javac/resources/*.java \ + $(top_srcdir)/generated/com/sun/tools/doclets/formats/html/resources/standard*.java \ + $(top_srcdir)/generated/com/sun/tools/doclets/internal/toolkit/resources/doclets*.java \ + $(top_srcdir)/generated/com/sun/tools/javadoc/resources/javadoc*.java \ + $(top_srcdir)/generated/com/sun/accessibility/internal/resources/accessibility*.java \ + $(top_srcdir)/generated/org/omg/IOP/*.java \ + $(top_srcdir)/generated/org/omg/IOP/CodecPackage/*.java \ + $(top_srcdir)/generated/org/omg/IOP/CodecFactoryPackage/*.java \ + $(top_srcdir)/generated/org/omg/CORBA/*.java \ + $(top_srcdir)/generated/org/omg/PortableInterceptor/*.java \ + $(top_srcdir)/generated/org/omg/PortableInterceptor/ORBInitInfoPackage/*.java \ + $(top_srcdir)/generated/org/omg/CosNaming/*.java \ + $(top_srcdir)/generated/org/omg/CosNaming/NamingContextPackage/*.java \ + $(top_srcdir)/generated/org/omg/CosNaming/NamingContextExtPackage/*.java \ + $(top_srcdir)/generated/org/omg/Messaging/*.java \ + $(top_srcdir)/generated/org/omg/Dynamic/*.java \ + $(top_srcdir)/generated/org/omg/DynamicAny/*.java \ + $(top_srcdir)/generated/org/omg/DynamicAny/DynAnyPackage/*.java \ + $(top_srcdir)/generated/org/omg/DynamicAny/DynAnyFactoryPackage/*.java \ + $(top_srcdir)/generated/org/omg/PortableServer/*.java \ + $(top_srcdir)/generated/org/omg/PortableServer/POAManagerPackage/*.java \ + $(top_srcdir)/generated/org/omg/PortableServer/POAPackage/*.java \ + $(top_srcdir)/generated/sun/awt/X11/*.java \ + $(top_srcdir)/generated/sun/awt/resources/awt*.java \ + $(top_srcdir)/generated/sun/nio/ch/*.java \ + $(top_srcdir)/generated/sun/nio/cs/*.java \ + $(top_srcdir)/generated/sun/misc/*.java \ + $(top_srcdir)/generated/sun/util/*.java \ + $(top_srcdir)/generated/sun/util/logging/resources/logging*.java \ + $(top_srcdir)/generated/sun/util/resources/*.java \ + $(top_srcdir)/generated/sun/print/resources/serviceui*.java \ + $(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \ + $(top_srcdir)/generated/sun/tools/jconsole/*.java \ + $(top_srcdir)/generated/sun/management/resources/agent*.java \ + $(top_srcdir)/generated/java/nio/*.java \ + $(top_srcdir)/generated/java/nio/channels/*.java \ + $(top_srcdir)/generated/java/lang/*.java \ + $(top_srcdir)/generated/java/util/*.java \ + $(top_srcdir)/generated/javax/management/remote/rmi/*.java \ + $(top_srcdir)/generated/fontconfig/fontconfig*.bfc JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \ $(top_srcdir)/test/jtreg/com/sun/javatest/cof/COF2_0_2.xsd \ @@ -1487,7 +634,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ $(top_srcdir)/patches/hotspot/default/*.patch \ - $(top_srcdir)/patches/ecj/*.patch \ + $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/security/*.patch \ $(top_srcdir)/patches/xrender/*.patch \ @@ -1499,187 +646,67 @@ HACKING $(PULSEAUDIO_SRCS) fsg.sh \ plugin $(top_srcdir)/netx hotspot.map autogen.sh -# The Binary plugs directory is called jdk1.7.0 for historical reasons. The -# name is completely irrelevant; only contains the plugs to build IcedTea. +# Top-Level Targets +# ================= + +all-local: icedtea-stage2 -# OpenJDK build environment. -OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR) -ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR) -ICEDTEA_BUILD_DIR = \ - $(abs_top_builddir)/$(BUILD_OUTPUT_DIR) -ICEDTEA_RT = \ - $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar -ICEDTEA_CLS_DIR = \ - $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes -ICEDTEA_BOOT_DIR= \ - $(abs_top_builddir)/bootstrap/jdk1.6.0 -ICEDTEA_ENDORSED_DIR = \ - $(ICEDTEA_BOOT_DIR)/lib/endorsed -JDK_UPDATE_VERSION = 0 -COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -if CORE_BUILD - ICEDTEA_CORE_BUILD = true -else - ICEDTEA_CORE_BUILD = +distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java + rm -rf stamps + rm -f rt-source-files.txt \ + hotspot-tools-source-files.txt \ + extra-source-files.txt \ + netx-source-files.txt + rm -rf bootstrap + rm -rf lib + rm -rf extra-lib + rm -rf openjdk-boot + rm -rf openjdk + rm -rf hotspot-tools + rm -rf rt/netscape + rm -rf visualvm + rm -rf netbeans + rm -rf netx.build +if ENABLE_PLUGIN + rm -f IcedTeaPlugin.o IcedTeaPlugin.so endif -if ZERO_BUILD - ICEDTEA_ZERO_BUILD = true -else - ICEDTEA_ZERO_BUILD = -endif -if SHARK_BUILD - ICEDTEA_SHARK_BUILD = yes -else - ICEDTEA_SHARK_BUILD = +if ENABLE_NPPLUGIN + rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so endif -ICEDTEA_ENV = \ - ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ - ANT_HOME="$(SYSTEM_ANT_DIR)" \ - BUILD_NUMBER="$(OPENJDK_VERSION)" \ - JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ - JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \ - MILESTONE="fcs" \ - LANG="C" \ - PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ - ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \ - BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ - ICEDTEA_RT="$(ICEDTEA_RT)" \ - ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \ - ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \ - ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \ - ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \ - CLASSPATH="" \ - LD_LIBRARY_PATH="" \ - ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ - ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \ - ZERO_LIBARCH="$(ZERO_LIBARCH)" \ - ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \ - ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \ - ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \ - LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \ - LIBFFI_LIBS="$(LIBFFI_LIBS)" \ - LLVM_CFLAGS="$(LLVM_CFLAGS)" \ - LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \ - LLVM_LIBS="$(LLVM_LIBS)" \ - FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \ - FT2_LIB="$(FREETYPE2_LIBS)" \ - ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ - HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ - QUIETLY="" \ - ANT_RESPECT_JAVA_HOME="TRUE" \ - RHINO_JAR="$(RHINO_JAR)" \ - DISTRIBUTION_ID="$(DIST_ID)" \ - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ - DEBUG_CLASSFILES="true" \ - DEBUG_BINARIES="true" \ - DISABLE_INTREE_EC="true" +if BUILD_CACAO + rm -rf cacao +endif + rm -f jni-common.o +if ADD_ZERO_BUILD + rm -rf zerovm +endif +if BUILD_NATIVE_ECJ + rm -f native-ecj +endif + if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ + rm -rf $(abs_top_builddir)/generated ; \ + fi -if WITH_CACAO -ICEDTEA_ENV += \ - ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" -endif +install: -if DISABLE_OPTIMIZATIONS -ICEDTEA_ENV += \ - NO_OPTIMIZATIONS="true" \ - CC_NO_OPT="-O0 -g" -endif - -if !ENABLE_DOCS -ICEDTEA_ENV += \ - NO_DOCS="true" -endif - -if USE_ALT_JAR -ICEDTEA_ENV += \ - ALT_JAR_CMD="$(ALT_JAR_CMD)" -endif +.PHONY: \ + env env-boot snapshot clean-clone clean-patch \ + clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \ + clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ + clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ + clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \ + clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \ + clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ + $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ + clean-jtreg-reports env: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV)' -# OpenJDK ecj build environment. -ICEDTEA_BUILD_DIR_ECJ = \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/ -ICEDTEA_CLS_DIR_ECJ = \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes -ICEDTEA_ENV_ECJ = \ - ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ - ANT_HOME="$(SYSTEM_ANT_DIR)" \ - BUILD_NUMBER="$(OPENJDK_VERSION)" \ - JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ - JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \ - MILESTONE="fcs" \ - LANG="C" \ - PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ - ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \ - BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ - ICEDTEA_RT="$(ICEDTEA_RT)" \ - ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR_ECJ)" \ - ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \ - ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \ - ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \ - BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \ - BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ - BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT):$(SYSTEM_JDK_DIR)/jre/lib/rt.jar" \ - CLASSPATH="" \ - LD_LIBRARY_PATH="" \ - GENSRCDIR="$(abs_top_builddir)/generated" \ - ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ - ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \ - ZERO_LIBARCH="$(ZERO_LIBARCH)" \ - ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \ - ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \ - ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \ - LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \ - LIBFFI_LIBS="$(LIBFFI_LIBS)" \ - LLVM_CFLAGS="$(LLVM_CFLAGS)" \ - LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \ - LLVM_LIBS="$(LLVM_LIBS)" \ - FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \ - FT2_LIB="$(FREETYPE2_LIBS)" \ - ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ - HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ - QUIETLY="" \ - RHINO_JAR="$(RHINO_JAR)" \ - JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ - JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ - JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ - DISABLE_NIMBUS="true" \ - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ - DEBUG_CLASSFILES="true" \ - DEBUG_BINARIES="true" \ - DISABLE_INTREE_EC="true" - -if WITH_CACAO -ICEDTEA_ENV_ECJ += \ - ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" -endif - -if DISABLE_OPTIMIZATIONS -ICEDTEA_ENV_ECJ += \ - NO_OPTIMIZATIONS="true" \ - CC_NO_OPT="-O0 -g" -endif - -if !ENABLE_DOCS -ICEDTEA_ENV_ECJ += \ - NO_DOCS="true" -endif - -env-ecj: +env-boot: @echo 'unset JAVA_HOME' - @echo 'export $(ICEDTEA_ENV_ECJ)' + @echo 'export $(ICEDTEA_ENV_BOOT)' # Mercurial snapshot. snapshot: dist @@ -1690,94 +717,15 @@ find openjdk/ -name \\.hg* | xargs rm -rf $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/ +# Creates archive of openjdk that is compliant with Free Software guidelines. +dist-openjdk-fsg: stamps/patch-fsg.stamp + $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/ + # OpenJDK Source Preparation Targets # ================================== # Download OpenJDK sources. -OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot - -ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 -OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 -CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ -CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ -CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/ -BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port -NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ - -OPENJDK_URL = $(ICEDTEA_HG_URL) -CORBA_URL = $(ICEDTEA_HG_URL)/corba -JAXP_URL = $(ICEDTEA_HG_URL)/jaxp -JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws -JDK_URL = $(ICEDTEA_HG_URL)/jdk -LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools -HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot - -if USE_HG - OPENJDK_SRC_ZIP = - CORBA_SRC_ZIP = - JAXP_SRC_ZIP = - JAXWS_SRC_ZIP = - JDK_SRC_ZIP = - LANGTOOLS_SRC_ZIP = - HOTSPOT_SRC_ZIP = -else -if USE_ALT_OPENJDK_SRC_ZIP - OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) -else - OPENJDK_SRC_ZIP = openjdk.tar.gz -endif -if USE_ALT_CORBA_SRC_ZIP - CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) -else - CORBA_SRC_ZIP = corba.tar.gz -endif -if USE_ALT_JAXP_SRC_ZIP - JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) -else - JAXP_SRC_ZIP = jaxp.tar.gz -endif -if USE_ALT_JAXWS_SRC_ZIP - JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) -else - JAXWS_SRC_ZIP = jaxws.tar.gz -endif -if USE_ALT_JDK_SRC_ZIP - JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) -else - JDK_SRC_ZIP = jdk.tar.gz -endif -if USE_ALT_LANGTOOLS_SRC_ZIP - LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) -else - LANGTOOLS_SRC_ZIP = langtools.tar.gz -endif -if USE_ALT_HOTSPOT_SRC_ZIP - HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) -else - HOTSPOT_SRC_ZIP = hotspot.tar.gz -endif -endif - -if WITH_ALT_HSBUILD - HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" - HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" - HS_URL = $(OPENJDK_HOTSPOT_URL) -else - HS_MD5SUM = $(HOTSPOT_MD5SUM) - HS_CHANGESET = $(HOTSPOT_CHANGESET) - HS_URL = $(HOTSPOT_URL) -endif - -CACAO_BASE_URL = http://www.complang.tuwien.ac.at -CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ - -if USE_ALT_CACAO_SRC_ZIP - CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) -else - CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -endif - stamps/download.stamp: stamps/hgforest.stamp if !OPENJDK_SRC_DIR_FOUND if USE_ALT_OPENJDK_SRC_ZIP @@ -1921,12 +869,20 @@ mkdir -p stamps touch stamps/download.stamp -# VisualVM sources. Alternatives cannot be used here. -NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ -NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz - -VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/ -VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz +clean-download: + rm -f $(OPENJDK_SRC_ZIP) +if BUILD_CACAO + rm -f $(CACAO_SRC_ZIP) +endif +if WITH_VISUALVM + rm -f $(VISUALVM_SRC_ZIP) + rm -f $(NETBEANS_PROFILER_SRC_ZIP) +endif +if WITH_VISUALVM + rm -f $(VISUALVM_SRC_ZIP) + rm -f $(NETBEANS_PROFILER_SRC_ZIP) +endif + rm -f stamps/download.stamp stamps/hgforest.stamp: if OPENJDK_SRC_DIR_FOUND @@ -1950,185 +906,6 @@ clean-hgforest: rm -f stamps/hgforest.stamp -clean-extract: - rm -f stamps/extract.stamp - rm -rf openjdk - -clean-download: - rm -f stamps/download.stamp - rm -f $(OPENJDK_SRC_ZIP) -if BUILD_CACAO - rm -f $(CACAO_SRC_ZIP) -endif -if WITH_VISUALVM - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) -endif -if WITH_VISUALVM - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) -endif - -# Link ports sources into tree -stamps/ports.stamp: stamps/extract.stamp - for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ - $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \ - $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \ - link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \ - ln -sfv $$target $$link; \ - done - if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \ - = "xno" ; then \ - mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \ - ln -sf $(abs_top_builddir)/jvm.cfg \ - openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \ - fi - if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ - ln -sf $(abs_top_builddir)/ergo.c \ - openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ - fi - mkdir -p stamps - touch stamps/ports.stamp - -# Patches from the other OpenJDK trees (should be removed -# when in an official bxx release) -OPENJDK_PATCHES = - -ICEDTEA_PATCHES = \ - patches/icedtea-version.patch \ - patches/hotspot/$(HSBUILD)/icedtea-version.patch \ - patches/icedtea-copy-plugs.patch \ - patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ - patches/icedtea-ssl.patch \ - $(PLUGIN_PATCH) \ - patches/icedtea-webstart.patch \ - patches/icedtea-webstart-umask.patch \ - patches/icedtea-rmi_amd64.patch \ - patches/icedtea-tools.patch \ - patches/icedtea-demos.patch \ - patches/icedtea-use-system-tzdata.patch \ - patches/icedtea-headers.patch \ - patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ - patches/icedtea-ant.patch \ - patches/icedtea-gcc-suffix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \ - patches/icedtea-bytebuffer-compact.patch \ - patches/icedtea-float-double-trailing-zeros.patch \ - patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ - patches/icedtea-sunsrc.patch \ - patches/icedtea-libraries.patch \ - patches/icedtea-core-build.patch \ - patches/icedtea-zero-build.patch \ - patches/icedtea-print-lsb-release.patch \ - patches/icedtea-jpegclasses.patch \ - patches/icedtea-uname.patch \ - patches/icedtea-ia64-fdlibm.patch \ - patches/icedtea-freetypeversion.patch \ - patches/icedtea-fonts.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \ - patches/icedtea-override-redirect-metacity.patch \ - patches/icedtea-shark-build.patch \ - patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \ - patches/icedtea-security-updates.patch \ - patches/icedtea-jdk-docs-target.patch \ - patches/icedtea-mbeanintrospector.patch \ - patches/icedtea-hotspot-gcc-pr36917.patch \ - patches/icedtea-alpha-fixes.patch \ - patches/icedtea-alt-jar.patch \ - patches/icedtea-jdk-use-ssize_t.patch \ - patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ - patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ - patches/icedtea-clean-crypto.patch \ - patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ - $(GCC_PATCH) \ - patches/cacao/arch.patch \ - patches/icedtea-signed-types.patch \ - patches/icedtea-lc_ctype.patch \ - patches/icedtea-xjc.patch \ - patches/icedtea-renderer-crossing.patch \ - patches/icedtea-tests-jdk.patch \ - patches/icedtea-stroker-finish.patch \ - patches/icedtea-alsa-default-device.patch \ - patches/icedtea-linker-libs-order.patch \ - patches/icedtea-testenv.patch \ - patches/icedtea-samejvm-safe.patch \ - patches/icedtea-pr261.patch \ - patches/icedtea-doc-headers.patch \ - patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ - patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-ia64-bugfix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ - patches/security/icedtea-6592792.patch \ - patches/security/icedtea-6733959.patch \ - patches/security/icedtea-6755943.patch \ - patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ - patches/icedtea-demo-swingapplet.patch \ - patches/icedtea-jvmtiEnv.patch \ - patches/icedtea-xml-encodinginfo.patch \ - patches/icedtea-cc-interp-backedge.patch \ - patches/icedtea-netx.patch \ - patches/icedtea-disable-intree-ec.patch - -if WITH_RHINO -ICEDTEA_PATCHES += \ - patches/icedtea-rhino.patch -endif - -if BUILD_CACAO -ICEDTEA_PATCHES += \ - patches/cacao/launcher.patch \ - patches/cacao/no-mmap-first-page.patch \ - patches/cacao/native-resolve.patch \ - patches/cacao/xxoption-warning.patch \ - patches/cacao/no-strict-aliasing.patch \ - patches/cacao/openjdk7.patch \ - patches/cacao/version.patch \ - patches/cacao/versioninfo.patch -endif - -if WITH_CACAO -ICEDTEA_PATCHES += \ - patches/cacao/ignore-tests.patch -endif - -if ENABLE_PULSE_JAVA -ICEDTEA_PATCHES += \ - patches/icedtea-pulse-soundproperties.patch -endif - -if ENABLE_XRENDER -# match against $(abs_top_srcdir) and then remove it again, -# because stamps/patch.stamp target will also add it -XRENDER_PATCHES = patches/xrender/icedtea-???.patch -XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES))) -ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES))) -endif - -if !USE_CVMI -ICEDTEA_PATCHES += \ - patches/icedtea-javafiles.patch -endif - -if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/icedtea-systemtap.patch -endif - -if ENABLE_PLUGIN -ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch -else -if ENABLE_NPPLUGIN -ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch -endif -endif - -if ENABLE_NSS -ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \ - patches/icedtea-nss-6763530.patch -endif - -ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) - stamps/extract.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk @@ -2234,6 +1011,32 @@ mkdir -p stamps touch stamps/extract.stamp +clean-extract: + rm -f stamps/extract.stamp + rm -rf openjdk + +stamps/extract-visualvm.stamp: +if WITH_VISUALVM + if ! test -d netbeans ; \ + then \ + mkdir netbeans ; \ + $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \ + fi + + if ! test -d visualvm ; \ + then \ + $(TAR) xf $(VISUALVM_SRC_ZIP) ; \ + fi +endif + mkdir -p stamps + touch $@ + +clean-extract-visualvm.stamp: +if WITH_VISUALVM + rm -rf netbeans visualvm +endif + rm -f stamps/extract-visualvm.stamp + stamps/extract-cacao.stamp: stamps/extract.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO @@ -2250,6 +1053,35 @@ endif touch stamps/extract-cacao.stamp +clean-extract-cacao: +if BUILD_CACAO +if !USE_SYSTEM_CACAO + rm -rf cacao +endif +endif + rm -f stamps/extract-cacao.stamp + +# Link ports sources into tree +stamps/ports.stamp: stamps/extract.stamp + for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ + $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \ + $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \ + link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \ + ln -sfv $$target $$link; \ + done + if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \ + = "xno" ; then \ + mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \ + ln -sf $(abs_top_builddir)/jvm.cfg \ + openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \ + fi + if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ + ln -sf $(abs_top_builddir)/ergo.c \ + openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ + fi + mkdir -p stamps + touch stamps/ports.stamp + stamps/generated.stamp: stamps/extract-cacao.stamp if [ ! -e $(abs_top_builddir)/generated ]; then \ cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \ @@ -2258,6 +1090,55 @@ fi touch stamps/generated.stamp +stamps/patch-fsg.stamp: stamps/generated.stamp + mkdir -p stamps ; \ + rm -f stamps/patch-fsg.stamp.tmp ; \ + touch stamps/patch-fsg.stamp.tmp ; \ + all_patches_ok=yes; \ + for p in $(ICEDTEA_FSG_PATCHES) ; \ + do \ + if test x$${all_patches_ok} = "xyes" \ + && echo Checking $$p \ + && $(PATCH) -l -p0 --dry-run -s -t -f \ + -F 0 < $(abs_top_srcdir)/$$p ; \ + then \ + echo Applying $$p ; \ + $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ + if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ + >> stamps/patch-fsg.stamp.tmp ; \ + then \ + echo "* $$(basename $$p): UNDOCUMENTED" \ + >> stamps/patch-fsg.stamp.tmp ; \ + fi ; \ + else \ + test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ + fi ; \ + done ; \ + mv stamps/patch-fsg.stamp.tmp stamps/patch-fsg.stamp ; \ + if ! test x$${all_patches_ok} = "xyes"; then \ + echo ERROR patch $${all_patches_ok} FAILED! ; \ + echo WARNING make clean-patch before retrying a fix ; \ + exit 2; \ + fi ; + +clean-patch-fsg: + rm -f stamps/patch-fsg.stamp + all_patches_ok=yes; \ + for p in $(ICEDTEA_FSG_PATCHES) ; \ + do \ + echo Checking $$p ; \ + if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \ + then \ + echo Reverting $$p ; \ + $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \ + else \ + all_patches_ok=no ; \ + fi ; \ + done ; \ + if ! test x$${all_patches_ok} = "xyes" ; then \ + echo "WARNING Not all patches reverted cleanly" ; \ + fi + stamps/patch.stamp: stamps/patch-fsg.stamp mkdir -p stamps ; \ rm -f stamps/patch.stamp.tmp ; \ @@ -2352,56 +1233,7 @@ rm -f openjdk/jdk/src/share/classes/sun/applet/`basename $file` ; \ done ; -stamps/patch-fsg.stamp: stamps/generated.stamp - mkdir -p stamps ; \ - rm -f stamps/patch-fsg.stamp.tmp ; \ - touch stamps/patch-fsg.stamp.tmp ; \ - all_patches_ok=yes; \ - for p in $(ICEDTEA_FSG_PATCHES) ; \ - do \ - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ - if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ - >> stamps/patch-fsg.stamp.tmp ; \ - then \ - echo "* $$(basename $$p): UNDOCUMENTED" \ - >> stamps/patch-fsg.stamp.tmp ; \ - fi ; \ - else \ - test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ - fi ; \ - done ; \ - mv stamps/patch-fsg.stamp.tmp stamps/patch-fsg.stamp ; \ - if ! test x$${all_patches_ok} = "xyes"; then \ - echo ERROR patch $${all_patches_ok} FAILED! ; \ - echo WARNING make clean-patch before retrying a fix ; \ - exit 2; \ - fi ; - -clean-patch-fsg: - rm -f stamps/patch-fsg.stamp - all_patches_ok=yes; \ - for p in $(ICEDTEA_FSG_PATCHES) ; \ - do \ - echo Checking $$p ; \ - if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \ - then \ - echo Reverting $$p ; \ - $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \ - else \ - all_patches_ok=no ; \ - fi ; \ - done ; \ - if ! test x$${all_patches_ok} = "xyes" ; then \ - echo "WARNING Not all patches reverted cleanly" ; \ - fi - -stamps/overlay.stamp: stamps/patch.stamp +stamps/versioning.stamp: stamps/patch.stamp if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \ revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \ fi ; \ @@ -2427,66 +1259,34 @@ ver_suffix="-$(VERSION_SUFFIX)"; \ fi ; \ sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ - openjdk/jdk/make/common/shared/Defs.gmk; \ + openjdk/jdk/make/common/shared/Defs.gmk; + +stamps/overlay.stamp: stamps/versioning.stamp cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ chmod -R ug+w openjdk touch stamps/overlay.stamp -# OpenJDK ecj Source Preparation Targets +# OpenJDK boot Source Preparation Targets # ====================================== -# Copy over OpenJDK sources for ecj. -stamps/clone-ecj.stamp: stamps/overlay.stamp - if ! test -d openjdk-ecj ; then \ - cp -pPRl openjdk openjdk-ecj ; \ +# Copy over OpenJDK sources for bootstrap. +stamps/clone-boot.stamp: stamps/overlay.stamp + if ! test -d openjdk-boot ; then \ + cp -pPRl openjdk openjdk-boot ; \ fi mkdir -p stamps - touch stamps/clone-ecj.stamp - -clean-clone-ecj: - rm -f stamps/clone-ecj.stamp - rm -rf openjdk-ecj + touch stamps/clone-boot.stamp -# Patch OpenJDK for ecj/gcj builds. -ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ - patches/ecj/icedtea-hotspot-$(HSBUILD).patch \ - patches/ecj/icedtea-jopt.patch \ - patches/ecj/icedtea-dyn.patch - -if CP39408_JAVAH -ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr39408.patch -endif - -if CP40188_JAVAH -ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40188.patch -endif +clean-clone-boot: + rm -f stamps/clone-boot.stamp + rm -rf openjdk-boot -if CP40616 -ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40616.patch -endif - -# Patches for when java.util.Scanner is missing -# or has the bug #40630 (all these classes rely -# on Scanner#hasNextLine() looping behaviour) -SCANNER_PATCHES = patches/ecj/icedtea-spp.patch \ - patches/ecj/icedtea-sbcs.patch \ - patches/ecj/icedtea-dbcs.patch - -if LACKS_JAVA_UTIL_SCANNER -ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES) \ - patches/ecj/icedtea-euctw.patch -else -if CP40630 -ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES) -endif -endif - -stamps/patch-ecj.stamp: stamps/clone-ecj.stamp +stamps/patch-boot.stamp: stamps/clone-boot.stamp mkdir -p stamps; \ - rm -f stamps/patch-ecj.stamp.tmp ; \ - touch stamps/patch-ecj.stamp.tmp ; \ + rm -f stamps/patch-boot.stamp.tmp ; \ + touch stamps/patch-boot.stamp.tmp ; \ all_patches_ok=yes; \ - for p in $(ICEDTEA_ECJ_PATCHES) ; \ + for p in $(ICEDTEA_BOOT_PATCHES) ; \ do \ if test x$${all_patches_ok} = "xyes" \ && echo Checking $$p \ @@ -2496,26 +1296,26 @@ echo Applying $$p ; \ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ - >> stamps/patch-ecj.stamp.tmp ; \ + >> stamps/patch-boot.stamp.tmp ; \ then \ echo "* $$(basename $$p): UNDOCUMENTED" \ - >> stamps/patch-ecj.stamp.tmp ; \ + >> stamps/patch-boot.stamp.tmp ; \ fi ; \ else \ test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ fi ; \ done ; \ - mv stamps/patch-ecj.stamp.tmp stamps/patch-ecj.stamp ; \ + mv stamps/patch-boot.stamp.tmp stamps/patch-boot.stamp ; \ if ! test x$${all_patches_ok} = "xyes"; then \ echo ERROR patch $${all_patches_ok} FAILED! ; \ echo WARNING make clean-patch before retrying a fix ; \ exit 2; \ fi -clean-patch-ecj: - rm -f stamps/patch-ecj.stamp +clean-patch-boot: + rm -f stamps/patch-boot.stamp all_patches_ok=yes; \ - for p in $(ICEDTEA_ECJ_PATCHES) ; \ + for p in $(ICEDTEA_BOOT_PATCHES) ; \ do \ echo Checking $$p ; \ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \ @@ -2533,34 +1333,104 @@ # Bootstrap Directory Targets # =========================== -# bootstrap/icedtea. -stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp +# Optional native ecj +stamps/native-ecj.stamp: + mkdir -p stamps +if BUILD_NATIVE_ECJ + ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ + --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} +endif + touch stamps/native-ecj.stamp + +# bootstrap/stage1 +stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp + mkdir -p bootstrap/boot/bin stamps/ + ln -sf $(JAVA) bootstrap/boot/bin/java + ln -sf $(JAVAH) bootstrap/boot/bin/javah + ln -sf $(RMIC) bootstrap/boot/bin/rmic + ln -sf $(JAR) bootstrap/boot/bin/jar + ln -sf ../../../javac bootstrap/boot/bin/javac + ln -sf ../../../javap bootstrap/boot/bin/javap + mkdir -p bootstrap/boot/lib/endorsed + ln -sf $(XALAN2_JAR) bootstrap/boot/lib/endorsed/xalan-j2.jar + ln -sf $(XALAN2_SERIALIZER_JAR) \ + bootstrap/boot/lib/endorsed/xalan-j2-serializer.jar + ln -sf $(XERCES2_JAR) bootstrap/boot/lib/endorsed/xerces-j2.jar + mkdir -p bootstrap/boot/jre/lib; \ + ln -sf $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ + bootstrap/boot/jre/lib/rt-system.jar; \ + ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ + bootstrap/boot/jre/lib/; \ + if ! test -d bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \ + then \ + ln -sf ./$(JRE_ARCH_DIR) \ + bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \ + fi; \ + mkdir -p bootstrap/boot/include; \ + for i in $(SYSTEM_JDK_DIR)/include/*; do \ + test -r $$i | continue; \ + i=`basename $$i`; \ + rm -f bootstrap/boot/include/$$i; \ + ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/boot/include/$$i; \ + done; \ + if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \ + then \ + mkdir -p $(abs_top_builddir)/bootstrap/boot/lib ; \ + ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ + $(abs_top_builddir)/bootstrap/boot/lib/tools.jar ; \ + fi + if test -f \ + $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \ + then \ + cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ + $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar ; \ + fi + mkdir -p stamps + touch stamps/bootstrap-directory-stage1.stamp + +clean-bootstrap-directory-stage1: + rm -f stamps/bootstrap-directory-stage1.stamp + rm -rf bootstrap/boot + +# bootstrap/stage2. +stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp rm -rf bootstrap/icedtea ln -s \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ \ + $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ \ bootstrap/icedtea if ! test -d bootstrap/icedtea/include; then \ - ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \ + ln -sf $(ICEDTEA_BUILD_DIR_BOOT)/include bootstrap/icedtea/include; \ fi mkdir -p stamps - touch stamps/bootstrap-directory.stamp + touch stamps/bootstrap-directory-stage2.stamp -clean-bootstrap-directory: - rm -f stamps/bootstrap-directory.stamp +clean-bootstrap-directory-stage2: + rm -f stamps/bootstrap-directory-stage2.stamp rm -rf bootstrap/icedtea if BOOTSTRAPPING - BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp + BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea - INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage1.stamp else BOOTSTRAP_DIRECTORY_STAMP = ICEDTEA_HOME = $(SYSTEM_JDK_DIR) - INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp endif -# bootstrap/jdk1.6.0 to bootstrap/icedtea symlink. -stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) +# stage 1 symlink. +stamps/bootstrap-directory-symlink-stage1.stamp: stamps/bootstrap-directory-stage1.stamp + rm -f bootstrap/jdk1.6.0 + ln -sf boot bootstrap/jdk1.6.0 + mkdir -p stamps + touch stamps/bootstrap-directory-symlink-boot.stamp + +clean-bootstrap-directory-symlink-stage1: + rm -f stamps/bootstrap-directory-symlink-boot.stamp + rm -f bootstrap/jdk1.6.0 + +# stage 2 symlink. +stamps/bootstrap-directory-symlink-stage2.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) mkdir -p bootstrap rm -f bootstrap/jdk1.6.0 ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \ @@ -2571,106 +1441,22 @@ exit 1; \ fi mkdir -p stamps - touch stamps/bootstrap-directory-symlink.stamp - -clean-bootstrap-directory-symlink: - rm -f stamps/bootstrap-directory-symlink.stamp - rm -f bootstrap/jdk1.6.0 - -# Bootstrap ecj Directory Targets -# =============================== + touch stamps/bootstrap-directory-symlink-stage2.stamp -# bootstrap/ecj. -stamps/bootstrap-directory-ecj.stamp: stamps/native-ecj.stamp - mkdir -p bootstrap/ecj/bin stamps/ - ln -sf $(JAVA) bootstrap/ecj/bin/java - ln -sf $(JAVAH) bootstrap/ecj/bin/javah - ln -sf $(RMIC) bootstrap/ecj/bin/rmic - ln -sf $(JAR) bootstrap/ecj/bin/jar - ln -sf ../../../javac bootstrap/ecj/bin/javac - ln -sf ../../../javap bootstrap/ecj/bin/javap - mkdir -p bootstrap/ecj/lib/endorsed - ln -sf $(XALAN2_JAR) bootstrap/ecj/lib/endorsed/xalan-j2.jar - ln -sf $(XALAN2_SERIALIZER_JAR) \ - bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar - ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar - mkdir -p bootstrap/ecj/jre/lib; \ - ln -sf $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ - bootstrap/ecj/jre/lib/rt-system.jar; \ - ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ - bootstrap/ecj/jre/lib/; \ - if ! test -d bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \ - then \ - ln -sf ./$(JRE_ARCH_DIR) \ - bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \ - fi; \ - mkdir -p bootstrap/ecj/include; \ - for i in $(SYSTEM_JDK_DIR)/include/*; do \ - test -r $$i | continue; \ - i=`basename $$i`; \ - rm -f bootstrap/ecj/include/$$i; \ - ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/ecj/include/$$i; \ - done; \ - if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \ - then \ - mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \ - ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ - $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \ - fi - if test -f \ - $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \ - then \ - cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar ; \ - fi - mkdir -p stamps - touch stamps/bootstrap-directory-ecj.stamp - -clean-bootstrap-directory-ecj: - rm -f stamps/bootstrap-directory-ecj.stamp - rm -rf bootstrap/ecj - -# bootstrap/jdk1.6.0 to bootstrap/ecj symlink. -stamps/bootstrap-directory-symlink-ecj.stamp: \ - stamps/bootstrap-directory-ecj.stamp +clean-bootstrap-directory-symlink-stage2: + rm -f stamps/bootstrap-directory-symlink-stage2.stamp rm -f bootstrap/jdk1.6.0 - ln -sf ecj bootstrap/jdk1.6.0 - mkdir -p stamps - touch stamps/bootstrap-directory-symlink-ecj.stamp - -clean-bootstrap-directory-symlink-ecj: - rm -f stamps/bootstrap-directory-symlink-ecj.stamp - rm -f bootstrap/jdk1.6.0 - # OpenJDK Targets # =============== -if BOOTSTRAPPING - MEMORY_LIMIT = -else - MEMORY_LIMIT = -J-Xmx1024m -endif - -if WITH_CACAO - ICEDTEA_BUILD_TARGET=jdk_only - ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only -else - ICEDTEA_BUILD_TARGET= - ICEDTEA_DEBUG_BUILD_TARGET=debug_build -endif - -NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge -NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources - # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. -stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp \ +stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \ - stamps/pulse-java.stamp stamps/visualvm.stamp + stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -2701,26 +1487,6 @@ cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext endif -if WITH_VISUALVM - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ - visualvm/launcher/visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - cp visualvm/launcher/visualvm.conf \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - echo visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - echo profiler3 >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - cp -r visualvm/build/cluster/* \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm -endif if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ @@ -2755,12 +1521,11 @@ mkdir -p stamps touch stamps/icedtea.stamp -stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp \ +stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \ - stamps/pulse-java.stamp stamps/visualvm.stamp + stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -2791,26 +1556,6 @@ cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext endif -if WITH_VISUALVM - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ - visualvm/launcher/visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - cp visualvm/launcher/visualvm.conf \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - echo visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - echo profiler3 >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - cp -r visualvm/build/cluster/* \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm -endif if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ @@ -2852,297 +1597,63 @@ -C openjdk/make clobber rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp -icedtea-against-icedtea: \ - stamps/bootstrap-directory-symlink.stamp \ +icedtea-stage2: \ stamps/icedtea.stamp \ stamps/add-cacao.stamp \ - stamps/add-zero.stamp + stamps/add-zero.stamp \ + stamps/visualvm.stamp -icedtea-debug-against-icedtea: \ - stamps/bootstrap-directory-symlink.stamp \ +icedtea-debug-stage2: \ stamps/icedtea-debug.stamp \ stamps/add-cacao-debug.stamp \ - stamps/add-zero-debug.stamp + stamps/add-zero-debug.stamp \ + stamps/visualvm.stamp -# OpenJDK ecj Targets +# OpenJDK boot Targets # =================== -stamps/native-ecj.stamp: - mkdir -p stamps -if BUILD_NATIVE_ECJ - ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} -endif - touch stamps/native-ecj.stamp - -stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ +stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \ - stamps/liveconnect.stamp stamps/ports.stamp stamps/patch-ecj.stamp \ + stamps/liveconnect.stamp stamps/ports.stamp stamps/patch-boot.stamp \ stamps/cacao.stamp $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj \ + $(ICEDTEA_ENV_BOOT) \ + -C openjdk-boot \ $(ICEDTEA_BUILD_TARGET) - @echo "ecj-poured IcedTea is served:" \ - $(ECJ_BUILD_OUTPUT_DIR) + @echo "Bootstrapped IcedTea is served:" \ + $(BOOT_BUILD_OUTPUT_DIR) mkdir -p stamps - touch stamps/icedtea-ecj.stamp + touch stamps/icedtea-boot.stamp -SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server hotspot: - rm -f stamps/bootstrap-directory-symlink-ecj.stamp - rm -f stamps/icedtea-ecj.stamp - rm -f stamps/icedtea-against-ecj.stamp + rm -f stamps/bootstrap-directory-symlink-stage1.stamp + rm -f stamps/icedtea-boot.stamp + rm -f stamps/icedtea-stage1.stamp $(ARCH_PREFIX) $(MAKE) hotspot-helper mkdir -p \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server - cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server - @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image - -hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch-ecj.stamp - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj hotspot - -clean-icedtea-ecj: stamps/clone-ecj.stamp - rm -f stamps/icedtea-ecj.stamp - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj clobber - -stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp - mkdir -p stamps - touch stamps/icedtea-against-ecj.stamp - -# Binary Plugs and Tools Targets -# ============================== - -stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar - mkdir -p stamps - touch stamps/plugs.stamp - -stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar - mkdir -p stamps - touch stamps/hotspot-tools.stamp - -clean-plugs: clean-plugs clean-shared-objects \ - clean-copy clean-rt - rm -f stamps/plugs.stamp - rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar - -clean-tools-jar: clean-hotspot-tools - rm -f stamps/hotspot-tools.stamp - rm -f bootstrap/jdk1.7.0/lib/tools.jar - -# Sources used from OpenJDK. -ICEDTEA_BOOTSTRAP_DIRS = \ - $(JDK_SHARE)/com/sun/jdi \ - $(JDK_SHARE)/com/sun/tools/jdi \ - $(JDK_SHARE)/com/sun/net/httpserver \ - $(JDK_SHARE)/java/io \ - $(JDK_SHARE)/java/util \ - $(JDK_SHARE)/java/rmi \ - $(JDK_SHARE)/sun/awt/ \ - $(JDK_SHARE)/javax/net/ssl \ - $(JDK_SHARE)/javax/script \ - $(JAXWS)/javax/xml/bind + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + @echo "Hotspot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image -# tools.jar class files. -stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp - for copy_dir in \ - `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \ - do \ - mkdir -p hotspot-tools/$$copy_dir ; \ - cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \ - hotspot-tools/$$copy_dir ; \ - done - for copy_dir in \ - `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \ - do \ - mkdir -p hotspot-tools/$$copy_dir ; \ - cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \ - hotspot-tools/$$copy_dir ; \ - done - for copy_dir in \ - `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \ - do \ - mkdir -p hotspot-tools/$$copy_dir ; \ - cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \ - hotspot-tools/$$copy_dir ; \ - done - for copy_dir in \ - `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \ - do \ - mkdir -p hotspot-tools/$$copy_dir ; \ - cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \ - hotspot-tools/$$copy_dir ; \ - done - mkdir -p stamps - touch stamps/hotspot-tools-copy-source-files.stamp - -hotspot-tools-source-files.txt: stamps/generated.stamp \ - stamps/hotspot-tools-copy-source-files.stamp - find hotspot-tools -name '*.java' | sort > $@ - mkdir -p lib/hotspot-tools - -stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \ - $(INITIAL_BOOTSTRAP_LINK_STAMP) - $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \ - -d lib/hotspot-tools \ - -sourcepath \ - 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ - -bootclasspath \'\' @$< ; - mkdir -p stamps - touch stamps/hotspot-tools-class-files.stamp - -clean-hotspot-tools: - rm -rf lib/hotspot-tools - rm -f stamps/hotspot-tools-class-files.stamp - rm -f hotspot-tools-source-files.txt - rm -f stamps/hotspot-tools-copy-source-files.stamp - -# tools.jar -bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp - mkdir -p bootstrap/jdk1.7.0/lib/ - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \ - -C lib/hotspot-tools sun \ - -C lib/hotspot-tools org -C lib/hotspot-tools java \ - -C lib/hotspot-tools javax ; - if test -d bootstrap/ecj ; \ - then \ - mkdir -p bootstrap/ecj/lib/; \ - ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ - $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \ - fi +hotspot-helper: stamps/bootstrap-directory-symlink-stage1.stamp \ + stamps/hotspot-tools.stamp stamps/plugs.stamp \ + stamps/ports.stamp stamps/patch-boot.stamp + $(ARCH_PREFIX) $(MAKE) \ + $(ICEDTEA_ENV_BOOT) \ + -C openjdk-boot hotspot -# rt-closed.jar class files. -rt-source-files.txt: stamps/extract.stamp stamps/overlay.stamp - find $(abs_top_builddir)/rt -name '*.java' \ - | sort -u > $@ - for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \ - do \ - find $(abs_top_builddir)/$$dir -name '*.java' >> $@; \ - done - -stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp - mkdir -p lib/rt - $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d lib/rt \ - -classpath $(abs_top_builddir)/lib/hotspot-tools \ - -sourcepath '$(SOURCEPATH_DIRS)' \ - -bootclasspath \'\' @$< ; - mkdir -p stamps - touch stamps/rt-class-files.stamp - -clean-rt: - rm -rf lib/rt - rm -f stamps/rt-class-files.stamp - rm -f rt-source-files.txt - -# rt-closed.jar. -bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp - mkdir -p bootstrap/jdk1.7.0/jre/lib - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax -C lib/rt sun ; - if test -d bootstrap/ecj/jre/lib ; \ - then \ - cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - bootstrap/ecj/jre/lib/rt.jar; \ - fi - -# extras -- used to create about.jar for javaws. -extra-source-files.txt: - find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ - -stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp - mkdir -p extra-lib - $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d extra-lib \ - -classpath $(abs_top_builddir)/lib/hotspot-tools \ - -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ - -bootclasspath \'\' \ - @extra-source-files.txt ; \ - cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ - extra-lib/net/sourceforge/jnlp/about - find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ - -o -type d -exec chmod 750 '{}' ';' - mkdir -p stamps - touch $@ - -clean-extra: - rm -rf extra-lib - rm -f stamps/extra-class-files.stamp - rm -f extra-source-files.txt +clean-icedtea-boot: stamps/clone-boot.stamp + rm -f stamps/icedtea-boot.stamp + $(ARCH_PREFIX) $(MAKE) \ + $(ICEDTEA_ENV_BOOT) \ + -C openjdk-boot clobber -extra-lib/about.jar: stamps/extra-class-files.stamp - if ! test -d $(ICEDTEA_BOOT_DIR) ; \ - then \ - $(JAR) cf $@ -C extra-lib net ; \ - else \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ - fi - -# netx -# requires availability of OpenJDK source code including -# a patch applied to sun.plugin.AppletViewerPanel and generated sources - -netx-source-files.txt: - find $(abs_top_srcdir)/netx -name '*.java' | sort > $@ - -stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp - mkdir -p $(abs_top_builddir)/netx.build - $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \ - -d $(abs_top_builddir)/netx.build \ - -classpath $(abs_top_builddir)/lib/hotspot-tools \ - -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \ - -bootclasspath \'\' \ - @netx-source-files.txt ; - mkdir -p $(abs_top_builddir)/stamps - touch stamps/netx.stamp +stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp + mkdir -p stamps + touch stamps/icedtea-stage1.stamp -stamps/netx-dist.stamp: stamps/netx.stamp - (cd $(abs_top_builddir)/netx.build ; \ - mkdir -p lib ; \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \ - cp -a $(abs_top_srcdir)/netx src; \ - find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ - cd src ; \ - $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \ - `find . -type f -not -name '*.java'` ; \ - $(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net ) - mkdir -p stamps - touch stamps/netx-dist.stamp - -stamps/liveconnect.stamp: stamps/hotspot-tools.stamp - if test "x${LIVECONNECT_DIR}" != x; then \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \ - fi - mkdir -p stamps - touch stamps/liveconnect.stamp - -stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp -if BUILD_CACAO -if !USE_SYSTEM_CACAO - cd cacao/cacao && \ - $(ARCH_PREFIX) ./configure \ - --host=$(host_alias) \ - --build=$(build_alias) \ - --target=$(target_alias) \ - --prefix=$(abs_top_builddir)/cacao/install \ - --with-java-runtime-library=openjdk \ - --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ - --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ - --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ - $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install -endif -endif - mkdir -p stamps - touch $@ - -clean-cacao: - rm -rf cacao - rm -f stamps/cacao.stamp +# Plugin if ENABLE_NPPLUGIN # IcedTeaNPPlugin.so. @@ -3222,6 +1733,70 @@ rm -f IcedTeaPlugin.so endif +stamps/liveconnect.stamp: stamps/hotspot-tools.stamp + if test "x${LIVECONNECT_DIR}" != x; then \ + $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \ + fi + mkdir -p stamps + touch stamps/liveconnect.stamp + +# NetX + +# netx +# requires availability of OpenJDK source code including +# a patch applied to sun.plugin.AppletViewerPanel and generated sources + +netx-source-files.txt: + find $(abs_top_srcdir)/netx -name '*.java' | sort > $@ + +stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp + mkdir -p $(abs_top_builddir)/netx.build + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \ + -d $(abs_top_builddir)/netx.build \ + -classpath $(abs_top_builddir)/lib/hotspot-tools \ + -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \ + -bootclasspath \'\' \ + @netx-source-files.txt ; + mkdir -p $(abs_top_builddir)/stamps + touch stamps/netx.stamp + +stamps/netx-dist.stamp: stamps/netx.stamp + (cd $(abs_top_builddir)/netx.build ; \ + mkdir -p lib ; \ + $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \ + cp -a $(abs_top_srcdir)/netx src; \ + find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ + cd src ; \ + $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \ + `find . -type f -not -name '*.java'` ; \ + $(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net ) + mkdir -p stamps + touch stamps/netx-dist.stamp + +extra-source-files.txt: + find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ + +stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp + mkdir -p extra-lib + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d extra-lib \ + -classpath $(abs_top_builddir)/lib/hotspot-tools \ + -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ + -bootclasspath \'\' \ + @extra-source-files.txt ; \ + cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ + extra-lib/net/sourceforge/jnlp/about + find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ + -o -type d -exec chmod 750 '{}' ';' + mkdir -p stamps + touch $@ + +clean-extra: + rm -rf extra-lib + rm -f stamps/extra-class-files.stamp + rm -f extra-source-files.txt + +extra-lib/about.jar: stamps/extra-class-files.stamp + $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net # PulseAudio based mixer # (pulse-java) @@ -3294,10 +1869,101 @@ # end of pulse-java -# targets for additional VMs +# VisualVM + +stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract-visualvm.stamp +if WITH_VISUALVM + cd netbeans ; \ + rm nbbuild/external/binaries-list ; \ + mkdir -p ./nbbuild/netbeans_visualvm/ ; \ + ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \ + ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \ + ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ + if ! (uname -a | grep x86_64) ; then \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ + buildscript=./buildnative-linux-15.sh ; \ + else \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ + buildscript=./buildnative-linux64-15.sh ; \ + fi ; \ + cd lib.profiler/native/build ; \ + JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ + $$buildscript ; \ + cd ../../.. ; \ + JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ + -f nbbuild/build.xml bootstrap ; \ + for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \ + JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \ + -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \ + -f $$dir/build.xml ; \ + done +endif + mkdir -p stamps + touch $@ -BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) -BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) +stamps/visualvm.stamp: stamps/icedtea.stamp stamps/nbplatform.stamp +if WITH_VISUALVM + cd visualvm ; \ + ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \ + JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ + sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ + visualvm/launcher/visualvm >> \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ + chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ + cp visualvm/launcher/visualvm.conf \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ + echo visualvm >> \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ + echo profiler3 >> \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ + cp -r visualvm/build/cluster/* \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ + cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ + cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm +endif + mkdir -p stamps + touch $@ + +clean-visualvm: + rm -rf visualvm + rm -f stamps/visualvm.stamp + +clean-nbplatform: + rm -rf netbeans + rm -f stamps/nbplatform.stamp + +# CACAO + +stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp +if BUILD_CACAO +if !USE_SYSTEM_CACAO + cd cacao/cacao && \ + $(ARCH_PREFIX) ./configure \ + --host=$(host_alias) \ + --build=$(build_alias) \ + --target=$(target_alias) \ + --prefix=$(abs_top_builddir)/cacao/install \ + --with-java-runtime-library=openjdk \ + --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ + --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ + --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ + $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install +endif +endif + mkdir -p stamps + touch $@ + +clean-cacao: + rm -rf cacao + rm -f stamps/cacao.stamp + +# targets for additional VMs stamps/add-cacao.stamp: stamps/icedtea.stamp stamps/cacao.stamp if ADD_CACAO_BUILD @@ -3329,7 +1995,6 @@ endif touch $@ - # configure script arguments, quoted in single quotes CONFIGURE_ARGS = @CONFIGURE_ARGS@ ADD_ZERO_CONFIGURE_ARGS = \ @@ -3494,94 +2159,167 @@ check-local: jtregcheck -# VisualVM +# Support classes for non-OpenJDK bootstraps + +stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar + mkdir -p stamps + touch stamps/plugs.stamp + +stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar + mkdir -p stamps + touch stamps/hotspot-tools.stamp + +clean-plugs: clean-plugs clean-shared-objects \ + clean-copy clean-rt + rm -f stamps/plugs.stamp + rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar + +clean-tools-jar: clean-hotspot-tools + rm -f stamps/hotspot-tools.stamp + rm -f bootstrap/jdk1.7.0/lib/tools.jar -stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \ - stamps/extract.stamp stamps/nbplatform.stamp -if WITH_VISUALVM - cd visualvm ; \ - ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build -endif +# Sources used from OpenJDK. +ICEDTEA_BOOTSTRAP_DIRS = \ + $(JDK_SHARE)/com/sun/jdi \ + $(JDK_SHARE)/com/sun/tools/jdi \ + $(JDK_SHARE)/com/sun/net/httpserver \ + $(JDK_SHARE)/java/io \ + $(JDK_SHARE)/java/util \ + $(JDK_SHARE)/java/rmi \ + $(JDK_SHARE)/sun/awt/ \ + $(JDK_SHARE)/javax/net/ssl \ + $(JDK_SHARE)/javax/script \ + $(JAXWS)/javax/xml/bind + +stamps/copy-source-files.stamp: stamps/overlay.stamp + for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ + do \ + mkdir -p rt/$$copy_dir ; \ + cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \ + rt/$$copy_dir ; \ + done mkdir -p stamps - touch $@ + touch stamps/copy-source-files.stamp -clean-visualvm: - rm -rf visualvm - rm -f stamps/visualvm.stamp +clean-copy: + rm -f stamps/copy-source-files.stamp + for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ + do \ + rm -rf rt/$$copy_dir ; \ + done -stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/extract-visualvm.stamp -if WITH_VISUALVM - cd netbeans ; \ - rm nbbuild/external/binaries-list ; \ - mkdir -p ./nbbuild/netbeans_visualvm/ ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ - if ! (uname -a | grep x86_64) ; then \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ - buildscript=./buildnative-linux-15.sh ; \ - else \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ - buildscript=./buildnative-linux64-15.sh ; \ - fi ; \ - cd lib.profiler/native/build ; \ - JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ - $$buildscript ; \ - cd ../../.. ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ - -f nbbuild/build.xml bootstrap ; \ - for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \ - -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \ - -f $$dir/build.xml ; \ - done -endif +# tools.jar class files. +stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp + for copy_dir in \ + `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$$copy_dir ; \ + cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \ + hotspot-tools/$$copy_dir ; \ + done + for copy_dir in \ + `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$$copy_dir ; \ + cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \ + hotspot-tools/$$copy_dir ; \ + done + for copy_dir in \ + `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$$copy_dir ; \ + cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \ + hotspot-tools/$$copy_dir ; \ + done + for copy_dir in \ + `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \ + do \ + mkdir -p hotspot-tools/$$copy_dir ; \ + cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \ + hotspot-tools/$$copy_dir ; \ + done mkdir -p stamps - touch $@ + touch stamps/hotspot-tools-copy-source-files.stamp + +hotspot-tools-source-files.txt: stamps/generated.stamp \ + stamps/hotspot-tools-copy-source-files.stamp + find hotspot-tools -name '*.java' | sort > $@ + mkdir -p lib/hotspot-tools + +stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \ + $(INITIAL_BOOTSTRAP_LINK_STAMP) + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \ + -d lib/hotspot-tools \ + -sourcepath \ + 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ + -bootclasspath \'\' @$< ; + mkdir -p stamps + touch stamps/hotspot-tools-class-files.stamp -stamps/extract-visualvm.stamp: -if WITH_VISUALVM - if ! test -d netbeans ; \ +clean-hotspot-tools: + rm -rf lib/hotspot-tools + rm -f stamps/hotspot-tools-class-files.stamp + rm -f hotspot-tools-source-files.txt + rm -f stamps/hotspot-tools-copy-source-files.stamp + +# tools.jar +bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp + mkdir -p bootstrap/jdk1.7.0/lib/ + $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \ + -C lib/hotspot-tools sun \ + -C lib/hotspot-tools org -C lib/hotspot-tools java \ + -C lib/hotspot-tools javax ; + if test -d bootstrap/boot ; \ then \ - mkdir netbeans ; \ - $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \ + mkdir -p bootstrap/boot/lib/; \ + ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ + $(abs_top_builddir)/bootstrap/boot/lib/tools.jar; \ fi - if ! test -d visualvm ; \ - then \ - $(TAR) xf $(VISUALVM_SRC_ZIP) ; \ - fi -endif +# rt-closed.jar class files. +rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp + find $(abs_top_builddir)/rt -name '*.java' \ + | sort -u > $@ + +stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp + mkdir -p lib/rt + $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d lib/rt \ + -classpath $(abs_top_builddir)/lib/hotspot-tools \ + -sourcepath '$(SOURCEPATH_DIRS)' \ + -bootclasspath \'\' @$< ; mkdir -p stamps - touch $@ + touch stamps/rt-class-files.stamp -clean-nbplatform: - rm -rf netbeans - rm -f stamps/nbplatform.stamp +clean-rt: + rm -rf lib/rt + rm -f stamps/rt-class-files.stamp + rm -f rt-source-files.txt -# fsg-tarball - -# Creates archive of openjdk that is compliant with Free Software guidelines. -dist-openjdk-fsg: stamps/patch-fsg.stamp - $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/ +# rt-closed.jar. +bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp + mkdir -p bootstrap/jdk1.7.0/jre/lib + $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ + -C lib/rt javax -C lib/rt sun ; + if test -d bootstrap/boot/jre/lib ; \ + then \ + cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ + bootstrap/boot/jre/lib/rt.jar; \ + fi # Target Aliases # =============== -bootstrap-directory-ecj: stamps/bootstrap-directory-ecj.stamp +bootstrap-directory-stage1: stamps/bootstrap-directory-stage1.stamp -bootstrap-directory: stamps/bootstrap-directory.stamp +bootstrap-directory-stage2: stamps/bootstrap-directory-stage2.stamp -bootstrap-directory-symlink-ecj: stamps/bootstrap-directory-symlink-ecj.stamp +bootstrap-directory-symlink-stage1: stamps/bootstrap-directory-symlink-stage1.stamp -bootstrap-directory-symlink: stamps/bootstrap-directory-symlink.stamp +bootstrap-directory-symlink-stage2: stamps/bootstrap-directory-symlink-stage2.stamp cacao: stamps/cacao.stamp -clone-ecj: stamps/clone-ecj.stamp +clone-boot: stamps/clone-boot.stamp visualvm: stamps/visualvm.stamp @@ -3603,15 +2341,15 @@ icedtea: stamps/icedtea.stamp -icedtea-against-ecj: stamps/icedtea-against-ecj.stamp +icedtea-against-boot: stamps/icedtea-against-boot.stamp icedtea-debug: stamps/icedtea-debug.stamp -icedtea-ecj: stamps/icedtea-ecj.stamp +icedtea-boot: stamps/icedtea-boot.stamp -native-ecj: stamps/native-ecj.stamp +native-boot: stamps/native-boot.stamp -patch-ecj: stamps/patch-ecj.stamp +patch-boot: stamps/patch-boot.stamp patch: stamps/patch.stamp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-dbcs.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,40 @@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:00:31.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:08:30.000000000 +0100 +@@ -27,7 +27,6 @@ + import java.io.*; + import java.util.Arrays; + import java.util.ArrayList; +-import java.util.Scanner; + import java.util.Formatter; + import java.util.regex.*; + import java.nio.charset.*; +@@ -38,9 +37,8 @@ + static Pattern mPattern = Pattern.compile("(?:0x)?(\\p{XDigit}++)\\s++(?:0x)?(\\p{XDigit}++)(?:\\s++#.*)?"); + public static void genDBCS(String args[]) throws Exception { + +- Scanner s = new Scanner(new File(args[0], args[2])); +- while (s.hasNextLine()) { +- String line = s.nextLine(); ++ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2]))); ++ for (String line = s.readLine(); line != null; line = s.readLine()) { + if (line.startsWith("#") || line.length() == 0) + continue; + String[] fields = line.split("\\s+"); +@@ -239,14 +237,13 @@ + String b2cNR = b2cNRSB.toString(); + String c2bNR = c2bNRSB.toString(); + +- Scanner s = new Scanner(new File(srcDir, template)); ++ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template))); + PrintStream out = new PrintStream(new FileOutputStream( + new File(dstDir, clzName + ".java"))); + if (hisName == null) + hisName = ""; + +- while (s.hasNextLine()) { +- String line = s.nextLine(); ++ for (String line = s.readLine(); line != null; line = s.readLine()) { + if (line.indexOf("$") == -1) { + out.println(line); + continue;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-dyn.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,12 @@ +diff -Nru openjdk-boot.orig/jdk/make/java/Makefile openjdk-boot/jdk/make/java/Makefile +--- openjdk-boot.orig/jdk/make/java/Makefile 2009-05-12 15:54:22.000000000 +0100 ++++ openjdk-boot/jdk/make/java/Makefile 2009-05-18 20:54:22.000000000 +0100 +@@ -39,7 +39,7 @@ + # Others + # Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk + SUBDIRS += security npt java_crw_demo java_hprof_demo \ +- math awt util text applet net nio dyn \ ++ math awt util text applet net nio \ + sql rmi jar beans logging management instrument + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-euctw.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,32 @@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-15 13:08:40.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-15 13:12:08.000000000 +0100 +@@ -27,7 +27,6 @@ + + import java.io.*; + import java.util.ArrayList; +-import java.util.Scanner; + import java.util.Formatter; + import java.util.regex.*; + import java.nio.charset.*; +@@ -42,16 +41,16 @@ + } + + private static String getCopyright(File f) throws IOException { +- Scanner s = new Scanner(f, "ISO-8859-1"); ++ BufferedReader r = ++ new BufferedReader(new InputStreamReader(new FileInputStream(f), "ISO-8859-1")); + StringBuilder sb = new StringBuilder(); +- while (s.hasNextLine()) { +- String ln = s.nextLine(); ++ for (String ln = r.readLine(); ln != null; ln = r.readLine()) { + sb.append(ln + "\n"); + // assume we have the copyright as the first comment + if (ln.matches("^\\s\\*\\/$")) + break; + } +- s.close(); ++ r.close(); + return sb.toString(); + } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-hotspot-default.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,69 @@ +diff -Nru openjdk-boot.orig/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile +--- openjdk-boot.orig/hotspot/make/linux/Makefile 2009-09-28 13:20:29.000000000 +0100 ++++ openjdk-boot/hotspot/make/linux/Makefile 2009-09-28 16:06:27.000000000 +0100 +@@ -280,35 +280,30 @@ + + $(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 + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif +diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make +--- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2009-09-22 20:05:24.000000000 +0100 ++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-09-28 16:06:18.000000000 +0100 +@@ -38,7 +38,9 @@ + GENERATED = $(TOPDIR)/../generated + + # tools.jar is needed by the JDI - SA binding +-SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar ++SA_TOOLS_JAR = $(BOOT_JAVA_HOME)/lib/tools.jar ++SA_RT_JAR = $(BOOT_JAVA_HOME)/jre/lib/rt.jar ++SA_CLASSPATH = $(SA_TOOLS_JAR):$(SA_RT_JAR) + + # gnumake 3.78.1 does not accept the *s that + # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them +@@ -65,8 +67,13 @@ + echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ + exit 1; \ + fi +- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \ +- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ ++ $(QUIETLY) if [ ! -f $(SA_TOOLS_JAR) ] ; then \ ++ echo "Missing $(SA_TOOLS_JAR) file. Use 1.6.0 or later version of JDK";\ ++ echo ""; \ ++ exit 1; \ ++ fi ++ $(QUIETLY) if [ ! -f $(SA_RT_JAR) ] ; then \ ++ echo "Missing $(SA_RT_JAR) file. Use 1.6.0 or later version of JDK";\ + echo ""; \ + exit 1; \ + fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-jopt.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,26 @@ +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 2008-10-22 18:45:43.000000000 +0100 ++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:49:29.000000000 +0100 +@@ -75,7 +75,9 @@ + JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) + + # The jar -J options are special, must be added at the end of the command line ++ifneq (,$(JAR_KNOWS_J_OPTIONS)) + JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%) ++endif + + # JAVA_TOOLS_DIR is the default location to find Java tools to run, if + # langtools is not available. +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 2008-10-22 19:14:30.000000000 +0100 ++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:15:00.000000000 +0100 +@@ -82,7 +82,9 @@ + JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) + + # The jar -J options are special, must be added at the end of the command line ++ifneq (,$(JAR_KNOWS_J_OPTIONS)) + JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%) ++endif + + # JAVA_TOOLS_DIR is the default location to find Java tools to run, if + # langtools is not available.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-pr39408.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,18 @@ +diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c +--- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-18 16:25:52.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-18 16:27:03.000000000 +0000 +@@ -36,6 +36,14 @@ + #include "nio.h" + #include "nio_util.h" + ++#undef sun_nio_ch_FileDispatcher_NO_LOCK ++#define sun_nio_ch_FileDispatcher_NO_LOCK -1L ++#undef sun_nio_ch_FileDispatcher_LOCKED ++#define sun_nio_ch_FileDispatcher_LOCKED 0L ++#undef sun_nio_ch_FileDispatcher_RET_EX_LOCK ++#define sun_nio_ch_FileDispatcher_RET_EX_LOCK 1L ++#undef sun_nio_ch_FileDispatcher_INTERRUPTED ++#define sun_nio_ch_FileDispatcher_INTERRUPTED 2L + + static int preCloseFD = -1; /* File descriptor to which we dup other fd's + before closing them for real */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-pr40188.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,15 @@ +diff -Nru openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c +--- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-30 17:23:08.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-05-18 19:58:36.000000000 +0100 +@@ -192,9 +192,9 @@ + lockResult = fcntl(fd, cmd, &fl); + if (lockResult < 0) { + if ((cmd == F_SETLK64) && (errno == EAGAIN)) +- return sun_nio_ch_FileDispatcherImpl_NO_LOCK; ++ return sun_nio_ch_FileDispatcher_NO_LOCK; + if (errno == EINTR) +- return sun_nio_ch_FileDispatcherImpl_INTERRUPTED; ++ return sun_nio_ch_FileDispatcher_INTERRUPTED; + JNU_ThrowIOExceptionWithLastError(env, "Lock failed"); + } + return 0;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-pr40616.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,15 @@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-02 12:04:10.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-02 12:13:09.000000000 +0100 +@@ -36,8 +36,10 @@ + public class GenerateEUC_TW { + + public static void genEUC_TW(String args[]) throws Exception { ++ FileOutputStream fos = ++ new FileOutputStream(new File(args[1], "EUC_TWMapping.java")); + genClass(new FileInputStream(new File(args[0], "euc_tw.map")), +- new PrintStream(new File(args[1], "EUC_TWMapping.java"), "ISO-8859-1"), ++ new PrintStream(fos, false, "ISO-8859-1"), + getCopyright(new File(args[3]))); + } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-sbcs.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,38 @@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 15:47:02.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 16:07:07.000000000 +0100 +@@ -28,7 +28,6 @@ + import java.io.*; + import java.util.Arrays; + import java.util.ArrayList; +-import java.util.Scanner; + import java.util.Formatter; + import java.util.regex.*; + import java.nio.charset.*; +@@ -38,9 +37,8 @@ + + public static void genSBCS(String args[]) throws Exception { + +- Scanner s = new Scanner(new File(args[0], args[2])); +- while (s.hasNextLine()) { +- String line = s.nextLine(); ++ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2]))); ++ for (String line = s.readLine(); line != null; line = s.readLine()) { + if (line.startsWith("#") || line.length() == 0) + continue; + String[] fields = line.split("\\s+"); +@@ -208,12 +206,11 @@ + String b2cNR = b2cNRSB.toString(); + String c2bNR = c2bNRSB.toString(); + +- Scanner s = new Scanner(new File(srcDir, template)); ++ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template))); + PrintStream out = new PrintStream(new FileOutputStream( + new File(dstDir, clzName + ".java"))); + +- while (s.hasNextLine()) { +- String line = s.nextLine(); ++ for (String line = s.readLine(); line != null; line = s.readLine()) { + int i = line.indexOf("$"); + if (i == -1) { + out.println(line);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea-spp.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,65 @@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/spp/Spp.java openjdk-boot/jdk/make/tools/src/build/tools/spp/Spp.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-11 08:44:09.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-12 21:34:38.000000000 +0100 +@@ -25,6 +25,10 @@ + + package build.tools.spp; + ++import java.io.BufferedReader; ++import java.io.InputStreamReader; ++import java.io.IOException; ++ + import java.util.*; + import java.util.regex.*; + +@@ -83,7 +87,7 @@ + } + + StringBuffer out = new StringBuffer(); +- new Spp().spp(new Scanner(System.in), ++ new Spp().spp(new BufferedReader(new InputStreamReader(System.in)), + out, "", + keys, vars, be, + false); +@@ -104,12 +108,12 @@ + Matcher ifkey = Pattern.compile("^#if\\[(!)?" + KEY + "\\]").matcher(""); + Matcher elsekey = Pattern.compile("^#else\\[(!)?" + KEY + "\\]").matcher(""); + Matcher endkey = Pattern.compile("^#end\\[(!)?" + KEY + "\\]").matcher(""); +- Matcher vardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$").matcher(""); ++ Pattern pvardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$"); + Matcher vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher(""); + + void append(StringBuffer buf, String ln, + Set<String> keys, Map<String, String> vars) { +- vardef.reset(ln); ++ Matcher vardef = pvardef.matcher(ln); + while (vardef.find()) { + String repl = ""; + if (vardef.group(GN_VAR) != null) +@@ -133,19 +137,20 @@ + } + + // return true if #end[key], #end or EOF reached +- boolean spp(Scanner in, StringBuffer buf, String key, ++ boolean spp(BufferedReader in, StringBuffer buf, String key, + Set<String> keys, Map<String, String> vars, +- boolean be, boolean skip) { +- while (in.hasNextLine()) { +- String ln = in.nextLine(); ++ boolean be, boolean skip) throws IOException { ++ while (true) { ++ String ln = in.readLine(); ++ if (ln == null) ++ break; + if (be) { + if (ln.startsWith("#begin")) { + buf.setLength(0); //clean up to this line + continue; + } + if (ln.equals("#end")) { +- while (in.hasNextLine()) +- in.nextLine(); ++ do { } while (in.readLine() != null); + return true; //discard the rest to EOF + } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/icedtea.patch Thu Oct 01 18:05:17 2009 +0100 @@ -0,0 +1,806 @@ +diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile +--- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100 ++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-07-14 17:47:13.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 + # pept and before rmi. +-SUBDIRS = sources pept corespi core spi impl rmi ++SUBDIRS = org pept corespi core spi impl rmi + all build clean clobber:: + $(SUBDIRS-loop) + +diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile +--- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -0,0 +1,38 @@ ++# ++# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This code is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. Sun designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun in the LICENSE file that accompanied this code. ++# ++# This code is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# version 2 for more details (a copy is included in the LICENSE file that ++# accompanied this code). ++# ++# You should have received a copy of the GNU General Public License version ++# 2 along with this work; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++ ++BUILDDIR = ../../../../.. ++PACKAGE = com.sun.corba.se ++PRODUCT = org ++ ++include $(BUILDDIR)/common/Defs.gmk ++ ++FILES_java=\ ++ com/sun/corba/se/org/omg/CORBA/ORB.java ++ ++# ++# Include ++# ++include $(BUILDDIR)/common/Classes.gmk +diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk +--- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-03-30 17:13:01.000000000 +0100 ++++ openjdk-boot/corba/make/common/Defs.gmk 2009-07-14 17:47:13.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-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk +--- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-07-14 17:37:18.000000000 +0100 ++++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-07-14 17:47:13.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-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk +--- openjdk-boot.orig/corba/make/common/Rules.gmk 2009-03-30 23:07:09.000000000 +0100 ++++ openjdk-boot/corba/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -201,8 +201,10 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ + $(CAT) $(JAVA_SOURCE_LIST); \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \ ++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \ ++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + fi + @$(java-vm-cleanup) + +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 2009-03-30 23:07:09.000000000 +0100 ++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -120,31 +120,14 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -classpath $(CLASSBINDIR) ++JAVAHFLAGS += -classpath $(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 ++# 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) + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile +--- openjdk-boot.orig/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100 ++++ openjdk-boot/corba/make/org/omg/sources/Makefile 2009-07-14 17:47:13.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-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile +--- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100 ++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-07-14 17:47:13.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-boot.orig/jaxp/make/build.xml openjdk-boot/jaxp/make/build.xml +--- openjdk-boot.orig/jaxp/make/build.xml 2009-06-30 14:24:48.000000000 +0100 ++++ openjdk-boot/jaxp/make/build.xml 2009-07-14 17:47:13.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}/"/> +@@ -87,7 +90,8 @@ + memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" + debug="${javac.debug}" +- target="${javac.target}"> ++ target="${javac.target}" ++ executable="${javac.executable}"> + <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> + <compilerarg line="${javac.version.opt}"/> + </javac> +diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile +--- openjdk-boot.orig/jaxp/make/Makefile 2009-07-14 17:37:17.000000000 +0100 ++++ openjdk-boot/jaxp/make/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -92,7 +92,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-boot.orig/jaxws/make/build.properties openjdk-boot/jaxws/make/build.properties +--- openjdk-boot.orig/jaxws/make/build.properties 2009-07-14 17:37:18.000000000 +0100 ++++ openjdk-boot/jaxws/make/build.properties 2009-07-14 17:47:13.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-boot.orig/jaxws/make/build.xml openjdk-boot/jaxws/make/build.xml +--- openjdk-boot.orig/jaxws/make/build.xml 2009-06-30 14:24:56.000000000 +0100 ++++ openjdk-boot/jaxws/make/build.xml 2009-07-14 17:47:13.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}/"/> +@@ -111,6 +114,7 @@ + debug="${javac.debug}" + target="${javac.target}" + excludes="com/sun/tools/internal/txw2/**"> ++ <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:${boot.java.home}/jre/lib/rt-system.jar"/> + <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> +diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile +--- openjdk-boot.orig/jaxws/make/Makefile 2009-07-14 17:37:17.000000000 +0100 ++++ openjdk-boot/jaxws/make/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -92,8 +92,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-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk +--- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100 ++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-07-14 17:47:13.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) \ + $(BOOT_JAR_JFLAGS) || $(RM) $@ +diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk +--- openjdk-boot.orig/jdk/make/common/Release.gmk 2009-07-14 17:37:19.000000000 +0100 ++++ openjdk-boot/jdk/make/common/Release.gmk 2009-07-14 17:54:01.000000000 +0100 +@@ -650,10 +650,21 @@ + RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar + $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) + $(CD) $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ + @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS) +- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) ++ @$(CD) $(CLASSBINDIR) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) ++endif ++ $(java-vm-cleanup) + + # Create jsse.jar containing SunJSSE implementation classes + JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar +@@ -944,19 +955,6 @@ + @$(CD) $(CLASSBINDIR) && $(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 $(BOOT_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 +@@ -1033,16 +1031,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-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk +--- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-03-30 17:23:03.000000000 +0100 ++++ openjdk-boot/jdk/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -237,8 +237,9 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ + $(CAT) $<.filtered; \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ +- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ ++ $(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,7 +303,11 @@ + $(prep-target) + @$(ECHO) "# Running javah:" + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ +- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) ++ $(CLASSES.export) ++ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ ++ $(JAVAH_CMD) \ ++ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ ++ $(innerclass)) + @$(java-vm-cleanup) + @$(TOUCH) $@ + +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 2009-07-14 17:37:18.000000000 +0100 ++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -136,33 +136,22 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + + # 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-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile +--- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-07-14 17:37:18.000000000 +0100 ++++ openjdk-boot/jdk/make/java/nio/Makefile 2009-07-14 17:47:13.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-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile +--- openjdk-boot.orig/jdk/make/java/text/Makefile 2009-05-08 16:10:43.000000000 +0100 ++++ openjdk-boot/jdk/make/java/text/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -81,8 +81,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/Makefile openjdk-boot/jdk/make/Makefile +--- openjdk-boot.orig/jdk/make/Makefile 2009-05-08 16:10:43.000000000 +0100 ++++ openjdk-boot/jdk/make/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -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) + +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk +--- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -189,3 +189,5 @@ + java/awt/dnd/DnDConstants.java \ + sun/awt/CausedFocusEvent.java + ++EXPORTED_inner = \ ++ sun.java2d.opengl.OGLContext$$OGLContextCaps +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile +--- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2009-05-08 16:10:44.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/awt/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -401,10 +401,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-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile +--- openjdk-boot.orig/jdk/make/sun/javazic/Makefile 2009-03-30 17:23:03.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-07-14 17:47:13.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 $(ABS_OUTPUTDIR)/classes:$(BUILDTOOLJARDIR)/javazic.jar \ ++ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) + @$(java-vm-cleanup) + + $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) +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 2009-03-30 17:23:03.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/text/Makefile 2009-07-14 17:47:13.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):$(ABS_OUTPUTDIR)/classes:$(GENERATEBREAKITERATORDATA_JARFILE) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(CLASSDESTDIR)/sun/text/resources \ + -spec $(UNICODEDATA)/UnicodeData.txt \ + -language th +diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile +--- openjdk-boot.orig/jdk/make/sun/xawt/Makefile 2009-07-14 17:37:19.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -294,11 +294,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`; \ +@@ -308,20 +304,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) \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ + 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) \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ +diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java +--- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-14 17:36:40.000000000 +0100 ++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-14 17:47:13.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-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java 2009-07-14 17:36:32.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-07-14 17:47:13.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-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java 2009-07-14 17:36:32.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-07-14 17:47:13.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-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h +--- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100 ++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-07-14 17:47:13.000000000 +0100 +@@ -27,6 +27,7 @@ + #define OGLContext_h_Included + + #include "sun_java2d_pipe_BufferedContext.h" ++#include "sun_java2d_pipe_hw_ContextCapabilities.h" + #include "sun_java2d_opengl_OGLContext.h" + #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" + +@@ -100,39 +101,39 @@ + * See OGLContext.java for more on these flags. + */ + #define CAPS_EMPTY \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY + #define CAPS_RT_PLAIN_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA + #define CAPS_RT_TEXTURE_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA + #define CAPS_RT_TEXTURE_OPAQUE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE + #define CAPS_MULTITEXTURE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE + #define CAPS_TEXNONPOW2 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 + #define CAPS_TEXNONSQUARE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE + #define CAPS_PS20 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 + #define CAPS_PS30 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 + #define LAST_SHARED_CAP \ + sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP + #define CAPS_EXT_FBOBJECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT + #define CAPS_STORED_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA + #define CAPS_DOUBLEBUFFERED \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED + #define CAPS_EXT_LCD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER + #define CAPS_EXT_BIOP_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER + #define CAPS_EXT_GRAD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER + #define CAPS_EXT_TEXRECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT + + /** + * Evaluates to true if the given capability bitmask is present for the +diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml +--- openjdk-boot.orig/langtools/make/build.xml 2009-06-30 14:25:18.000000000 +0100 ++++ openjdk-boot/langtools/make/build.xml 2009-07-14 17:47:13.000000000 +0100 +@@ -516,6 +516,7 @@ + includeAntRuntime="no" + source="@{javac.source}" + target="@{javac.target}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="-Xlint"/> +@@ -532,6 +533,7 @@ + target="@{javac.target}" + debug="${javac.debug}" + debuglevel="${javac.debuglevel}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> +diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile +--- openjdk-boot.orig/langtools/make/Makefile 2009-07-14 17:37:17.000000000 +0100 ++++ openjdk-boot/langtools/make/Makefile 2009-07-14 17:47:13.000000000 +0100 +@@ -130,7 +130,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 +diff -Nru openjdk-boot.orig/make/jdk-rules.gmk openjdk-boot/make/jdk-rules.gmk +--- openjdk-boot.orig/make/jdk-rules.gmk 2009-07-14 17:37:18.000000000 +0100 ++++ openjdk-boot/make/jdk-rules.gmk 2009-07-14 17:47:13.000000000 +0100 +@@ -58,7 +58,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
--- a/patches/ecj/icedtea-dbcs.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:00:31.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:08:30.000000000 +0100 -@@ -27,7 +27,6 @@ - import java.io.*; - import java.util.Arrays; - import java.util.ArrayList; --import java.util.Scanner; - import java.util.Formatter; - import java.util.regex.*; - import java.nio.charset.*; -@@ -38,9 +37,8 @@ - static Pattern mPattern = Pattern.compile("(?:0x)?(\\p{XDigit}++)\\s++(?:0x)?(\\p{XDigit}++)(?:\\s++#.*)?"); - public static void genDBCS(String args[]) throws Exception { - -- Scanner s = new Scanner(new File(args[0], args[2])); -- while (s.hasNextLine()) { -- String line = s.nextLine(); -+ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2]))); -+ for (String line = s.readLine(); line != null; line = s.readLine()) { - if (line.startsWith("#") || line.length() == 0) - continue; - String[] fields = line.split("\\s+"); -@@ -239,14 +237,13 @@ - String b2cNR = b2cNRSB.toString(); - String c2bNR = c2bNRSB.toString(); - -- Scanner s = new Scanner(new File(srcDir, template)); -+ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template))); - PrintStream out = new PrintStream(new FileOutputStream( - new File(dstDir, clzName + ".java"))); - if (hisName == null) - hisName = ""; - -- while (s.hasNextLine()) { -- String line = s.nextLine(); -+ for (String line = s.readLine(); line != null; line = s.readLine()) { - if (line.indexOf("$") == -1) { - out.println(line); - continue;
--- a/patches/ecj/icedtea-dyn.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/java/Makefile openjdk-ecj/jdk/make/java/Makefile ---- openjdk-ecj.orig/jdk/make/java/Makefile 2009-05-12 15:54:22.000000000 +0100 -+++ openjdk-ecj/jdk/make/java/Makefile 2009-05-18 20:54:22.000000000 +0100 -@@ -39,7 +39,7 @@ - # Others - # Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk - SUBDIRS += security npt java_crw_demo java_hprof_demo \ -- math awt util text applet net nio dyn \ -+ math awt util text applet net nio \ - sql rmi jar beans logging management instrument - -
--- a/patches/ecj/icedtea-euctw.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-15 13:08:40.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-15 13:12:08.000000000 +0100 -@@ -27,7 +27,6 @@ - - import java.io.*; - import java.util.ArrayList; --import java.util.Scanner; - import java.util.Formatter; - import java.util.regex.*; - import java.nio.charset.*; -@@ -42,16 +41,16 @@ - } - - private static String getCopyright(File f) throws IOException { -- Scanner s = new Scanner(f, "ISO-8859-1"); -+ BufferedReader r = -+ new BufferedReader(new InputStreamReader(new FileInputStream(f), "ISO-8859-1")); - StringBuilder sb = new StringBuilder(); -- while (s.hasNextLine()) { -- String ln = s.nextLine(); -+ for (String ln = r.readLine(); ln != null; ln = r.readLine()) { - sb.append(ln + "\n"); - // assume we have the copyright as the first comment - if (ln.matches("^\\s\\*\\/$")) - break; - } -- s.close(); -+ r.close(); - return sb.toString(); - } -
--- a/patches/ecj/icedtea-hotspot-default.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2009-09-28 13:20:29.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/Makefile 2009-09-28 16:06:27.000000000 +0100 -@@ -280,35 +280,30 @@ - - $(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 - - $(TARGETS_ZERO): $(SUBDIRS_ZERO) - cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif -diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make ---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2009-09-22 20:05:24.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2009-09-28 16:06:18.000000000 +0100 -@@ -38,7 +38,9 @@ - GENERATED = $(TOPDIR)/../generated - - # tools.jar is needed by the JDI - SA binding --SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar -+SA_TOOLS_JAR = $(BOOT_JAVA_HOME)/lib/tools.jar -+SA_RT_JAR = $(BOOT_JAVA_HOME)/jre/lib/rt.jar -+SA_CLASSPATH = $(SA_TOOLS_JAR):$(SA_RT_JAR) - - # gnumake 3.78.1 does not accept the *s that - # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them -@@ -65,8 +67,13 @@ - echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ - exit 1; \ - fi -- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \ -- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ -+ $(QUIETLY) if [ ! -f $(SA_TOOLS_JAR) ] ; then \ -+ echo "Missing $(SA_TOOLS_JAR) file. Use 1.6.0 or later version of JDK";\ -+ echo ""; \ -+ exit 1; \ -+ fi -+ $(QUIETLY) if [ ! -f $(SA_RT_JAR) ] ; then \ -+ echo "Missing $(SA_RT_JAR) file. Use 1.6.0 or later version of JDK";\ - echo ""; \ - exit 1; \ - fi
--- a/patches/ecj/icedtea-jopt.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -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-22 18:45:43.000000000 +0100 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:49:29.000000000 +0100 -@@ -75,7 +75,9 @@ - JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) - - # The jar -J options are special, must be added at the end of the command line -+ifneq (,$(JAR_KNOWS_J_OPTIONS)) - JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%) -+endif - - # JAVA_TOOLS_DIR is the default location to find Java tools to run, if - # langtools is not available. -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-22 19:14:30.000000000 +0100 -+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:15:00.000000000 +0100 -@@ -82,7 +82,9 @@ - JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) - - # The jar -J options are special, must be added at the end of the command line -+ifneq (,$(JAR_KNOWS_J_OPTIONS)) - JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%) -+endif - - # JAVA_TOOLS_DIR is the default location to find Java tools to run, if - # langtools is not available.
--- a/patches/ecj/icedtea-pr39408.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c ---- openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-18 16:25:52.000000000 +0000 -+++ openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-18 16:27:03.000000000 +0000 -@@ -36,6 +36,14 @@ - #include "nio.h" - #include "nio_util.h" - -+#undef sun_nio_ch_FileDispatcher_NO_LOCK -+#define sun_nio_ch_FileDispatcher_NO_LOCK -1L -+#undef sun_nio_ch_FileDispatcher_LOCKED -+#define sun_nio_ch_FileDispatcher_LOCKED 0L -+#undef sun_nio_ch_FileDispatcher_RET_EX_LOCK -+#define sun_nio_ch_FileDispatcher_RET_EX_LOCK 1L -+#undef sun_nio_ch_FileDispatcher_INTERRUPTED -+#define sun_nio_ch_FileDispatcher_INTERRUPTED 2L - - static int preCloseFD = -1; /* File descriptor to which we dup other fd's - before closing them for real */
--- a/patches/ecj/icedtea-pr40188.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c ---- openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-30 17:23:08.000000000 +0100 -+++ openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-05-18 19:58:36.000000000 +0100 -@@ -192,9 +192,9 @@ - lockResult = fcntl(fd, cmd, &fl); - if (lockResult < 0) { - if ((cmd == F_SETLK64) && (errno == EAGAIN)) -- return sun_nio_ch_FileDispatcherImpl_NO_LOCK; -+ return sun_nio_ch_FileDispatcher_NO_LOCK; - if (errno == EINTR) -- return sun_nio_ch_FileDispatcherImpl_INTERRUPTED; -+ return sun_nio_ch_FileDispatcher_INTERRUPTED; - JNU_ThrowIOExceptionWithLastError(env, "Lock failed"); - } - return 0;
--- a/patches/ecj/icedtea-pr40616.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-02 12:04:10.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java 2009-07-02 12:13:09.000000000 +0100 -@@ -36,8 +36,10 @@ - public class GenerateEUC_TW { - - public static void genEUC_TW(String args[]) throws Exception { -+ FileOutputStream fos = -+ new FileOutputStream(new File(args[1], "EUC_TWMapping.java")); - genClass(new FileInputStream(new File(args[0], "euc_tw.map")), -- new PrintStream(new File(args[1], "EUC_TWMapping.java"), "ISO-8859-1"), -+ new PrintStream(fos, false, "ISO-8859-1"), - getCopyright(new File(args[3]))); - } -
--- a/patches/ecj/icedtea-sbcs.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 15:47:02.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 16:07:07.000000000 +0100 -@@ -28,7 +28,6 @@ - import java.io.*; - import java.util.Arrays; - import java.util.ArrayList; --import java.util.Scanner; - import java.util.Formatter; - import java.util.regex.*; - import java.nio.charset.*; -@@ -38,9 +37,8 @@ - - public static void genSBCS(String args[]) throws Exception { - -- Scanner s = new Scanner(new File(args[0], args[2])); -- while (s.hasNextLine()) { -- String line = s.nextLine(); -+ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2]))); -+ for (String line = s.readLine(); line != null; line = s.readLine()) { - if (line.startsWith("#") || line.length() == 0) - continue; - String[] fields = line.split("\\s+"); -@@ -208,12 +206,11 @@ - String b2cNR = b2cNRSB.toString(); - String c2bNR = c2bNRSB.toString(); - -- Scanner s = new Scanner(new File(srcDir, template)); -+ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template))); - PrintStream out = new PrintStream(new FileOutputStream( - new File(dstDir, clzName + ".java"))); - -- while (s.hasNextLine()) { -- String line = s.nextLine(); -+ for (String line = s.readLine(); line != null; line = s.readLine()) { - int i = line.indexOf("$"); - if (i == -1) { - out.println(line);
--- a/patches/ecj/icedtea-spp.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-11 08:44:09.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-12 21:34:38.000000000 +0100 -@@ -25,6 +25,10 @@ - - package build.tools.spp; - -+import java.io.BufferedReader; -+import java.io.InputStreamReader; -+import java.io.IOException; -+ - import java.util.*; - import java.util.regex.*; - -@@ -83,7 +87,7 @@ - } - - StringBuffer out = new StringBuffer(); -- new Spp().spp(new Scanner(System.in), -+ new Spp().spp(new BufferedReader(new InputStreamReader(System.in)), - out, "", - keys, vars, be, - false); -@@ -104,12 +108,12 @@ - Matcher ifkey = Pattern.compile("^#if\\[(!)?" + KEY + "\\]").matcher(""); - Matcher elsekey = Pattern.compile("^#else\\[(!)?" + KEY + "\\]").matcher(""); - Matcher endkey = Pattern.compile("^#end\\[(!)?" + KEY + "\\]").matcher(""); -- Matcher vardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$").matcher(""); -+ Pattern pvardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$"); - Matcher vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher(""); - - void append(StringBuffer buf, String ln, - Set<String> keys, Map<String, String> vars) { -- vardef.reset(ln); -+ Matcher vardef = pvardef.matcher(ln); - while (vardef.find()) { - String repl = ""; - if (vardef.group(GN_VAR) != null) -@@ -133,19 +137,20 @@ - } - - // return true if #end[key], #end or EOF reached -- boolean spp(Scanner in, StringBuffer buf, String key, -+ boolean spp(BufferedReader in, StringBuffer buf, String key, - Set<String> keys, Map<String, String> vars, -- boolean be, boolean skip) { -- while (in.hasNextLine()) { -- String ln = in.nextLine(); -+ boolean be, boolean skip) throws IOException { -+ while (true) { -+ String ln = in.readLine(); -+ if (ln == null) -+ break; - if (be) { - if (ln.startsWith("#begin")) { - buf.setLength(0); //clean up to this line - continue; - } - if (ln.equals("#end")) { -- while (in.hasNextLine()) -- in.nextLine(); -+ do { } while (in.readLine() != null); - return true; //discard the rest to EOF - } - }
--- a/patches/ecj/icedtea.patch Wed Sep 30 13:02:58 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,806 +0,0 @@ -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 2009-03-30 17:13:01.000000000 +0100 -+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-07-14 17:47:13.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 - # pept and before rmi. --SUBDIRS = sources pept corespi core spi impl rmi -+SUBDIRS = org pept corespi core spi impl rmi - all build clean clobber:: - $(SUBDIRS-loop) - -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 2009-07-14 17:47:13.000000000 +0100 -@@ -0,0 +1,38 @@ -+# -+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+BUILDDIR = ../../../../.. -+PACKAGE = com.sun.corba.se -+PRODUCT = org -+ -+include $(BUILDDIR)/common/Defs.gmk -+ -+FILES_java=\ -+ com/sun/corba/se/org/omg/CORBA/ORB.java -+ -+# -+# Include -+# -+include $(BUILDDIR)/common/Classes.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 2009-03-30 17:13:01.000000000 +0100 -+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-07-14 17:47:13.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 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-07-14 17:47:13.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 2009-03-30 23:07:09.000000000 +0100 -+++ openjdk-ecj/corba/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -201,8 +201,10 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ - $(CAT) $(JAVA_SOURCE_LIST); \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -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 2009-03-30 23:07:09.000000000 +0100 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -120,31 +120,14 @@ - JAVACFLAGS += $(OTHER_JAVACFLAGS) - - # Needed for javah --JAVAHFLAGS += -classpath $(CLASSBINDIR) -+JAVAHFLAGS += -classpath $(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 -+# 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) - - # 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 2009-03-30 17:13:01.000000000 +0100 -+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-07-14 17:47:13.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 2009-03-30 23:07:09.000000000 +0100 -+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-07-14 17:47:13.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/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml ---- openjdk-ecj.orig/jaxp/make/build.xml 2009-06-30 14:24:48.000000000 +0100 -+++ openjdk-ecj/jaxp/make/build.xml 2009-07-14 17:47:13.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}/"/> -@@ -87,7 +90,8 @@ - memoryMaximumSize="${javac.memoryMaximumSize}" - source="${javac.source}" - debug="${javac.debug}" -- target="${javac.target}"> -+ target="${javac.target}" -+ executable="${javac.executable}"> - <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - </javac> -diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile ---- openjdk-ecj.orig/jaxp/make/Makefile 2009-07-14 17:37:17.000000000 +0100 -+++ openjdk-ecj/jaxp/make/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -92,7 +92,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 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-ecj/jaxws/make/build.properties 2009-07-14 17:47:13.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 2009-06-30 14:24:56.000000000 +0100 -+++ openjdk-ecj/jaxws/make/build.xml 2009-07-14 17:47:13.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}/"/> -@@ -111,6 +114,7 @@ - debug="${javac.debug}" - target="${javac.target}" - excludes="com/sun/tools/internal/txw2/**"> -+ <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:${boot.java.home}/jre/lib/rt-system.jar"/> - <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="${javac.no.jdk.warnings}"/> -diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile ---- openjdk-ecj.orig/jaxws/make/Makefile 2009-07-14 17:37:17.000000000 +0100 -+++ openjdk-ecj/jaxws/make/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -92,8 +92,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 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-07-14 17:47:13.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) \ - $(BOOT_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 2009-07-14 17:37:19.000000000 +0100 -+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-07-14 17:54:01.000000000 +0100 -@@ -650,10 +650,21 @@ - RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar - $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) - $(prep-target) -+ifneq (,$(JAR_KNOWS_ATFILE)) - $(CD) $(CLASSBINDIR) && \ - $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ - @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS) -- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) -+ @$(CD) $(CLASSBINDIR) -+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) -+ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ -+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ -+ $(BOOT_JAR_JFLAGS)) -+else -+ (cd $(CLASSBINDIR) && \ -+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ -+ $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) -+endif -+ $(java-vm-cleanup) - - # Create jsse.jar containing SunJSSE implementation classes - JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar -@@ -944,19 +955,6 @@ - @$(CD) $(CLASSBINDIR) && $(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 $(BOOT_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 -@@ -1033,16 +1031,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 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -237,8 +237,9 @@ - $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ - $(CAT) $<.filtered; \ - $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ -+ $(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,7 +303,11 @@ - $(prep-target) - @$(ECHO) "# Running javah:" - $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ -- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) -+ $(CLASSES.export) -+ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ -+ $(JAVAH_CMD) \ -+ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ -+ $(innerclass)) - @$(java-vm-cleanup) - @$(TOUCH) $@ - -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 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -136,33 +136,22 @@ - JAVACFLAGS += $(OTHER_JAVACFLAGS) - - # Needed for javah --JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) -+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) - - # Needed for JAVADOC and BOOT_JAVACFLAGS - NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true - - # 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 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-07-14 17:47:13.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 2009-05-08 16:10:43.000000000 +0100 -+++ openjdk-ecj/jdk/make/java/text/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -81,8 +81,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 2009-05-08 16:10:43.000000000 +0100 -+++ openjdk-ecj/jdk/make/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -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) - -diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk ---- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100 -+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -189,3 +189,5 @@ - java/awt/dnd/DnDConstants.java \ - sun/awt/CausedFocusEvent.java - -+EXPORTED_inner = \ -+ sun.java2d.opengl.OGLContext$$OGLContextCaps -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 2009-05-08 16:10:44.000000000 +0100 -+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -401,10 +401,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 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-07-14 17:47:13.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 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-07-14 17:47:13.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 2009-07-14 17:37:19.000000000 +0100 -+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -294,11 +294,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`; \ -@@ -308,20 +304,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) \ -- -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ -+ $(ECHO) "0,0" >> $$classname ; \ - $(ECHO) "}; }" >> $$classname; \ - 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) \ -- -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 2009-07-14 17:36:40.000000000 +0100 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-14 17:47:13.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 2009-07-14 17:36:32.000000000 +0100 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-07-14 17:47:13.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 2009-07-14 17:36:32.000000000 +0100 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-07-14 17:47:13.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/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h ---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100 -+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-07-14 17:47:13.000000000 +0100 -@@ -27,6 +27,7 @@ - #define OGLContext_h_Included - - #include "sun_java2d_pipe_BufferedContext.h" -+#include "sun_java2d_pipe_hw_ContextCapabilities.h" - #include "sun_java2d_opengl_OGLContext.h" - #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" - -@@ -100,39 +101,39 @@ - * See OGLContext.java for more on these flags. - */ - #define CAPS_EMPTY \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY - #define CAPS_RT_PLAIN_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA - #define CAPS_RT_TEXTURE_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA - #define CAPS_RT_TEXTURE_OPAQUE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE - #define CAPS_MULTITEXTURE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE - #define CAPS_TEXNONPOW2 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 - #define CAPS_TEXNONSQUARE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE - #define CAPS_PS20 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 - #define CAPS_PS30 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 - #define LAST_SHARED_CAP \ - sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP - #define CAPS_EXT_FBOBJECT \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT - #define CAPS_STORED_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA - #define CAPS_DOUBLEBUFFERED \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED - #define CAPS_EXT_LCD_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER - #define CAPS_EXT_BIOP_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER - #define CAPS_EXT_GRAD_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER - #define CAPS_EXT_TEXRECT \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT - - /** - * Evaluates to true if the given capability bitmask is present for the -diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml ---- openjdk-ecj.orig/langtools/make/build.xml 2009-06-30 14:25:18.000000000 +0100 -+++ openjdk-ecj/langtools/make/build.xml 2009-07-14 17:47:13.000000000 +0100 -@@ -516,6 +516,7 @@ - includeAntRuntime="no" - source="@{javac.source}" - target="@{javac.target}"> -+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/> - <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> - <compilerarg line="${javac.version.opt}"/> - <compilerarg line="-Xlint"/> -@@ -532,6 +533,7 @@ - target="@{javac.target}" - debug="${javac.debug}" - debuglevel="${javac.debuglevel}"> -+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/> - <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> - <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> - <compilerarg line="${javac.no.jdk.warnings}"/> -diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile ---- openjdk-ecj.orig/langtools/make/Makefile 2009-07-14 17:37:17.000000000 +0100 -+++ openjdk-ecj/langtools/make/Makefile 2009-07-14 17:47:13.000000000 +0100 -@@ -130,7 +130,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 -diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk ---- openjdk-ecj.orig/make/jdk-rules.gmk 2009-07-14 17:37:18.000000000 +0100 -+++ openjdk-ecj/make/jdk-rules.gmk 2009-07-14 17:47:13.000000000 +0100 -@@ -58,7 +58,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