Mercurial > hg > release > icedtea6-1.11

changeset 2949:cc6317dd8081

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only copy tz.properties if the destination exists. Do it verbosely. 2013-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: (add-tzdata-support): Only copy tz.properties if destination exists. Do it verbosely. (clean-add-tzdata-support): Only remove tz.properties if present and do so verbosely. (add-tzdata-support-debug): Same as add-tzdata-support but for debug. (clean-add-tzdata-support-debug): Same as clean-add-tzdata-support but for debug. (add-tzdata-support-ecj): Same as add-tzdata-support but for bootstrap. (clean-add-tzdata-support-ecj): Same as clean-add-tzdata-support but for bootstrap.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Mon, 21 Jan 2013 19:56:33 +0000
parents f49400e164aa
children c982036ea4b3
files ChangeLog Makefile.am
diffstat 2 files changed, 37 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 20 08:34:11 2014 +0000
+++ b/ChangeLog	Mon Jan 21 19:56:33 2013 +0000
@@ -1,3 +1,19 @@
+2013-01-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(add-tzdata-support): Only copy tz.properties if
+	destination exists.  Do it verbosely.
+	(clean-add-tzdata-support): Only remove tz.properties
+	if present and do so verbosely.
+	(add-tzdata-support-debug): Same as add-tzdata-support
+	but for debug.
+	(clean-add-tzdata-support-debug): Same as
+	clean-add-tzdata-support but for debug.
+	(add-tzdata-support-ecj): Same as add-tzdata-support
+	but for bootstrap.
+	(clean-add-tzdata-support-ecj): Same as
+	clean-add-tzdata-support but for bootstrap.
+
 2012-11-01  Lukas Berk  <lberk@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Jan 20 08:34:11 2014 +0000
+++ b/Makefile.am	Mon Jan 21 19:56:33 2013 +0000
@@ -1920,24 +1920,32 @@
 
 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
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	  cp -v $(abs_top_builddir)/tz.properties \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+	fi
 endif
 	touch stamps/add-tzdata-support.stamp
 
 clean-add-tzdata-support:
-	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+	  rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	fi
 	rm -f stamps/add-tzdata-support.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;
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	  cp -v $(abs_top_builddir)/tz.properties \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+	fi
 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
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+	  rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	fi
 	rm -f stamps/add-tzdata-support-debug.stamp
 
 # OpenJDK ecj Targets
@@ -2036,13 +2044,17 @@
 
 stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
 if WITH_TZDATA_DIR
-	cp $(abs_top_builddir)/tz.properties \
-	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	  cp -v $(abs_top_builddir)/tz.properties \
+	    $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+	fi
 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
+	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+	  rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	fi
 	rm -f stamps/add-tzdata-support-ecj.stamp
 
 # Rebuild targets