/hg/icedtea6: Separate addition of NSS and timezone data support...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Sep 23 06:41:12 PDT 2010
changeset 65ab89d428ac in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=65ab89d428ac
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 23 14:40:49 2010 +0100
Separate addition of NSS and timezone data support into separate
targets.
2010-09-23 Andrew John Hughes <ahughes 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. (icedtea-debug):
Likewise. (icedtea-against-icedtea): Depend on add-nss and
add-tzdata-support. (icedtea-debug-against-icedtea): Depend
on add-nss-debug and add-tzdata-support-debug. (add-nss):
New target to add NSS support to the build. (add-nss-debug):
Likewise for debug. (clean-add-nss): Remove NSS support from
the build. (clean-add-nss-debug): Likewise for debug.
(add-tzdata-support): New target to add alternate timezone data
support to the build. (add-tzdata-support-debug): Likewise
for debug. (clean-add-tzdata-support): Remove alternate
timezone data support from the build. (clean-add-tzdata-
support-debug): Likewise for debug.
diffstat:
2 files changed, 67 insertions(+), 16 deletions(-)
ChangeLog | 19 +++++++++++++++++
Makefile.am | 64 ++++++++++++++++++++++++++++++++++++++++++++---------------
diffs (142 lines):
diff -r 36fac414f1b4 -r 65ab89d428ac ChangeLog
--- a/ChangeLog Thu Sep 23 11:51:33 2010 +0100
+++ b/ChangeLog Thu Sep 23 14:40:49 2010 +0100
@@ -1,3 +1,22 @@ 2010-09-23 Andrew John Hughes <ahughes
+2010-09-23 Andrew John Hughes <ahughes 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.
+ (icedtea-debug): Likewise.
+ (icedtea-against-icedtea): Depend on add-nss and add-tzdata-support.
+ (icedtea-debug-against-icedtea): Depend on add-nss-debug and add-tzdata-support-debug.
+ (add-nss): New target to add NSS support to the build.
+ (add-nss-debug): Likewise for debug.
+ (clean-add-nss): Remove NSS support from the build.
+ (clean-add-nss-debug): Likewise for debug.
+ (add-tzdata-support): New target to add alternate timezone data support to the build.
+ (add-tzdata-support-debug): Likewise for debug.
+ (clean-add-tzdata-support): Remove alternate timezone data support from the build.
+ (clean-add-tzdata-support-debug): Likewise for debug.
+
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 36fac414f1b4 -r 65ab89d428ac Makefile.am
--- a/Makefile.am Thu Sep 23 11:51:33 2010 +0100
+++ b/Makefile.am Thu Sep 23 14:40:49 2010 +0100
@@ -556,7 +556,8 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
clean-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug \
- clean-add-pulseaudio clean-add-pulseaudio-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
@@ -590,7 +591,9 @@ install:
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-systemtap clean-add-systemtap-debug \
- clean-add-pulseaudio clean-add-pulseaudio-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'
@echo 'export $(ICEDTEA_ENV)'
@@ -1266,12 +1269,6 @@ if WITH_CACAO
if WITH_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
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
mkdir -p stamps
touch stamps/icedtea.stamp
@@ -1299,12 +1296,6 @@ if WITH_CACAO
if WITH_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
@echo "IcedTea (debug build) is served:" \
$(DEBUG_BUILD_OUTPUT_DIR)
mkdir -p stamps
@@ -1316,7 +1307,8 @@ clean-icedtea-debug:
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-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
@@ -1326,7 +1318,7 @@ stamps/icedtea-debug-against-icedtea.sta
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-pulseaudio-debug.stamp stamps/add-nss-debug.stamp stamps/add/tzdata-support-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
@@ -1523,6 +1515,46 @@ clean-add-pulseaudio-debug:
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.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-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.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/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
# OpenJDK ecj Targets
# ===================
More information about the distro-pkg-dev
mailing list