Mercurial > hg > release > icedtea-1.10

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-05-28 03:24:40.000000000 +0100
@@ -0,0 +1,27 @@
+#
+# 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
+
+IMPORT_TOOLS_PACKAGES +=
+
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 00:58:47.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-28 00:50:28.000000000 +0100
+++ openjdk/jdk/make/common/internal/ImportComponents.gmk	2009-05-28 03:23:51.000000000 +0100
@@ -46,6 +46,12 @@
 ifndef JAXWS_DIST
   include $(BUILDDIR)/common/internal/Defs-jaxws.gmk
 endif
+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))
@@ -119,6 +125,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 +164,8 @@
 $(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)
+$(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-05-28 01:00:54.000000000 +0100
+++ openjdk/jdk/make/common/shared/Defs.gmk	2009-05-28 03:23:06.000000000 +0100
@@ -344,6 +344,16 @@
 else
   JAXWS_DIST =
 endif
+ifdef ALT_NETX_DIST
+  NETX_DIST := $(call FullPath,$(ALT_NETX_DIST))
+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
author	Andrew John Hughes <ahughes@redhat.com>
date	Thu, 28 May 2009 10:18:19 +0100
parents
children	ad579e9833cc