[nautilus] make_release.sh: fix post-Autotools breakage
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] make_release.sh: fix post-Autotools breakage
- Date: Fri, 28 Apr 2017 11:09:29 +0000 (UTC)
commit 55d17ec4814d863102ca438798a5e2d613db567c
Author: Ernestas Kulik <ernestask gnome org>
Date: Fri Apr 28 13:35:46 2017 +0300
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
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 c0aa567..5e05960 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]