Mercurial > hg > icedtea7

changeset 2609:ae5547ae8c75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Separate addition of NSS and timezone data support into separate targets. 2010-09-23 Andrew John Hughes <gnu.andrew@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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 19 Dec 2012 16:38:02 +0000
parents f4bc8075e7c6
children 1a8e93b7fe96
files ChangeLog Makefile.am
diffstat 2 files changed, 74 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Dec 19 14:45:44 2012 +0000
+++ b/ChangeLog	Wed Dec 19 16:38:02 2012 +0000
@@ -1,3 +1,22 @@
+2010-09-23  Andrew John Hughes  <gnu.andrew@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@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Dec 19 14:45:44 2012 +0000
+++ b/Makefile.am	Wed Dec 19 16:38:02 2012 +0000
@@ -791,7 +791,8 @@
  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-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-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
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -822,7 +823,8 @@
 	clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
 	clean-extract-hotspot clean-sanitise-openjdk \
 	clean-tests clean-tapset-report clean-add-systemtap \
-	clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug
+	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
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -1709,12 +1711,6 @@
 if ENABLE_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
-	cp $(abs_top_builddir)/nss.cfg \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-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
@@ -1776,6 +1772,26 @@
 	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
+	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 stamps/rewrite-rhino.stamp stamps/jamvm.stamp
@@ -1797,12 +1813,6 @@
 if ENABLE_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
-	cp $(abs_top_builddir)/nss.cfg \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-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
@@ -1869,9 +1879,29 @@
 	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.stamp
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
+	touch stamps/add-tzdata-support-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-systemtap.stamp \
- stamps/add-pulseaudio.stamp
+ stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp
 	mkdir -p stamps
 	touch $@
 
@@ -1880,7 +1910,8 @@
 
 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-systemtap-debug.stamp stamps/add-pulseaudio-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 $@
 
@@ -2477,6 +2508,10 @@
 # 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
@@ -2485,6 +2520,10 @@
 
 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