/hg/release/icedtea6-1.9: Allow NetX to be disabled.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Nov 11 14:37:44 PST 2010
changeset caaf70f3a98f in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=caaf70f3a98f
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Nov 11 22:37:38 2010 +0000
Allow NetX to be disabled.
2010-11-11 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Add clean-about.
(.PHONY): Likewise. (ICEDTEA_PATCHES): Only apply netx.patch
and netx-umask.patch if NetX is enabled. (add-netx):
Depend on about.stamp. Add ENABLE_NETX conditional.
(add-netx-debug): Likewise. (netx): Add ENABLE_NETX
conditional. (netx-dist): Likewise. (extra-class-
files): Likewise. (about): New target (from extra-
lib/about.jar). Add ENABLE_NETX conditional. (clean-
about): New target to remove about.jar.
* acinclude.m4: (IT_CHECK_PLUGIN): Require IT_CHECK_NETX.
Disable if NetX is turned off. (IT_CHECK_NETX): Add
--disable-webstart option.
diffstat:
3 files changed, 67 insertions(+), 8 deletions(-)
ChangeLog | 21 +++++++++++++++++++++
Makefile.am | 38 ++++++++++++++++++++++++++++++--------
acinclude.m4 | 16 ++++++++++++++++
diffs (205 lines):
diff -r 17c34c4c6fae -r caaf70f3a98f ChangeLog
--- a/ChangeLog Wed Nov 10 16:30:08 2010 +0000
+++ b/ChangeLog Thu Nov 11 22:37:38 2010 +0000
@@ -1,3 +1,24 @@ 2010-11-10 Andrew John Hughes <ahughes
+2010-11-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add clean-about.
+ (.PHONY): Likewise.
+ (ICEDTEA_PATCHES): Only apply netx.patch and
+ netx-umask.patch if NetX is enabled.
+ (add-netx): Depend on about.stamp. Add
+ ENABLE_NETX conditional.
+ (add-netx-debug): Likewise.
+ (netx): Add ENABLE_NETX conditional.
+ (netx-dist): Likewise.
+ (extra-class-files): Likewise.
+ (about): New target (from extra-lib/about.jar).
+ Add ENABLE_NETX conditional.
+ (clean-about): New target to remove about.jar.
+ * acinclude.m4:
+ (IT_CHECK_PLUGIN): Require IT_CHECK_NETX.
+ Disable if NetX is turned off.
+ (IT_CHECK_NETX): Add --disable-webstart option.
+
2010-11-10 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Remove additional whitespace.
diff -r 17c34c4c6fae -r caaf70f3a98f Makefile.am
--- a/Makefile.am Wed Nov 10 16:30:08 2010 +0000
+++ b/Makefile.am Thu Nov 11 22:37:38 2010 +0000
@@ -288,8 +288,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-policy-evaluation.patch \
patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
patches/libpng.patch \
- patches/extensions/netx.patch \
- patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
patches/openjdk/6678385-window_movement_crasher.patch \
@@ -337,6 +335,12 @@ if WITH_RHINO
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/icedtea-rhino.patch
+endif
+
+if ENABLE_NETX
+ICEDTEA_PATCHES += \
+ patches/extensions/netx.patch \
+ patches/extensions/netx-umask.patch
endif
if ENABLE_PLUGIN
@@ -579,7 +583,7 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \
- clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
+ clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink clean-about \
clean-bootstrap-directory-symlink-ecj
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
@@ -613,7 +617,7 @@ install:
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-add-netx clean-add-netx-debug \
- clean-add-plugin clean-add-plugin-debug
+ clean-add-plugin clean-add-plugin-debug clean-about
env:
@echo 'unset JAVA_HOME'
@@ -1469,7 +1473,8 @@ clean-add-plugin-debug:
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
+stamps/add-netx.stamp: stamps/netx-dist.stamp stamps/about.stamp
+if ENABLE_NETX
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 \
@@ -1486,6 +1491,7 @@ stamps/add-netx.stamp: stamps/netx-dist.
cp $(NETX_SRCDIR)/javaws.1 \
$(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
fi
+endif
touch stamps/add-netx.stamp
clean-add-netx:
@@ -1499,7 +1505,8 @@ clean-add-netx:
rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
rm -f stamps/add-netx.stamp
-stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
+stamps/add-netx-debug.stamp: stamps/netx-dist.stamp stamps/about.stamp
+if ENABLE_NETX
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 \
@@ -1516,6 +1523,7 @@ stamps/add-netx-debug.stamp: stamps/netx
cp $(NETX_SRCDIR)/javaws.1 \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
fi
+endif
touch stamps/add-netx-debug.stamp
clean-add-netx-debug:
@@ -1693,6 +1701,7 @@ netx-source-files.txt:
find $(NETX_SRCDIR) -name '*.java' | sort > $@
stamps/netx.stamp: netx-source-files.txt stamps/rt-class-files.stamp
+if ENABLE_NETX
mkdir -p $(abs_top_builddir)/netx.build
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/netx.build \
@@ -1700,10 +1709,12 @@ stamps/netx.stamp: netx-source-files.txt
-classpath $(RUNTIME) -bootclasspath \'\' \
@netx-source-files.txt
cp -r $(NETX_RESOURCE_DIR) $(abs_top_builddir)/netx.build/net/sourceforge/jnlp
+endif
mkdir -p stamps
touch $@
stamps/netx-dist.stamp: stamps/netx.stamp
+if ENABLE_NETX
(cd $(abs_top_builddir)/netx.build ; \
mkdir -p lib ; \
$(BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
@@ -1713,6 +1724,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
$(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 )
+endif
mkdir -p stamps
touch $@
@@ -1728,11 +1740,13 @@ extra-source-files.txt:
stamps/extra-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
extra-source-files.txt stamps/netx.stamp
+if ENABLE_NETX
mkdir -p extra-lib
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
-sourcepath extra -cp netx.build \
-bootclasspath $(RUNTIME) @extra-source-files.txt
cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
+endif
mkdir -p stamps
touch $@
@@ -1741,8 +1755,16 @@ clean-extra:
rm -f stamps/extra-class-files.stamp
rm -f extra-source-files.txt
-extra-lib/about.jar: stamps/extra-class-files.stamp
- $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
+stamps/about.stamp: stamps/extra-class-files.stamp
+if ENABLE_NETX
+ $(BOOT_DIR)/bin/jar cf extra-lib/about.jar -C extra-lib net
+endif
+ mkdir -p stamps
+ touch $@
+
+clean-about:
+ rm -f extra-lib/about.jar
+ rm -f stamps/about.stamp
# PulseAudio based mixer
# (pulse-java)
diff -r 17c34c4c6fae -r caaf70f3a98f acinclude.m4
--- a/acinclude.m4 Wed Nov 10 16:30:08 2010 +0000
+++ b/acinclude.m4 Thu Nov 11 22:37:38 2010 +0000
@@ -1459,12 +1459,17 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
[
+AC_REQUIRE([IT_CHECK_NETX])
AC_MSG_CHECKING([whether to build the browser plugin])
AC_ARG_ENABLE([plugin],
[AS_HELP_STRING([--disable-plugin],
[Disable compilation of browser plugin])],
[enable_plugin="${enableval}"], [enable_plugin="yes"])
AC_MSG_RESULT(${enable_plugin})
+if test "x${enable_netx}" = "xno" ; then
+ AC_MSG_WARN([Plugin can not be built without NetX; disabling plugin])
+ enable_plugin=no;
+fi
])
AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES],
@@ -1556,3 +1561,14 @@ AM_CONDITIONAL([HAS_PAX], test x"${it_cv
AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_CHECK_NETX],
+[
+AC_MSG_CHECKING([whether to build NetX])
+AC_ARG_ENABLE([webstart],
+ [AS_HELP_STRING([--disable-webstart],
+ [Disable compilation of Web Start support])],
+ [enable_netx="${enableval}"], [enable_netx="yes"])
+AC_MSG_RESULT(${enable_netx})
+AM_CONDITIONAL(ENABLE_NETX, test "x${enable_netx}" = "xyes")
+])
More information about the distro-pkg-dev
mailing list