From e03145b987e919c32e53b9e422a7faead347642c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 7 Jun 2012 16:17:30 +0200 Subject: [PATCH] do-release-commit-and-tag: support VPATH builds * build-aux/do-release-commit-and-tag: Prefer $(...) to `...`. (noteworthy): Defined earlier to factor its value. (noteworthy_stub): New. Use it to factor. (help_version): Split into... (help, version): these. Adjust the option processing part. Support "--option=value" in addition to "--option value". (builddir): New. (--builddir): New option. * top/README-release: Document this. Reword slightly so that the reader cannot understand that he has to do these steps before calling do-release-commit-and-tag. --- ChangeLog | 17 +++++++ build-aux/do-release-commit-and-tag | 89 ++++++++++++++++++++++--------------- top/README-release | 9 +++- 3 files changed, 78 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e08755039..55a459b42d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2012-06-07 Akim Demaille + do-release-commit-and-tag: support VPATH builds + * build-aux/do-release-commit-and-tag: Prefer $(...) to `...`. + (noteworthy): Defined earlier to factor its value. + (noteworthy_stub): New. + Use it to factor. + (help_version): Split into... + (help, version): these. + Adjust the option processing part. + Support "--option=value" in addition to "--option value". + (builddir): New. + (--builddir): New option. + * top/README-release: Document this. + Reword slightly so that the reader cannot understand that he + has to do these steps before calling do-release-commit-and-tag. + +2012-06-07 Akim Demaille + readme-release: also require announce-gen and maintainer-makefile * modules/readme-release (Depends-on): here. * modules/announce-gen, modules/do-release-commit-and-tag, diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index e786e9820d..a0d1c9c1da 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -3,7 +3,7 @@ # controlled .prev-version file, automate the procedure by which we record # the date, release-type and version string in the NEWS file. That commit # will serve to identify the release, so apply a signed tag to it as well. -VERSION=2011-05-04.11 # UTC +VERSION=2012-06-07.15 # UTC # Note: this is a bash script (could be zsh or dash) @@ -24,31 +24,35 @@ VERSION=2011-05-04.11 # UTC # Written by Jim Meyering -ME=`basename "$0"` +ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } -help_version() +noteworthy='* Noteworthy changes in release' +noteworthy_stub="$noteworthy ?.? (????-??-??) [?]" + +help() { - case $1 in - --help) cat <. EOF - exit ;; + exit +} - --version) - year=`echo "$VERSION" | sed 's/[^0-9].*//'` - cat < This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. EOF - exit ;; - - *) die "unrecognized option: $1";; - esac + exit } branch=master -case $1 in - --branch) shift; branch=$1; shift ;; -esac +builddir=. -case $# in - 1) help_version $1; exit 0;; - 2) ;; - *) warn "Usage: $ME [OPTION...] VERSION TYPE"; exit 1;; -esac +while test $# != 0 +do + # Handle --option=value by splitting apart and putting back on argv. + case $1 in + --*=*) + opt=$(echo "$1" | sed -e 's/=.*//') + val=$(echo "$1" | sed -e 's/[^=]*=//') + shift + set dummy "$opt" "$val" ${1+"$@"}; shift + ;; + esac + + case $1 in + --help|--version) ${1#--};; + --branch) shift; branch=$1; shift ;; + -C|--builddir) shift; builddir=$1; shift ;; + --*) die "unrecognized option: $1";; + *) break;; + esac +done + +test $# = 2 \ + || die "Usage: $ME [OPTION...] VERSION TYPE" ver=$1 type=$2 @@ -97,7 +116,7 @@ prev_ver=$(cat .prev-version) \ # Verify that $ver is sensible (> .prev-version). case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in "$prev_ver:$ver:") ;; - *) die "invalid version: $ver";; + *) die "invalid version: $ver (<= $prev_ver)";; esac case $type in @@ -106,12 +125,12 @@ case $type in esac # Extract package name from Makefile. -pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' Makefile) \ - || die 'failed to determine package name from Makefile' +Makefile=$builddir/Makefile +pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' "$Makefile") \ + || die "failed to determine package name from $Makefile" # simple check: no question marks on line 3 of NEWS -noteworthy='* Noteworthy changes in release' -test "$(sed -n 3p NEWS)" = "$noteworthy ?.? (????-??-??) [?]" \ +test "$(sed -n 3p NEWS)" = "$noteworthy_stub" \ || die 'line 3 of NEWS looks fishy!' # No dirt allowed. diff --git a/top/README-release b/top/README-release index 29ba2606b5..e9804b0307 100644 --- a/top/README-release +++ b/top/README-release @@ -31,11 +31,16 @@ Here are most of the steps we (maintainers) follow when making a release. make check syntax-check distcheck -* Set the date, version number, and release type [stable/alpha/beta] on - line 3 of NEWS, commit that, and tag the release by running e.g., +* From top_srcdir, run: build-aux/do-release-commit-and-tag X.Y stable + in order to (i) set the date, version number, and release type + [stable/alpha/beta] on line 3 of NEWS, (ii) commit that, and (iii) tag the + release. See --help if you need options such as: + + build-aux/do-release-commit-and-tag --branch=maint -C _build X.Y.Z stable + * Run the following to create release tarballs. Your choice selects the corresponding upload-to destination in the emitted gnupload command. The different destinations are specified in cfg.mk. See the definitions -- 2.11.4.GIT