Mercurial > hg > release > icedtea7-2.0

changeset 2148:bdd90e8c8ba7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR icedtea/433: Add set -e before tarball extraction so a failure stops the build. 2010-01-21 Andrew John Hughes <ahughes@redhat.com> PR icedtea/433 * Makefile.am: Add set -e to tarball extractions so that they fail immediately.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 14 May 2010 17:19:28 +0100
parents 1aa2dc59b11f
children f4ec4881ecef
files ChangeLog Makefile.am
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 14 15:36:37 2010 +0100
+++ b/ChangeLog	Fri May 14 17:19:28 2010 +0100
@@ -1,3 +1,10 @@
+2010-01-21  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/433
+	* Makefile.am:
+	Add set -e to tarball extractions so
+	that they fail immediately.
+
 2010-05-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Fri May 14 15:36:37 2010 +0100
+++ b/Makefile.am	Fri May 14 17:19:28 2010 +0100
@@ -1161,6 +1161,7 @@
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk
 else
+	set -e ; \
 	if ! test -d openjdk ; then \
 	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
 	    case "$(OPENJDK_SRC_ZIP)" in \
@@ -1176,6 +1177,7 @@
 	    false; \
 	  fi; \
 	fi; 
+	set -e ; \
 	if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
 	  if test -e ${CORBA_SRC_ZIP} ; \
 	  then \
@@ -1189,6 +1191,7 @@
 	    fi ; \
 	  fi ; \
 	fi
+	set -e ; \
 	if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
 	  if test -e ${JAXP_SRC_ZIP} ; \
 	  then \
@@ -1202,6 +1205,7 @@
 	    fi ; \
 	  fi ; \
 	fi
+	set -e ; \
 	if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
 	  if test -e ${JAXWS_SRC_ZIP} ; \
 	  then \
@@ -1215,6 +1219,7 @@
 	    fi ; \
 	  fi ; \
 	fi
+	set -e ; \
 	if [ ! -z $(JDK_SRC_ZIP) ] ; then \
 	  if test -e ${JDK_SRC_ZIP} ; \
 	  then \
@@ -1228,6 +1233,7 @@
 	    fi ; \
 	  fi ; \
 	fi
+	set -e ; \
 	if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
 	  if test -e ${LANGTOOLS_SRC_ZIP} ; \
 	  then \
@@ -1242,6 +1248,7 @@
 	  fi ; \
 	fi
 endif
+	set -e ; \
 	if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
 	  if test -e ${HOTSPOT_SRC_ZIP} ; \
 	  then \
@@ -1269,12 +1276,14 @@
 
 stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp
 if WITH_VISUALVM
+	set -e ; \
 	if ! test -d netbeans ; \
 	then \
 	  mkdir netbeans ; \
 	  $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
 	fi
 
+	set -e ; \
 	if ! test -d visualvm ; \
 	then \
 	  $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
@@ -1292,6 +1301,7 @@
 stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
+	set -e ; \
 	if ! test -d cacao/cacao ; \
 	then \
 	  mkdir cacao ; \
@@ -1311,6 +1321,7 @@
 
 stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp \
   stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp
+	set -e ; \
 	if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \
 	  (cd openjdk/jaxws ; \
 	   $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \
@@ -1319,6 +1330,7 @@
 	   cd $(abs_top_builddir)) ; \
 	fi
 if DTDTYPE_QNAME
+	set -e ; \
 	(cd $(BUILD_OUTPUT_DIR)/jaxws; \
 	 all_patches_ok=yes; \
 	 for p in $(JAXWS_PATCHES) ; \
@@ -1392,6 +1404,7 @@
 	rm -f stamps/ports.stamp
 
 stamps/generated.stamp: stamps/ports.stamp
+	set -e ; \
 	if [ ! -e $(abs_top_builddir)/generated ]; then \
 	  cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
 	  find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \