/hg/icedtea6: NetX/plugin build sync (2/3): Have the OpenJDK bui...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 15 15:01:40 PDT 2010
changeset 388bb89496bc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=388bb89496bc
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 15 22:01:12 2010 +0000
NetX/plugin build sync (2/3): Have the OpenJDK build extract the
built plugin and NetX code as imports, not binary plugs.
2010-03-15 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (2/3): Have the OpenJDK build
extract the built plugin and NetX code as imports,
not binary plugs. File patches that extend OpenJDK (NetX,
plugin, Zero/Shark) under a new subdirectory, extensions.
* patches/icedtea-liveconnect.patch: Moved to extensions
subdirectory and recreated after application of netx.patch.
* patches/icedtea-plugin.patch: Removed, unused.
* patches/icedtea-webstart-umask.patch,
* patches/icedtea-webstart.patch: Moved to extensions
subdirectory.
* Makefile.am: (ICEDTEANPPLUGIN_TARGET): Add liveconnect-
dist.stamp. (ICEDTEAPLUGIN_TARGET): Likewise.
(PLUGIN_PATCH): Removed. (ICEDTEA_PATCHES): Add conditional
plugin patches in same manner as all other conditional
patches. Fix paths of NetX patches and add new netx-dist
patch. Add liveconnect-dist.patch. (ICEDTEA_ENV):
Add ALT_NETX_DIST and ALT_LIVECONNECT_DIST to specify
locations of NetX and plugin jar files. (ICEDTEA_ECJ_ENV):
Likewise. (stamps/patch.stamp): Remove copying of plugin
source files. (stamps/icedtea.stamp): Depend on netx-
dist.stamp. (stamps/icedtea-debug.stamp): Likewise.
(stamps/icedtea-ecj.stamp): Depend on netx-dist.stamp and
plugin.stamp. (stamps/plugin-tests.stamp): Depend on
stamps/plugin.stamp, not rt-closed.jar. Surround by
ENABLE_PLUGIN rather than using a (now broken) test on
lib/rt/netscape.
* patches/extensions/liveconnect-dist.patch: Make the OpenJDK
build import the plugin code in the same manner as
langtools, CORBA, JAXP and JAXWS.
* patches/extensions/liveconnect.patch: Was patches/icedtea-
liveconnect.patch.
* patches/extensions/netx-dist.patch: Same as liveconnect-
dist, but for NetX.
* patches/extensions/netx-umask.patch: Renamed from patches
/icedtea-webstart-umask.patch.
* patches/extensions/netx.patch: Renamed from patches/icedtea-
webstart.patch.
diffstat:
11 files changed, 632 insertions(+), 1723 deletions(-)
ChangeLog | 47 +
Makefile.am | 71 -
patches/extensions/liveconnect-dist.patch | 76 +
patches/extensions/liveconnect.patch | 87 +
patches/extensions/netx-dist.patch | 86 +
patches/extensions/netx-umask.patch | 164 +++
patches/extensions/netx.patch | 137 +++
patches/icedtea-liveconnect.patch | 85 -
patches/icedtea-plugin.patch | 1301 -----------------------------
patches/icedtea-webstart-umask.patch | 164 ---
patches/icedtea-webstart.patch | 137 ---
diffs (truncated from 2499 to 500 lines):
diff -r 3aa674c581d7 -r 388bb89496bc ChangeLog
--- a/ChangeLog Mon Mar 15 13:35:18 2010 -0400
+++ b/ChangeLog Mon Mar 15 22:01:12 2010 +0000
@@ -1,3 +1,50 @@ 2010-03-13 Deepak Bhole <dbhole at redhat.
+2010-03-15 Andrew John Hughes <ahughes at redhat.com>
+
+ NetX/plugin build sync (2/3):
+ Have the OpenJDK build extract the
+ built plugin and NetX code as imports,
+ not binary plugs. File patches that
+ extend OpenJDK (NetX, plugin, Zero/Shark)
+ under a new subdirectory, extensions.
+ * patches/icedtea-liveconnect.patch:
+ Moved to extensions subdirectory and
+ recreated after application of netx.patch.
+ * patches/icedtea-plugin.patch:
+ Removed, unused.
+ * patches/icedtea-webstart-umask.patch,
+ * patches/icedtea-webstart.patch:
+ Moved to extensions subdirectory.
+ * Makefile.am:
+ (ICEDTEANPPLUGIN_TARGET): Add liveconnect-dist.stamp.
+ (ICEDTEAPLUGIN_TARGET): Likewise.
+ (PLUGIN_PATCH): Removed.
+ (ICEDTEA_PATCHES): Add conditional plugin patches in
+ same manner as all other conditional patches. Fix
+ paths of NetX patches and add new netx-dist patch.
+ Add liveconnect-dist.patch.
+ (ICEDTEA_ENV): Add ALT_NETX_DIST and ALT_LIVECONNECT_DIST
+ to specify locations of NetX and plugin jar files.
+ (ICEDTEA_ECJ_ENV): Likewise.
+ (stamps/patch.stamp): Remove copying of plugin source files.
+ (stamps/icedtea.stamp): Depend on netx-dist.stamp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ (stamps/icedtea-ecj.stamp): Depend on netx-dist.stamp and
+ plugin.stamp.
+ (stamps/plugin-tests.stamp): Depend on stamps/plugin.stamp,
+ not rt-closed.jar. Surround by ENABLE_PLUGIN rather than
+ using a (now broken) test on lib/rt/netscape.
+ * patches/extensions/liveconnect-dist.patch:
+ Make the OpenJDK build import the plugin code in the same
+ manner as langtools, CORBA, JAXP and JAXWS.
+ * patches/extensions/liveconnect.patch:
+ Was patches/icedtea-liveconnect.patch.
+ * patches/extensions/netx-dist.patch:
+ Same as liveconnect-dist, but for NetX.
+ * patches/extensions/netx-umask.patch:
+ Renamed from patches/icedtea-webstart-umask.patch.
+ * patches/extensions/netx.patch:
+ Renamed from patches/icedtea-webstart.patch.
+
2010-03-13 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diff -r 3aa674c581d7 -r 388bb89496bc Makefile.am
--- a/Makefile.am Mon Mar 15 13:35:18 2010 -0400
+++ b/Makefile.am Mon Mar 15 22:01:12 2010 +0000
@@ -135,8 +135,8 @@ endif
# FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
if ENABLE_NPPLUGIN
ICEDTEANPPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-ICEDTEANPPLUGIN_TARGET = $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
-PLUGIN_PATCH = patches/icedtea-liveconnect.patch
+ICEDTEANPPLUGIN_TARGET = $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
+ stamps/liveconnect-dist.stamp
LIVECONNECT_DIR = -C liveconnect netscape -C liveconnect sun/applet
NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
NPPLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
@@ -144,15 +144,13 @@ else
else
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
-PLUGIN_PATCH = patches/icedtea-liveconnect.patch
+ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so stamps/liveconnect-dist.stamp
LIVECONNECT_DIR = -C liveconnect netscape -C liveconnect sun/applet
NPPLUGIN_DIR =
LIVECONNECT_SRCS = $(abs_top_srcdir)/plugin/icedtea
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
-PLUGIN_PATCH =
LIVECONNECT_DIR =
NPPLUGIN_DIR =
LIVECONNECT_SRCS =
@@ -246,9 +244,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-copy-plugs.patch \
patches/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-use-system-tzdata.patch \
@@ -317,11 +312,20 @@ ICEDTEA_PATCHES = \
patches/icedtea-linux-separate-debuginfo.patch \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
- patches/libpng.patch
+ patches/libpng.patch \
+ patches/extensions/netx.patch \
+ patches/extensions/netx-dist.patch \
+ patches/extensions/netx-umask.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/icedtea-rhino.patch
+endif
+
+if ENABLE_PLUGIN
+ICEDTEA_PATCHES += \
+ patches/extensions/liveconnect.patch \
+ patches/extensions/liveconnect-dist.patch
endif
if BUILD_CACAO
@@ -334,6 +338,7 @@ ICEDTEA_PATCHES += patches/cacao/nio2.pa
ICEDTEA_PATCHES += patches/cacao/nio2.patch
endif
endif
+
if WITH_CACAO
ICEDTEA_PATCHES += \
patches/icedtea-cacao-ignore-jdi-tests.patch \
@@ -466,7 +471,9 @@ ICEDTEA_ENV = \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
- VERBOSE="$(VERBOSE)"
+ VERBOSE="$(VERBOSE)" \
+ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
+ ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
if WITH_CACAO
ICEDTEA_ENV += \
@@ -561,7 +568,9 @@ ICEDTEA_ENV_ECJ = \
DISABLE_NIMBUS="true" \
NO_DOCS="true" \
ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
- VERBOSE="$(VERBOSE)"
+ VERBOSE="$(VERBOSE)" \
+ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
+ ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
@@ -1112,15 +1121,6 @@ if HAS_PKGVERSION
if HAS_PKGVERSION
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ;
-endif
-
-#FIXME (plugin): Don't do this copying
-if ENABLE_NPPLUGIN
- cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-else
-if ENABLE_PLUGIN
- cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-endif
endif
clean-patch:
@@ -1333,7 +1333,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/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+ stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1432,7 +1432,7 @@ endif
touch stamps/icedtea.stamp
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+ stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1555,8 +1555,8 @@ stamps/icedtea-debug-against-icedtea.sta
# ===================
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/plugs.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
- stamps/rewrite-rhino.stamp
+ stamps/netx-dist.stamp stamps/plugs.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
+ stamps/rewrite-rhino.stamp stamps/plugin.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
@@ -2090,22 +2090,21 @@ endif
# plugin tests
+if ENABLE_PLUGIN
stamps/plugin-tests.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) $(PLUGIN_TEST_SRCS) \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+ stamps/plugin.stamp
mkdir -p plugin/tests/LiveConnect
- if test -d lib/rt/netscape ; then \
- set -e ; \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d plugin/tests/LiveConnect \
- -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
- plugin/tests/LiveConnect/*.class ; \
- cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; \
- echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+ -d plugin/tests/LiveConnect \
+ -classpath liveconnect/lib/classes.jar \
+ -source 1.5 $(PLUGIN_TEST_SRCS) ;
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+ plugin/tests/LiveConnect/*.class ;
+ cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ;
+ echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
mkdir -p stamps
touch stamps/plugin-tests.stamp
+endif
# jtreg
diff -r 3aa674c581d7 -r 388bb89496bc patches/extensions/liveconnect-dist.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/extensions/liveconnect-dist.patch Mon Mar 15 22:01:12 2010 +0000
@@ -0,0 +1,76 @@
+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 3aa674c581d7 -r 388bb89496bc patches/extensions/liveconnect.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/extensions/liveconnect.patch Mon Mar 15 22:01:12 2010 +0000
@@ -0,0 +1,87 @@
+diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk
+--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-03-15 19:46:02.000000000 +0000
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-03-15 20:19:29.000000000 +0000
+@@ -86,6 +86,8 @@
+
+ JNLP_PKGS = javax.jnlp
+
++JAVASCRIPT_PKGS = netscape.javascript
++
+ # non-core packages in rt.jar
+ NON_CORE_PKGS = $(DOMAPI_PKGS) \
+ $(MGMT_PKGS) \
+@@ -94,4 +96,5 @@
+ $(OLD_JSSE_PKGS) \
+ $(HTTPSERVER_PKGS) \
+ $(SMARTCARDIO_PKGS) \
+- $(JNLP_PKGS)
++ $(JNLP_PKGS) \
++ $(JAVASCRIPT_PKGS)
+diff -Nru openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
+--- openjdk.orig/jdk/make/sun/Makefile 2010-02-17 03:14:13.000000000 +0000
++++ openjdk/jdk/make/sun/Makefile 2010-03-15 20:18:31.000000000 +0000
+@@ -66,6 +66,7 @@
+ $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
+ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
+ jawt text nio launcher management $(ORG_SUBDIR) \
++ plugin \
+ native2ascii serialver tools jconsole
+
+ all build clean clobber::
+diff -Nru openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
+--- openjdk.orig/jdk/make/sun/plugin/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/sun/plugin/Makefile 2010-03-15 20:18:31.000000000 +0000
+@@ -0,0 +1,53 @@
++#
++# Copyright 1995-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.
++#
++
++#
++# Makefile for pluginappletviewer wrapper.
++#
++
++BUILDDIR = ../..
++PACKAGE = sun.applet
++PRODUCT = sun
++PROGRAM = pluginappletviewer
++include $(BUILDDIR)/common/Defs.gmk
++
++#
++# Files to compile.
++#
++AUTO_FILES_JAVA_DIRS = sun/applet
++
++ifneq ($(PLATFORM), windows)
++ #
++ # Anything with a GUI needs X11 to be linked in.
++ #
++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
++endif # PLATFORM
++
++#
++# Rules
++#
++JAVA_ARGS = { "sun.applet.PluginMain" }
++include $(BUILDDIR)/common/Program.gmk
++
diff -r 3aa674c581d7 -r 388bb89496bc patches/extensions/netx-dist.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/extensions/netx-dist.patch Mon Mar 15 22:01:12 2010 +0000
@@ -0,0 +1,86 @@
+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 3aa674c581d7 -r 388bb89496bc patches/extensions/netx-umask.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/extensions/netx-umask.patch Mon Mar 15 22:01:12 2010 +0000
@@ -0,0 +1,164 @@
+--- openjdk/jdk/make/launchers/Makefile.launcher.orig 2008-07-09 12:49:00.000000000 -0400
++++ openjdk/jdk/make/launchers/Makefile.launcher 2008-07-09 12:49:40.000000000 -0400
+@@ -148,6 +148,16 @@
+ endif
+ endif
+
++# pluginappletviewer only
++ifeq ($(PROGRAM), pluginappletviewer)
++ OTHER_CPPFLAGS += -DUSE_UMASK=\"077\"
More information about the distro-pkg-dev
mailing list