Mercurial > hg > release > icedtea6-1.8
changeset 1840:d9e0d17a294a
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 | Thu, 21 Jan 2010 16:11:56 +0000 |
| parents | b227a81ef16c |
| children | fcd85ef6c2ae |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 21 17:56:18 2010 +0000 +++ b/ChangeLog Thu Jan 21 16:11:56 2010 +0000 @@ -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-01-21 Edward Nevill <ed@camswl.com> * zeroshark.make, asm_helper.cpp, bytecodes_arm.def,
--- a/Makefile.am Thu Jan 21 17:56:18 2010 +0000 +++ b/Makefile.am Thu Jan 21 16:11:56 2010 +0000 @@ -775,6 +775,7 @@ if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk else + set -e ; \ if ! test -d openjdk ; \ then \ mkdir openjdk ; \ @@ -786,12 +787,14 @@ 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 ; \ @@ -803,17 +806,20 @@ 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 '{}' ';' \