/hg/release/icedtea6-1.7: PR icedtea/433: Add set -e before tarb...

[andrew at icedtea.classpath.org]

changeset e303235cefa8 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e303235cefa8
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 16:11:56 2010 +0000

	PR icedtea/433: Add set -e before tarball extraction so a failure
	stops the build.

	2010-01-21 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/433
		* Makefile.am: Add set -e to tarball extractions so
	that they fail immediately.


diffstat:

2 files changed, 13 insertions(+)
ChangeLog   |    7 +++++++
Makefile.am |    6 ++++++

diffs (61 lines):

diff -r 1e6c98cc8858 -r e303235cefa8 ChangeLog
--- a/ChangeLog	Thu Jan 21 16:22:30 2010 +0100
+++ b/ChangeLog	Thu Jan 21 16:11:56 2010 +0000
@@ -1,3 +1,10 @@ 2010-01-21  Matthias Klose  <doko at ubuntu
+2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/433
+	* Makefile.am:
+	Add set -e to tarball extractions so
+	that they fail immediately.
+
 2010-01-21  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am: Don't hide errors in statement sequences building
diff -r 1e6c98cc8858 -r e303235cefa8 Makefile.am
--- a/Makefile.am	Thu Jan 21 16:22:30 2010 +0100
+++ b/Makefile.am	Thu Jan 21 16:11:56 2010 +0000
@@ -772,6 +772,7 @@ if OPENJDK_SRC_DIR_FOUND
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk
 else
+	set -e ; \
 	if ! test -d openjdk ; \
 	then \
 	  mkdir openjdk ; \
@@ -783,12 +784,14 @@ if BUILD_CACAO
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_DIR
+	set -e ; \
 	if ! test -d cacao ; \
 	then \
 	  mkdir -p cacao/cacao ; \
 	  cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
 	fi
 else
+	set -e ; \
 	if ! test -d cacao ; \
 	then \
 	  mkdir cacao ; \
@@ -800,17 +803,20 @@ endif
 endif
 endif
 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) ; \
 	fi
 endif
+	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 '{}' ';' \