diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2017-04-28 13:35:46 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2017-04-28 14:09:16 +0300 |
| commit | 55d17ec4814d863102ca438798a5e2d613db567c (patch) | |
| tree | f186b09f0895df62be0e328295f3aaa6bafb650f | |
| parent | ed07b5de528f141770e7d9aad66df33ff72cb028 (diff) | |
| download | nautilus-55d17ec4814d863102ca438798a5e2d613db567c.tar.gz | |
make_release.sh: fix post-Autotools breakage
The script broke after killing off Autotools support, since the libgd
submodule was moved to /subprojects/libgd. Additionally, this commit
makes the script exit on error and makes xz print verbose output.
https://bugzilla.gnome.org/show_bug.cgi?id=781892
| -rwxr-xr-x | build-aux/make_release.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/build-aux/make_release.sh b/build-aux/make_release.sh index c0aa56762..5e0596075 100755 --- a/build-aux/make_release.sh +++ b/build-aux/make_release.sh @@ -1,4 +1,7 @@ #!/bin/sh + +set -e + test -n "$srcdir" || srcdir=$1 test -n "$srcdir" || srcdir=. @@ -13,19 +16,19 @@ git submodule update --init echo "Creating git tree archive…" git archive --prefix="${NAME}/" --format=tar HEAD > nautilus.tar -cd libgd +cd subprojects/libgd -git archive --prefix="${NAME}/libgd/" --format=tar HEAD > libgd.tar +git archive --prefix="${NAME}/subprojects/libgd/" --format=tar HEAD > libgd.tar -cd .. +cd ../.. rm -f "${NAME}.tar" tar -Af "${NAME}.tar" nautilus.tar -tar -Af "${NAME}.tar" libgd/libgd.tar +tar -Af "${NAME}.tar" subprojects/libgd/libgd.tar rm -f nautilus.tar -rm -f libgd/libgd.tar +rm -f subprojects/libgd/libgd.tar echo "Compressing archive…" -xz -f "${NAME}.tar" +xz --verbose -f "${NAME}.tar" |