Changeset bc308eb

Timestamp:

Mar 8, 2016, 1:05:52 AM (8 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10

Children:

736835d

Parents:

866b391

git-author:

Anders Kaseorg <andersk@mit.edu> (06/20/13 10:51:56)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/08/16 01:05:52)

Message:

scripts/do-release: Build distribution with ‘make distcheck’

This has many advantages: ‘make distcheck’ automatically verifies that
the release builds, tests, installs, uninstalls, and cleans
successfully.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Location:

scripts

Files:

• dist-ignore (added)
• do-release (modified) (3 diffs)

scripts/do-release

@@ -1 @@
-#!/bin/sh -e
+#!/bin/bash
+set -eu
 
 die() {
@@ -55 +56 @@
 fi
 
+[ -e Makefile.in ] || autoreconf -fvi
+[ -e config.status ] || ./configure
+make -j4 distcheck VERSION="$VERS"
+
+echo 'Checking distributed files against Git:'
+if comm -3 <(tar -tzf "$TAG.tar.gz" | grep -v '/$' | sed "s%^$TAG/%%" | sort) \
+    <(git ls-files | sort) | grep -vxf scripts/dist-ignore; then
+    echo
+    echo 'Error: Please fix Makefile.am and/or scripts/dist-ignore.'
+    exit 1
+fi
+echo 'ok'
+
+mv "$TAG.tar.gz" "$TGZ.tgz"
+
 if ! [ "$no_tag" ]; then
     if git cat-file -t "$TAG" > /dev/null 2>&1; then
@@ -65 +81 @@
 fi
 
-exittrap() { :; }
-for sig in 1 2 13 15; do trap "exit $(($sig + 128))" $sig; done
-trap 'exittrap' EXIT
-
-TMPDIR=$(mktemp -d /tmp/barnowl.XXXXXX)
-
-exittrap() { rm -rf "$TMPDIR"; }
-
-git archive --format=tar --prefix="$TGZ/" "$TAG" | tar -x -C "$TMPDIR"
-
-CODIR=$(pwd)
-cd "$TMPDIR/$TGZ"
-[ "$git" ] && perl -i -pe 's{^(AC_INIT\(\[[^\]]+\],\s*)\[([^\]]+)\]}{${1}['$VERS']}' configure.ac
-autoreconf -fvi
-rm -r autom4te.cache/
-cd "$TMPDIR"
-tar czvf "$TGZ.tgz" "$TGZ"
-cd "$CODIR"
-
-mv "$TMPDIR/$TGZ.tgz" .
-rm -rf "$TMPDIR"
-
-exittrap() { :; }
-
-echo "Created release tarball for BarnOwl $VERS in $(pwd)"
+echo "Created release tarball for BarnOwl $VERS at $(pwd)/$TGZ.tgz"
 echo "Remember to bump OWL_VERSION_STRING for future development."