Mercurial > hg > release > icedtea-1.10
changeset 1835:c93a65ee7a4f
* configure.ac (JNLP_ABOUT_NEEDED): New check.
* Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar
when needed.
(stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy
about.jar and jnlp resources when needed.
(stamps/icedtea-debug.stamp): Likewise.
(stamps/jibx.stamp): Don't depend on extra-lib/about.jar.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Sun, 24 May 2009 13:57:17 +0200 |
| parents | fc4b452e23e1 |
| children | 51313371451a |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 23 23:44:03 2009 +0200 +++ b/ChangeLog Sun May 24 13:57:17 2009 +0200 @@ -1,3 +1,13 @@ +2009-05-24 Mark Wielaard <mark@klomp.org> + + * configure.ac (JNLP_ABOUT_NEEDED): New check. + * Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar + when needed. + (stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy + about.jar and jnlp resources when needed. + (stamps/icedtea-debug.stamp): Likewise. + (stamps/jibx.stamp): Don't depend on extra-lib/about.jar. + 2009-05-23 Mark Wielaard <mark@klomp.org> * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net.
--- a/Makefile.am Sat May 23 23:44:03 2009 +0200 +++ b/Makefile.am Sun May 24 13:57:17 2009 +0200 @@ -27,17 +27,20 @@ ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +JNLP_ABOUT_TARGET = extra-lib/about.jar else if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +JNLP_ABOUT_TARGET = extra-lib/about.jar else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = PLUGIN_PATCH = patches/icedtea-plugin.patch LIVECONNECT_DIR = +JNLP_ABOUT_TARGET = endif endif @@ -2651,7 +2654,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -2704,12 +2707,14 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if JNLP_ABOUT_NEEDED 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 +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -2735,7 +2740,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -2788,12 +2793,14 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -3127,7 +3134,7 @@ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ fi -stamps/jibx.stamp: extra-lib/about.jar +stamps/jibx.stamp: if ENABLE_NIMBUS if ENABLE_NIMBUS_GENERATION mkdir $(JIBX_DEPS_DIR)
--- a/configure.ac Sat May 23 23:44:03 2009 +0200 +++ b/configure.ac Sun May 24 13:57:17 2009 +0200 @@ -169,6 +169,8 @@ AM_CONDITIONAL(ENABLE_NPPLUGIN, test "x${enable_npplugin}" = "xyes") AC_MSG_RESULT(${enable_npplugin}) +AM_CONDITIONAL(JNLP_ABOUT_NEEDED, test "x${enable_npplugin}" = "xyes" -o "x${enable_plugin}" = "xyes") + AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], [AS_HELP_STRING([--enable-pulse-java],