/hg/icedtea6: Apply patch (modified from original by Andrew Hugh...
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Mon Aug 9 14:10:42 PDT 2010
changeset 0974e80c4a6e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0974e80c4a6e
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Aug 09 17:08:38 2010 -0400
Apply patch (modified from original by Andrew Hughes) to move plugin
and netx classes from rt.jar into plugin.jar and netx.jar.
diffstat:
7 files changed, 151 insertions(+), 210 deletions(-)
ChangeLog | 43 +++++++++
Makefile.am | 132 ++++++++++++++++++++---------
NEWS | 1
patches/extensions/liveconnect-dist.patch | 76 ----------------
patches/extensions/netx-dist.patch | 86 ------------------
patches/icedtea-rhino.patch | 10 --
patches/update-bootclasspath.patch | 13 ++
diffs (495 lines):
diff -r b8fc04b080aa -r 0974e80c4a6e ChangeLog
--- a/ChangeLog Mon Aug 09 11:40:33 2010 -0400
+++ b/ChangeLog Mon Aug 09 17:08:38 2010 -0400
@@ -1,3 +1,46 @@ 2010-08-09 Omair Majid <omajid at redhat.
+2010-08-09 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am:
+ (icedtea):Add update-bootclasspath.patch.
+ dependencies and copying. Add icedtea-update-bootclasspath.patch.
+ * patches/update-bootclasspath.patch: New patch. Adds netx,
+ rhino and plugin jars to the bootclasspath.
+
+2010-08-09 Andrew John Hughes <ahughes at redhat.com>
+
+ Produce separate JAR files for NetX and the
+ plugin (netx.jar and plugin.jar) rather than
+ integrating their code into rt.jar.
+ * patches/extensions/liveconnect-dist.patch,
+ * patches/extensions/netx-dist.patch:
+ Remove unneeded patches to OpenJDK build to
+ integrate NetX and the plugin's Java code.
+ * Makefile.am:
+ (ICEDTEA_ENV): Drop ALT_NETX_DIST and
+ ALT_LIVECONNECT_DIST.
+ (.PHONY): Add new clean targets.
+ (icedtea): Remove unneeded NetX and plugin
+ dependencies and copying.
+ (icedtea-debug): Likewise.
+ (icedtea-against-icedtea): Depend on add-plugin
+ and add-netx.
+ (clean-icedtea-against-icedtea): Depend on clean-add-netx
+ and clean-add-plugin.
+ (icedtea-debug-against-icedtea): Depend on add-plugin-debug
+ and add-netx-debug.
+ (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug
+ and clean-add-plugin-debug.
+ (add-plugin): Copy the plugin library and jar file into the jdk images.
+ (clean-add-plugin): Revert add-plugin.
+ (add-plugin-debug): Equivalent of add-plugin for the debug build.
+ (clean-add-plugin-debug): Revert add-plugin-debug.
+ (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the
+ jdk images.
+ (clean-add-netx): Revert add-netx.
+ (add-netx-debug): Equivalent of add-netx for the debug build.
+ (clean-add-netx-debug): Revert add-netx-debug.
+ (icedtea-ecj): Remove plugin and NetX dependencies.
+
2010-08-09 Omair Majid <omajid at redhat.com>
* NEWS: Update with support for JNLP spec 1.6
diff -r b8fc04b080aa -r 0974e80c4a6e Makefile.am
--- a/Makefile.am Mon Aug 09 11:40:33 2010 -0400
+++ b/Makefile.am Mon Aug 09 17:08:38 2010 -0400
@@ -270,10 +270,10 @@ ICEDTEA_PATCHES = \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
patches/icedtea-policy-evaluation.patch \
+ patches/update-bootclasspath.patch \
patches/libpng.patch \
patches/shark.patch \
patches/extensions/netx.patch \
- patches/extensions/netx-dist.patch \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
@@ -298,8 +298,7 @@ endif
if ENABLE_PLUGIN
ICEDTEA_PATCHES += \
- patches/extensions/liveconnect.patch \
- patches/extensions/liveconnect-dist.patch
+ patches/extensions/liveconnect.patch
endif
if BUILD_CACAO
@@ -444,8 +443,6 @@ ICEDTEA_ENV = \
DEBUG_BINARIES="true" \
ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
VERBOSE="$(VERBOSE)" \
- ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
- ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
if WITH_CACAO
@@ -571,7 +568,8 @@ install:
clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \
clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
- clean-rewriter clean-rewrite-rhino
+ clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \
+ clean-add-plugin clean-add-plugin-debug
env:
@echo 'unset JAVA_HOME'
@@ -1218,9 +1216,7 @@ clean-bootstrap-directory-symlink:
# 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/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
- extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \
- stamps/rewrite-rhino.stamp
+ $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1229,12 +1225,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PLUGIN
- cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
if ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1247,10 +1237,6 @@ if ENABLE_PULSE_JAVA
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
- cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
- cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1294,9 +1280,7 @@ clean-icedtea:
rm -f stamps/icedtea.stamp
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
- extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \
- stamps/rewrite-rhino.stamp
+ $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1305,12 +1289,6 @@ stamps/icedtea-debug.stamp: stamps/boots
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PLUGIN
- cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
if ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1323,10 +1301,6 @@ if ENABLE_PULSE_JAVA
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
- cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \
- cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1371,27 +1345,109 @@ clean-icedtea-debug:
rm -f stamps/icedtea-debug.stamp
stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
+ stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \
+ stamps/add-netx.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
-clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao
+clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx
rm -f stamps/icedtea-against-icedtea.stamp
stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
+ stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \
+ stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
-clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug
+clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \
+ clean-add-netx-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
+
+stamps/add-plugin.stamp: stamps/plugin.stamp
+if ENABLE_PLUGIN
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+endif
+ touch stamps/add-plugin.stamp
+
+clean-add-plugin:
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+ rm -f stamps/add-plugin.stamp
+
+stamps/add-plugin-debug.stamp: stamps/plugin.stamp
+if ENABLE_PLUGIN
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+endif
+ touch stamps/add-plugin-debug.stamp
+
+clean-add-plugin-debug:
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+ rm -f stamps/add-plugin-debug.stamp
+
+stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib
+ touch stamps/add-netx.stamp
+
+clean-add-netx:
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+ rm -f stamps/add-netx.stamp
+
+stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
+ touch stamps/add-netx-debug.stamp
+
+clean-add-netx-debug:
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+ rm -f stamps/add-netx-debug.stamp
# OpenJDK ecj Targets
# ===================
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
- stamps/rewrite-rhino.stamp stamps/plugin.stamp
+ $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
diff -r b8fc04b080aa -r 0974e80c4a6e NEWS
--- a/NEWS Mon Aug 09 11:40:33 2010 -0400
+++ b/NEWS Mon Aug 09 17:08:38 2010 -0400
@@ -723,6 +723,7 @@ New in release 1.9 (2010-XX-XX):
- Fix browser command in BasicService.showDocument(URL)
- Run programs that inherit main(String[]) in their main-class
- Run JNLP file that use spec version 1.6
+* Plugin and NetX classes have been moved from rt.jar into 2 jars, netx.jar and plugin.jar
New in release 1.8.1 (2010-07-28):
diff -r b8fc04b080aa -r 0974e80c4a6e patches/extensions/liveconnect-dist.patch
--- a/patches/extensions/liveconnect-dist.patch Mon Aug 09 11:40:33 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk
---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000
-@@ -0,0 +1,28 @@
-+#
-+# Copyright 2009 Red Hat, 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. Red Hat 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.
-+#
-+
-+# The specific packages that come from or go to rt.jar and tools.jar
-+IMPORT_RT_PACKAGES += \
-+ netscape/javascript \
-+ sun/applet
-+
-+IMPORT_TOOLS_PACKAGES +=
-+
-diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000
-+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000
-@@ -49,6 +49,9 @@
- ifndef NETX_DIST
- include $(BUILDDIR)/common/internal/Defs-netx.gmk
- endif
-+ifndef LIVECONNECT_DIST
-+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk
-+endif
-
- # Clean up these lists so empty lists are empty
- IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-@@ -123,6 +126,7 @@
- $(call import-one-sources,JAXP_DIST,$1)
- $(call import-one-sources,JAXWS_DIST,$1)
- $(call import-one-sources,NETX_DIST,$1)
-+$(call import-one-sources,LIVECONNECT_DIST,$1)
- endef
-
- # Import all component docs into directory $1 (optional)
-@@ -162,6 +166,7 @@
- $(call import-one-classes,JAXP_DIST,$1)
- $(call import-one-classes,JAXWS_DIST,$1)
- $(call import-one-classes,NETX_DIST,$1)
-+$(call import-one-classes,LIVECONNECT_DIST,$1)
- endef
-
- # Clean up import files
-diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000
-+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000
-@@ -365,6 +365,11 @@
- else
- NETX_DIST =
- endif
-+ifdef ALT_LIVECONNECT_DIST
-+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST))
-+else
-+ LIVECONNECT_DIST =
-+endif
-
- # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation
- ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH
diff -r b8fc04b080aa -r 0974e80c4a6e patches/extensions/netx-dist.patch
--- a/patches/extensions/netx-dist.patch Mon Aug 09 11:40:33 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk
---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100
-@@ -0,0 +1,38 @@
-+#
-+# Copyright 2009 Red Hat, 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. Red Hat 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.
-+#
-+
-+# The specific packages that come from or go to rt.jar and tools.jar
-+IMPORT_RT_PACKAGES += \
-+ net/sourceforge/jnlp \
-+ net/sourceforge/jnlp/tools \
-+ net/sourceforge/jnlp/runtime \
-+ net/sourceforge/jnlp/util \
-+ net/sourceforge/jnlp/services \
-+ net/sourceforge/jnlp/security \
-+ net/sourceforge/jnlp/security/viewer \
-+ net/sourceforge/jnlp/cache \
-+ net/sourceforge/jnlp/event \
-+ net/sourceforge/jnlp/resources \
-+ net/sourceforge/nanoxml \
-+ javax/jnlp
-+
-+IMPORT_TOOLS_PACKAGES +=
-+
-diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100
-+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100
-@@ -46,6 +46,9 @@
- ifndef JAXWS_DIST
- include $(BUILDDIR)/common/internal/Defs-jaxws.gmk
- endif
-+ifndef NETX_DIST
-+ include $(BUILDDIR)/common/internal/Defs-netx.gmk
-+endif
-
- # Clean up these lists so empty lists are empty
- IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-@@ -119,6 +122,7 @@
- $(call import-one-sources,CORBA_DIST,$1)
- $(call import-one-sources,JAXP_DIST,$1)
- $(call import-one-sources,JAXWS_DIST,$1)
-+$(call import-one-sources,NETX_DIST,$1)
- endef
-
- # Import all component docs into directory $1 (optional)
-@@ -157,6 +161,7 @@
- $(call import-one-classes,CORBA_DIST,$1)
- $(call import-one-classes,JAXP_DIST,$1)
- $(call import-one-classes,JAXWS_DIST,$1)
-+$(call import-one-classes,NETX_DIST,$1)
- endef
-
- # Clean up import files
-diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100
-@@ -344,6 +344,11 @@
- else
- JAXWS_DIST =
- endif
-+ifdef ALT_NETX_DIST
-+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST))
-+else
-+ NETX_DIST =
-+endif
-
- # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation
- ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH
diff -r b8fc04b080aa -r 0974e80c4a6e patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch Mon Aug 09 11:40:33 2010 -0400
+++ b/patches/icedtea-rhino.patch Mon Aug 09 17:08:38 2010 -0400
@@ -1,13 +1,3 @@
---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000
-@@ -886,6 +886,7 @@
- "%/lib/jsse.jar:"
- "%/lib/jce.jar:"
- "%/lib/charsets.jar:"
-+ "%/lib/rhino.jar:"
- "%/classes";
- char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
- if (sysclasspath == NULL) return false;
--- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000
+++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000
@@ -31,6 +31,8 @@
diff -r b8fc04b080aa -r 0974e80c4a6e patches/update-bootclasspath.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/update-bootclasspath.patch Mon Aug 09 17:08:38 2010 -0400
@@ -0,0 +1,13 @@
+diff -ur openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2010-06-21 17:12:21.000000000 -0400
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2010-08-06 15:48:48.338599142 -0400
+@@ -884,6 +884,9 @@
+ "%/lib/jsse.jar:"
+ "%/lib/jce.jar:"
+ "%/lib/charsets.jar:"
++ "%/lib/netx.jar:"
++ "%/lib/plugin.jar:"
++ "%/lib/rhino.jar:"
+ "%/classes";
+ char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
+ if (sysclasspath == NULL) return false;
More information about the distro-pkg-dev
mailing list