/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Sep 24 07:25:59 PDT 2010
changeset b5f9559a47bf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b5f9559a47bf
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:19:50 2010 +0100
Remove old tarballs before trying to remove the drops directory.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (distclean-local): Remove any old
tarballs before trying to remove the drops directory.
changeset 5c0d756b4bb6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c0d756b4bb6
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 15:25:51 2010 +0100
Support additional targets for the ecj build.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (.PHONY): Add new clean targets.
(icedtea-against-icedtea): Don't depend on bootstrap-
directory-symlink, icedtea already does. (clean-icedtea-
against-icedtea): Remove superfluous space. (icedtea-debug-
against-icedtea): Likewise. (icedtea-ecj): Fix formatting.
(icedtea-against-ecj): Add new add-x-ecj targets. (clean-
icedtea-against-ecj): Add new clean-add-x-ecj targets. (add-
plugin-ecj): Add plugin support to the ecj build. (clean-
plugin-ecj): Remove plugin support from the ecj build. (add-
netx-ecj): Add NetX support to the ecj build. (clean-netx-
ecj): Remove NetX support from the ecj build. (add-
systemtap-ecj): Add SystemTap support to the ecj build.
(clean-add-systemtap-ecj): Remove SystemTap support from the ecj
build. (add-pulseaudio-ecj): New target to add PulseAudio
support to the ecj build. (clean-add-pulseaudio-ecj): Remove
PulseAudio support from the ecj build. (add-nss-ecj): New
target to add NSS support to the ecj build. (clean-add-nss-
ecj): Remove NSS support from the ecj build. (add-tzdata-
support-ecj): New target to add alternate timezone data support to
the ecj build. (clean-add-tzdata-support-ecj): Remove
alternate timezone data support from the ecj build.
diffstat:
2 files changed, 168 insertions(+), 20 deletions(-)
ChangeLog | 30 +++++++++++
Makefile.am | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
diffs (246 lines):
diff -r ebedc637de4d -r 5c0d756b4bb6 ChangeLog
--- a/ChangeLog Fri Sep 24 00:18:08 2010 +0100
+++ b/ChangeLog Fri Sep 24 15:25:51 2010 +0100
@@ -1,3 +1,33 @@ 2010-09-24 Andrew John Hughes <ahughes
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (.PHONY): Add new clean targets.
+ (icedtea-against-icedtea): Don't depend on
+ bootstrap-directory-symlink, icedtea already does.
+ (clean-icedtea-against-icedtea): Remove superfluous space.
+ (icedtea-debug-against-icedtea): Likewise.
+ (icedtea-ecj): Fix formatting.
+ (icedtea-against-ecj): Add new add-x-ecj targets.
+ (clean-icedtea-against-ecj): Add new clean-add-x-ecj targets.
+ (add-plugin-ecj): Add plugin support to the ecj build.
+ (clean-plugin-ecj): Remove plugin support from the ecj build.
+ (add-netx-ecj): Add NetX support to the ecj build.
+ (clean-netx-ecj): Remove NetX support from the ecj build.
+ (add-systemtap-ecj): Add SystemTap support to the ecj build.
+ (clean-add-systemtap-ecj): Remove SystemTap support from the ecj build.
+ (add-pulseaudio-ecj): New target to add PulseAudio support to the ecj build.
+ (clean-add-pulseaudio-ecj): Remove PulseAudio support from the ecj build.
+ (add-nss-ecj): New target to add NSS support to the ecj build.
+ (clean-add-nss-ecj): Remove NSS support from the ecj build.
+ (add-tzdata-support-ecj): New target to add alternate timezone data support to the ecj build.
+ (clean-add-tzdata-support-ecj): Remove alternate timezone data support from the ecj build.
+
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (distclean-local): Remove any old tarballs
+ before trying to remove the drops directory.
+
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r ebedc637de4d -r 5c0d756b4bb6 Makefile.am
--- a/Makefile.am Fri Sep 24 00:18:08 2010 +0100
+++ b/Makefile.am Fri Sep 24 15:25:51 2010 +0100
@@ -590,7 +590,9 @@ install:
clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \
clean-add-plugin clean-add-plugin-debug clean-add-systemtap clean-add-systemtap-debug \
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
- clean-add-tzdata-support clean-add-tzdata-support-debug
+ clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-plugin-ecj \
+ clean-add-netx-ecj clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
+ clean-add-tzdata-support-ecj
env:
@echo 'unset JAVA_HOME'
@@ -744,6 +746,7 @@ clean-drops: clean-download-jaxp-drop cl
clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
clean-download-jaxws-drop
if [ -e drops ] ; then \
+ rm -f drops/*.old ; \
rmdir drops ; \
fi
rm -f stamps/download-drops.stamp
@@ -1303,21 +1306,20 @@ clean-icedtea-debug:
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-debug.stamp
-stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \
- stamps/add-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
- stamps/add-tzdata-support.stamp
+stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
+ stamps/add-plugin.stamp stamps/add-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp \
+ stamps/add-nss.stamp stamps/add-tzdata-support.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx \
- clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support
+ clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support
rm -f stamps/icedtea-against-icedtea.stamp
-stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \
- stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp stamps/add-systemtap-debug.stamp \
- stamps/add-pulseaudio-debug.stamp stamps/add-nss-debug.stamp stamps/add/tzdata-support-debug.stamp
+stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp \
+ stamps/add-zero-debug.stamp stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp \
+ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp stamps/add-nss-debug.stamp \
+ stamps/add/tzdata-support-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
@@ -1560,7 +1562,7 @@ clean-add-tzdata-support-debug:
# ===================
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
+ $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
@@ -1573,6 +1575,131 @@ clean-icedtea-ecj:
clean-icedtea-ecj:
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-ecj.stamp
+
+stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-plugin-ecj.stamp \
+ stamps/add-netx-ecj.stamp stamps/add-systemtap-ecj.stamp stamps/add-pulseaudio-ecj.stamp \
+ stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp
+ mkdir -p stamps
+ touch stamps/icedtea-against-ecj.stamp
+
+clean-icedtea-against-ecj: clean-add-plugin-ecj clean-add-netx-ecj clean-add-systemtap-ecj \
+ clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj
+ rm -f stamps/icedtea-against-ecj.stamp
+
+stamps/add-plugin-ecj.stamp: stamps/plugin.stamp stamps/icedtea-ecj.stamp
+if ENABLE_PLUGIN
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+endif
+ touch stamps/add-plugin-ecj.stamp
+
+clean-add-plugin-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+ rm -f stamps/add-plugin-ecj.stamp
+
+stamps/add-netx-ecj.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/icedtea-ecj.stamp
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/man/man1
+ touch stamps/add-netx-ecj.stamp
+
+clean-add-netx-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
+ rm -f stamps/add-netx-ecj.stamp
+
+stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
+if ENABLE_SYSTEMTAP
+ mkdir -p $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
+ if test $$? -eq 0; then \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot.stp \
+ > $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ > $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ else \
+ cp $(abs_top_builddir)/tapset/hotspot.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+endif
+ touch stamps/add-systemtap-ecj.stamp
+
+clean-add-systemtap-ecj:
+ rm -rf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap-ecj.stamp
+
+stamps/add-pulseaudio-ecj.stamp: stamps/icedtea-ecj.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+ $(ZIP) -qur $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+endif
+ touch stamps/add-pulseaudio-ecj.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio-ecj.stamp
+
+stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
+ cp $(abs_top_builddir)/nss.cfg \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ touch stamps/add-nss-ecj.stamp
+
+clean-add-nss-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f stamps/add-nss-ecj.stamp
+
+stamps/add-tzdata-support-ecj.stamp: stamps/icedtea.stamp
+if WITH_TZDATA_DIR
+ cp $(abs_top_builddir)/tz.properties \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
+ touch stamps/add-tzdata-support-ecj.stamp
+
+clean-add-tzdata-support-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+ rm -f stamps/add-tzdata-support-ecj.stamp
# Rebuild targets
@@ -1607,15 +1734,6 @@ else
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
@echo "Hotspot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
endif
-
-stamps/icedtea-against-ecj.stamp: \
- stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/icedtea-ecj.stamp
- mkdir -p stamps
- touch stamps/icedtea-against-ecj.stamp
-
-clean-icedtea-against-ecj:
- rm -f stamps/icedtea-against-ecj.stamp
# Plugin
More information about the distro-pkg-dev
mailing list