/hg/icedtea7: 4 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Dec 19 10:39:03 PST 2012


changeset e4795c01aba3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e4795c01aba3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Dec 18 23:22:20 2012 +0000

	Move SystemTap support to a separate target.

	2010-09-22  Andrew John Hughes  <gnu.andrew at redhat.com>

		Move SystemTap support to a separate target.
		* Makefile.am:
		(.PHONY): Add clean-add-systemtap and
		clean-add-systemtap-debug.
		(icedtea): Remove systemtap support.
		(icedtea-debug): Likewise.
		(icedtea-stage2): Depend on add-systemtap.
		(icedtea-debug-stage2): Depend on add-systemtap-debug.
		(add-systemtap): New target to add SystemTap support to the build.
		(add-systemtap-debug): Likewise for debug.
		(clean-add-systemtap): Remove SystemTap support from the build.
		(clean-add-systemtap-debug): Likewise for debug.


changeset f4bc8075e7c6 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=f4bc8075e7c6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 19 14:45:44 2012 +0000

	Separate PulseAudio addition into separate targets.

	2010-09-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(.PHONY): Add clean-add-pulseaudio and
		clean-add-pulseaudio-debug.
		(clean-local): Likewise.
		(icedtea): Remove pulse-java support and dependency.
		(add-pulseaudio): New target to add PulseAudio support to the build.
		(clean-add-pulseaudio): Remove PulseAudio support from the build.
		(icedtea-debug): Remove pulse-java support and dependency.
		(add-pulseaudio-debug): Likewise for debug.
		(clean-add-pulseaudio-debug): Likewise for debug.
		(icedtea-stage2): Depend on add-pulseaudio.
		(icedtea-debug-stage2): Depend on add-pulseaudio-debug.


changeset ae5547ae8c75 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ae5547ae8c75
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 19 16:38:02 2012 +0000

	Separate addition of NSS and timezone data support into separate targets.

	2010-09-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(.PHONY): Add clean-add-nss, clean-add-nss-debug,
		clean-add-tzdata-support and clean-add-tzdata-support-debug.
		(clean-local): Likewise.
		(icedtea): Remove NSS and tzdata support.
		(add-nss): New target to add NSS support to the build.
		(clean-add-nss): Remove NSS support from the build.
		(add-tzdata-support): New target to add alternate timezone data support to the build.
		(clean-add-tzdata-support): Remove alternate timezone data support from the build.
		(icedtea-debug): Remove NSS and tzdata support.
		(add-nss-debug): Likewise for debug.
		(clean-add-nss-debug): Likewise for debug.
		(add-tzdata-support-debug): Likewise for debug.
		(clean-add-tzdata-support-debug): Likewise for debug.
		(icedtea-stage2): Depend on add-nss and add-tzdata-support.
		(icedtea-debug-stage2): Depend on add-nss-debug and add-tzdata-support-debug.


changeset 1a8e93b7fe96 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1a8e93b7fe96
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 19 18:38:08 2012 +0000

	Support additional targets for the bootstrap build.

	2010-09-24  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(.PHONY): Add new clean targets.  Fix name.
		(add-systemtap-boot): Add SystemTap support to the boot build.
		(clean-add-systemtap-boot): Remove SystemTap support from the boot build.
		(add-pulseaudio-boot): New target to add PulseAudio support to the boot build.
		(clean-add-pulseaudio-boot): Remove PulseAudio support from the boot build.
		(add-nss-boot): New target to add NSS support to the boot build.
		(clean-add-nss-boot): Remove NSS support from the boot build.
		(add-tzdata-support-boot): New target to add alternate timezone data support to the boot build.
		(clean-add-tzdata-support-boot): Remove alternate timezone data support from the boot build.
		(icedtea-stage1): Add new add-x-boot targets.
		(clean-icedtea-stage1): Add new clean-add-x-boot targets.


diffstat:

 ChangeLog   |   65 +++++++++++++
 Makefile.am |  281 +++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 287 insertions(+), 59 deletions(-)

diffs (465 lines):

diff -r ff15cee90ed8 -r 1a8e93b7fe96 ChangeLog
--- a/ChangeLog	Tue Dec 04 11:00:41 2012 +0000
+++ b/ChangeLog	Wed Dec 19 18:38:08 2012 +0000
@@ -1,3 +1,68 @@
+2010-09-24  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(.PHONY): Add new clean targets.  Fix name.
+	(add-systemtap-boot): Add SystemTap support to the boot build.
+	(clean-add-systemtap-boot): Remove SystemTap support from the boot build.
+	(add-pulseaudio-boot): New target to add PulseAudio support to the boot build.
+	(clean-add-pulseaudio-boot): Remove PulseAudio support from the boot build.
+	(add-nss-boot): New target to add NSS support to the boot build.
+	(clean-add-nss-boot): Remove NSS support from the boot build.
+	(add-tzdata-support-boot): New target to add alternate timezone data support to the boot build.
+	(clean-add-tzdata-support-boot): Remove alternate timezone data support from the boot build.
+	(icedtea-stage1): Add new add-x-boot targets.
+	(clean-icedtea-stage1): Add new clean-add-x-boot targets.
+
+2010-09-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(.PHONY): Add clean-add-nss, clean-add-nss-debug,
+	clean-add-tzdata-support and clean-add-tzdata-support-debug.
+	(clean-local): Likewise.
+	(icedtea): Remove NSS and tzdata support.
+	(add-nss): New target to add NSS support to the build.
+	(clean-add-nss): Remove NSS support from the build.
+	(add-tzdata-support): New target to add alternate timezone data support to the build.
+	(clean-add-tzdata-support): Remove alternate timezone data support from the build.
+	(icedtea-debug): Remove NSS and tzdata support.
+	(add-nss-debug): Likewise for debug.
+	(clean-add-nss-debug): Likewise for debug.
+	(add-tzdata-support-debug): Likewise for debug.
+	(clean-add-tzdata-support-debug): Likewise for debug.
+	(icedtea-stage2): Depend on add-nss and add-tzdata-support.
+	(icedtea-debug-stage2): Depend on add-nss-debug and add-tzdata-support-debug.
+
+2010-09-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(.PHONY): Add clean-add-pulseaudio and
+	clean-add-pulseaudio-debug.
+	(clean-local): Likewise.
+	(icedtea): Remove pulse-java support and dependency.
+	(add-pulseaudio): New target to add PulseAudio support to the build.
+	(clean-add-pulseaudio): Remove PulseAudio support from the build.
+	(icedtea-debug): Remove pulse-java support and dependency.
+	(add-pulseaudio-debug): Likewise for debug.
+	(clean-add-pulseaudio-debug): Likewise for debug.
+	(icedtea-stage2): Depend on add-pulseaudio.
+	(icedtea-debug-stage2): Depend on add-pulseaudio-debug.
+
+2010-09-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	Move SystemTap support to a separate target.
+	* Makefile.am:
+	(.PHONY): Add clean-add-systemtap and
+	clean-add-systemtap-debug.
+	(clean-local): Likewise.
+	(icedtea): Remove systemtap support.
+	(icedtea-debug): Likewise.
+	(icedtea-stage2): Depend on add-systemtap.
+	(icedtea-debug-stage2): Depend on add-systemtap-debug.
+	(add-systemtap): New target to add SystemTap support to the build.
+	(add-systemtap-debug): Likewise for debug.
+	(clean-add-systemtap): Remove SystemTap support from the build.
+	(clean-add-systemtap-debug): Likewise for debug.
+
 2012-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/boot/ecj-opts.patch:
diff -r ff15cee90ed8 -r 1a8e93b7fe96 Makefile.am
--- a/Makefile.am	Tue Dec 04 11:00:41 2012 +0000
+++ b/Makefile.am	Wed Dec 19 18:38:08 2012 +0000
@@ -790,7 +790,9 @@
  clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
  clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
  clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter
+ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
+ 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
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -820,7 +822,10 @@
 	jtregcheck clean-remove-intree-libraries \
 	clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
 	clean-extract-hotspot clean-sanitise-openjdk \
-	clean-tests clean-tapset-report
+	clean-tests clean-tapset-report 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-systemtap-boot clean-add-pulseaudio-boot clean-add-nss-boot clean-add-tzdata-support-boot
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -1688,8 +1693,7 @@
 # you change it in the icedtea-debug target as well.
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
- stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
 	$(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -1699,18 +1703,6 @@
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
-if ENABLE_PULSE_JAVA
-	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf pulse-java.jar \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-	cp -pPRf pulse-java.jar \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1720,6 +1712,14 @@
 if ENABLE_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
+if ENABLE_JAMVM
+	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch $@
+
+stamps/add-systemtap.stamp: stamps/icedtea.stamp
 if ENABLE_SYSTEMTAP
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
@@ -1744,23 +1744,58 @@
 	cp $(abs_top_builddir)/tapset/jstack.stp \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
 endif
+	touch stamps/add-systemtap.stamp
+
+clean-add-systemtap:
+	rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -f stamps/add-systemtap.stamp
+
+stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf pulse-java.jar \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+	cp -pPRf pulse-java.jar \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+endif
+	touch stamps/add-pulseaudio.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio:
+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+	rm -f stamps/add-pulseaudio.stamp
+
+stamps/add-nss.stamp: stamps/icedtea.stamp
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	touch stamps/add-nss.stamp
+
+clean-add-nss:
+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f stamps/add-nss.stamp
+
+stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
 endif
-if ENABLE_JAMVM
-	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-endif
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-	mkdir -p stamps
-	touch $@
+	touch stamps/add-tzdata-support.stamp
+
+clean-add-tzdata-support:
+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	rm -f stamps/add-tzdata-support.stamp
 
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
- stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
 	$(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -1770,18 +1805,6 @@
 	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
-if ENABLE_PULSE_JAVA
-	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf pulse-java.jar \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-	cp -pPRf pulse-java.jar \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1791,6 +1814,19 @@
 if ENABLE_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
+if ENABLE_JAMVM
+	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+	@echo "IcedTea (debug build) is served:" \
+	  $(DEBUG_BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch $@
+
+clean-icedtea: 
+	rm -rf $(BUILD_OUTPUT_DIR)
+	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
+
+stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
 if ENABLE_SYSTEMTAP
 	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
@@ -1815,26 +1851,58 @@
 	cp $(abs_top_builddir)/tapset/jstack.stp \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
 endif
+	touch stamps/add-systemtap-debug.stamp
+
+clean-add-systemtap-debug:
+	rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -f stamps/add-systemtap-debug.stamp
+
+stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf pulse-java.jar \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+	cp -pPRf pulse-java.jar \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+endif
+	touch stamps/add-pulseaudio-debug.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-debug:
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+	rm -f stamps/add-pulseaudio-debug.stamp
+
+stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	touch stamps/add-nss-debug.stamp
+
+clean-add-nss-debug:
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f stamps/add-nss-debug.stamp
+
+stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
 endif
-if ENABLE_JAMVM
-	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-endif
-	@echo "IcedTea (debug build) is served:" \
-	  $(DEBUG_BUILD_OUTPUT_DIR)
-	mkdir -p stamps
-	touch $@
+	touch stamps/add-tzdata-support-debug.stamp
 
-clean-icedtea: 
-	rm -rf $(BUILD_OUTPUT_DIR)
-	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
+clean-add-tzdata-support-debug:
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	rm -f stamps/add-tzdata-support-debug.stamp
 
 stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp stamps/add-jamvm.stamp
+ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
+ stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp
 	mkdir -p stamps
 	touch $@
 
@@ -1842,7 +1910,9 @@
 	rm -f stamps/icedtea-stage2.stamp
 
 stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
- stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-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 $@
 
@@ -1865,6 +1935,94 @@
 	mkdir -p stamps
 	touch $@
 
+clean-icedtea-boot:
+	rm -rf $(BOOT_BUILD_OUTPUT_DIR)
+	rm -f stamps/icedtea-boot.stamp
+
+stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp
+if ENABLE_SYSTEMTAP
+	mkdir -p $(BOOT_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 \
+	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	  sed -e '/\/client\/libjvm.so/d' \
+	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	  sed -e '/\/client\/libjvm.so/d' \
+	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	else \
+	  cp $(abs_top_builddir)/tapset/hotspot.stp \
+	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	fi; \
+	cp $(abs_top_builddir)/tapset/jstack.stp \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+endif
+	touch stamps/add-systemtap-boot.stamp
+
+clean-add-systemtap-boot:
+	rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -f stamps/add-systemtap-boot.stamp
+
+stamps/add-pulseaudio-boot.stamp: stamps/icedtea-boot.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp -pPRf pulse-java.jar \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+	cp -pPRf pulse-java.jar \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+endif
+	touch stamps/add-pulseaudio-boot.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-boot:
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+	rm -f stamps/add-pulseaudio-boot.stamp
+
+stamps/add-nss-boot.stamp: stamps/icedtea-boot.stamp
+	cp $(abs_top_builddir)/nss.cfg \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	touch stamps/add-nss-boot.stamp
+
+clean-add-nss-boot:
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+	rm -f stamps/add-nss-boot.stamp
+
+stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
+	touch stamps/add-tzdata-support-boot.stamp
+
+clean-add-tzdata-support-boot:
+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	rm -f stamps/add-tzdata-support-boot.stamp
+
+stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
+ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \
+ stamps/add-nss-boot.stamp stamps/add-tzdata-support-boot.stamp
+	mkdir -p stamps
+	touch $@
+
+clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \
+ clean-add-nss-boot clean-add-tzdata-support-boot
+	rm -f stamps/icedtea-stage1.stamp
+
 # Rebuild targets
 
 rebuild:
@@ -1901,17 +2059,6 @@
 	@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
 endif
 
-clean-icedtea-boot:
-	rm -rf $(BOOT_BUILD_OUTPUT_DIR)
-	rm -f stamps/icedtea-boot.stamp
-
-stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp
-	mkdir -p stamps
-	touch $@
-
-clean-icedtea-stage1:
-	rm -f stamps/icedtea-stage1.stamp
-
 # PulseAudio based mixer
 # (pulse-java)
 if ENABLE_PULSE_JAVA
@@ -2439,6 +2586,22 @@
 # Target Aliases
 # ===============
 
+add-nss: stamps/add-nss.stamp
+
+add-nss-debug: stamps/add-nss-debug.stamp
+
+add-pulseaudio: stamps/add-pulseaudio.stamp
+
+add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
+
+add-systemtap: stamps/add-systemtap.stamp
+
+add-systemtap-debug: stamps/add-systemtap-debug.stamp
+
+add-tzdata-support: stamps/add-tzdata-support.stamp
+
+add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
+
 add-zero: stamps/add-zero.stamp
 
 add-zero-debug: stamps/add-zero-debug.stamp



More information about the distro-pkg-dev mailing list