changeset in /hg/icedtea: Fix issues discovered by make distchec...
Andrew John Hughes
ahughes at redhat.com
Fri May 29 08:04:08 PDT 2009
changeset ad579e9833cc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ad579e9833cc
description:
Fix issues discovered by make distcheck and rename --enable-liveconnect to --enable-plugin.
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Only distribute liveconnect code when
either plugin is enabled. Rename netx in the
build directory to netx.build to avoid conflicts.
Make sure netx is in EXTRA_DIST and build is cleaned up
fully.
* configure.ac:
Rename --enable-liveconnect to --enable-plugin.
* patches/icedtea-liveconnect-dist.patch:
Split from icedtea-netx.patch to enable conditional use.
* patches/icedtea-netx.patch:
Recreated without liveconnect distribution.
diffstat:
5 files changed, 118 insertions(+), 63 deletions(-)
ChangeLog | 15 +++++++
Makefile.am | 37 +++++++++++------
configure.ac | 4 -
patches/icedtea-liveconnect-dist.patch | 67 ++++++++++++++++++++++++++++++++
patches/icedtea-netx.patch | 58 ++++-----------------------
diffs (331 lines):
diff -r 9a8c3c90bdb2 -r ad579e9833cc ChangeLog
--- a/ChangeLog Fri May 29 15:28:39 2009 +0200
+++ b/ChangeLog Fri May 29 16:05:14 2009 +0100
@@ -1,3 +1,18 @@ 2009-05-29 Xerxes RÃ¥nby <xerxes at zafen
+2009-05-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Only distribute liveconnect code when
+ either plugin is enabled. Rename netx in the
+ build directory to netx.build to avoid conflicts.
+ Make sure netx is in EXTRA_DIST and build is cleaned up
+ fully.
+ * configure.ac:
+ Rename --enable-liveconnect to --enable-plugin.
+ * patches/icedtea-liveconnect-dist.patch:
+ Split from icedtea-netx.patch to enable conditional use.
+ * patches/icedtea-netx.patch:
+ Recreated without liveconnect distribution.
+
2009-05-29 Xerxes RÃ¥nby <xerxes at zafena.se>
* Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2
diff -r 9a8c3c90bdb2 -r ad579e9833cc Makefile.am
--- a/Makefile.am Fri May 29 15:28:39 2009 +0200
+++ b/Makefile.am Fri May 29 16:05:14 2009 +0100
@@ -84,7 +84,8 @@ distclean-local: clean-copy clean-jtreg
rm -rf stamps
rm -f rt-source-files.txt \
hotspot-tools-source-files.txt \
- extra-source-files.txt
+ extra-source-files.txt \
+ netx-source-files.txt
rm -rf bootstrap
rm -rf lib
rm -rf extra-lib
@@ -94,6 +95,7 @@ distclean-local: clean-copy clean-jtreg
rm -rf rt/netscape
rm -rf visualvm
rm -rf netbeans
+ rm -rf netx.build
if ENABLE_PLUGIN
rm -f IcedTeaPlugin.o IcedTeaPlugin.so
endif
@@ -1493,7 +1495,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr
IcedTeaPlugin.cc \
IcedTeaNPPlugin.cc \
HACKING $(PULSEAUDIO_SRCS) fsg.sh \
- plugin hotspot.map autogen.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.
@@ -1568,7 +1570,7 @@ ICEDTEA_ENV = \
"RHINO_JAR=$(RHINO_JAR)" \
"DISTRIBUTION_ID=$(DIST_ID)" \
"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
- "ALT_NETX_DIST=$(abs_top_builddir)/netx" \
+ "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
"ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
if WITH_CACAO
@@ -1652,7 +1654,7 @@ ICEDTEA_ENV_ECJ = \
"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" \
+ "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
"ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
if WITH_CACAO
@@ -2125,6 +2127,14 @@ endif
endif
endif
+if ENABLE_PLUGIN
+ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch
+else
+if ENABLE_NPPLUGIN
+ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch
+endif
+endif
+
stamps/extract.stamp: stamps/download.stamp
if OPENJDK_SRC_DIR_FOUND
cp -a $(OPENJDK_SRC_DIR) openjdk
@@ -2304,12 +2314,13 @@ if ENABLE_NPPLUGIN
cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
mkdir -p rt
cp -a $(abs_top_srcdir)/plugin/icedteanp/netscape rt/
-endif
+else
if ENABLE_PLUGIN
cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
mkdir -p rt
cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
chmod -R ug+w rt
+endif
endif
clean-patch:
@@ -3156,9 +3167,9 @@ 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
+ mkdir -p $(abs_top_builddir)/netx.build
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d $(abs_top_builddir)/netx \
+ -d $(abs_top_builddir)/netx.build \
-source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \
@@ -3168,13 +3179,15 @@ stamps/netx.stamp: netx-source-files.txt
touch stamps/netx.stamp
stamps/netx-dist.stamp: stamps/netx.stamp
- (cd $(abs_top_builddir)/netx ; \
+ (cd $(abs_top_builddir)/netx.build ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
- cd $(abs_top_srcdir)/netx ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx/lib/classes.jar \
+ 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/lib/src.zip javax net )
+ $(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net )
mkdir -p stamps
touch stamps/netx-dist.stamp
@@ -3575,7 +3588,7 @@ jtregcheck: jtreg check-hotspot check-la
$(jtreg_processes); \
fi
-check-local: jtregcheck
+#check-local: jtregcheck
# VisualVM
diff -r 9a8c3c90bdb2 -r ad579e9833cc configure.ac
--- a/configure.ac Fri May 29 15:28:39 2009 +0200
+++ b/configure.ac Fri May 29 16:05:14 2009 +0100
@@ -154,8 +154,8 @@ AC_MSG_RESULT(${enable_visualvm})
AC_MSG_RESULT(${enable_visualvm})
AC_MSG_CHECKING([whether to build the LiveConnect plugin])
-AC_ARG_ENABLE([liveconnect],
- [AS_HELP_STRING([--disable-liveconnect],
+AC_ARG_ENABLE([plugin],
+ [AS_HELP_STRING([--disable-plugin],
[Disable compilation of browser plugin])],
[enable_plugin="${enableval}"], [enable_plugin="yes"])
AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
diff -r 9a8c3c90bdb2 -r ad579e9833cc patches/icedtea-liveconnect-dist.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-liveconnect-dist.patch Fri May 29 16:05:14 2009 +0100
@@ -0,0 +1,67 @@
+diff -Nru openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk
+--- openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100
++++ openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-28 09:18:45.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 openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk openjdk2/jdk/make/common/internal/ImportComponents.gmk
+--- openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100
++++ openjdk2/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:11:58.000000000 +0100
+@@ -46,6 +46,9 @@
+ ifndef JAXWS_DIST
+ include $(BUILDDIR)/common/internal/Defs-jaxws.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))
+@@ -157,6 +160,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,LIVECONNECT_DIST,$1)
+ endef
+
+ # Clean up import files
+diff -Nru openjdk2.orig/jdk/make/common/shared/Defs.gmk openjdk2/jdk/make/common/shared/Defs.gmk
+--- openjdk2.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100
++++ openjdk2/jdk/make/common/shared/Defs.gmk 2009-05-29 02:12:06.000000000 +0100
+@@ -344,6 +344,11 @@
+ else
+ JAXWS_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 9a8c3c90bdb2 -r ad579e9833cc patches/icedtea-netx.patch
--- a/patches/icedtea-netx.patch Fri May 29 15:28:39 2009 +0200
+++ b/patches/icedtea-netx.patch Fri May 29 16:05:14 2009 +0100
@@ -1,37 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/i
-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
++++ 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.
@@ -72,22 +41,19 @@ diff -Nru openjdk.orig/jdk/make/common/i
+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 @@
+--- 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
-+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 @@
+@@ -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)
@@ -95,19 +61,18 @@ diff -Nru openjdk.orig/jdk/make/common/i
endef
# Import all component docs into directory $1 (optional)
-@@ -157,6 +164,8 @@
+@@ -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)
-+$(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 @@
+--- 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
@@ -116,11 +81,6 @@ diff -Nru openjdk.orig/jdk/make/common/s
+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
More information about the distro-pkg-dev
mailing list