Mercurial > hg > octave-nkf > gnulib-hg
changeset 16898:f1a0ea1e49d3
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.
author | Akim Demaille <akim@lrde.epita.fr> |
---|---|
date | Thu, 07 Jun 2012 16:17:30 +0200 |
parents | c460072fb428 |
children | 2311514e2d84 |
files | ChangeLog build-aux/do-release-commit-and-tag top/README-release |
diffstat | 3 files changed, 78 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2012-06-07 Akim Demaille <akim@lrde.epita.fr> + + 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 <akim@lrde.epita.fr> readme-release: also require announce-gen and maintainer-makefile
--- 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 @@ # 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 + cat <<EOF Usage: $ME [OPTION...] VERSION RELEASE_TYPE -Run this script to perform the final pre-release NEWS update -in which the date, release-type and version string are recorded. -Commit that result with a log entry marking the release, and apply -a signed tag. Run it from your project's top-level directory. +Run this script from top_srcdir to perform the final pre-release NEWS +update in which the date, release-type and version string are +recorded. Commit that result with a log entry marking the release, +and apply a signed tag. Run it from your project's top-level +directory. Requirements: - you use git for version-control +- a version-controlled .prev-version file - a NEWS file, with line 3 identical to this: -* Noteworthy changes in release ?.? (????-??-??) [?] -- a version-controlled .prev-version file +$noteworthy_stub Options: - --branch BRANCH set release branch (default: master) - --help print this help, then exit - --version print version number, then exit + --branch=BRANCH set release branch (default: master) + -C, --builddir=DIR location of (configured) Makefile (default: .) + --help print this help, then exit + --version print version number, then exit EXAMPLE: To update NEWS and tag the beta 8.1 release of coreutils, I would run this: @@ -57,33 +61,48 @@ Report bugs and patches to <bug-gnulib@gnu.org>. EOF - exit ;; + exit +} - --version) - year=`echo "$VERSION" | sed 's/[^0-9].*//'` - cat <<EOF +version() +{ + year=$(echo "$VERSION" | sed 's/[^0-9].*//') + cat <<EOF $ME $VERSION Copyright (C) $year Free Software Foundation, Inc, License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> 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 @@ # 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 @@ 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.
--- a/top/README-release +++ b/top/README-release @@ -31,11 +31,16 @@ 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