Mercurial > hg > release > icedtea7-2.0

changeset 2399:decad30090ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix warnings, check if files exist before renaming. 2011-02-24 Xerxes Ranby <xerxes@zafena.se> * Makefile.am (stamps/download-cacao.stamp): Fix warning, check if the CACAO_SRC_ZIP file exist before trying to rename it. (stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP. (stamps/download-openjdk.stamp): Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.
author Xerxes R?nby <xerxes@zafena.se>
date Thu, 24 Feb 2011 21:43:07 +0100
parents 526e140c51c9
children e90fab517c39
files ChangeLog Makefile.am
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 19 23:32:31 2011 +0100
+++ b/ChangeLog	Thu Feb 24 21:43:07 2011 +0100
@@ -1,3 +1,12 @@
+2011-02-24  Xerxes Ranby  <xerxes@zafena.se>
+
+	* Makefile.am (stamps/download-cacao.stamp):
+	Fix warning, check if the CACAO_SRC_ZIP file exist
+	before trying to rename it.
+	(stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP.
+	(stamps/download-openjdk.stamp):
+	Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.
+ 
 2011-02-23  Xerxes Ranby  <xerxes@zafena.se>
 
 	JamVM: configure --with-jamvm-src-zip
--- a/Makefile.am	Thu May 19 23:32:31 2011 +0100
+++ b/Makefile.am	Thu Feb 24 21:43:07 2011 +0100
@@ -923,7 +923,7 @@
 	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
-	  if [ $(OPENJDK_SRC_ZIP) ] ; \
+	  if [ -e $(OPENJDK_SRC_ZIP) ] ; \
 	  then \
 	    mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	  fi ; \
@@ -1019,7 +1019,7 @@
 	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
-	  if [ $(HOTSPOT_SRC_ZIP) ] ; \
+	  if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
 	  then \
 	    mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
 	  fi ; \
@@ -1073,7 +1073,7 @@
 	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
-	 if [ $(CACAO_SRC_ZIP) ] ; \
+	 if [ -e $(CACAO_SRC_ZIP) ] ; \
 	 then \
 	   mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
 	 fi ; \
@@ -1100,7 +1100,7 @@
 	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
-	 if [ $(JAMVM_SRC_ZIP) ] ; \
+	 if [ -e $(JAMVM_SRC_ZIP) ] ; \
 	 then \
 	   mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
 	 fi ; \