From dce7593cabc1702969ce5b78b0be7bc393374584 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" <ldv@altlinux.org> Date: Tue, 30 Apr 2013 23:52:12 +0000 Subject: [PATCH] build: introduce git-version-gen * .gitignore: Add .version. * Makefile.am (EXTRA_DIST, BUILT_SOURCES): Add $(srcdir)/.version. Add rules to check NEWS, generate $(srcdir)/.version and $(distdir)/.tarball-version files. Change ChangeLog and CREDITS generation rules to depend on $(srcdir)/.version instead of $(srcdir)/.git/refs/heads/*. * NEWS: Add dates to recent releases. * configure.ac (AC_INIT): Use git-version-gen. (AM_INIT_AUTOMAKE): Remove check-news. * git-version-gen: Import from gnulib. * make-dist: Check NEWS. --- .gitignore | 1 + Makefile.am | 34 ++++++-- NEWS | 20 ++--- configure.ac | 6 +- git-version-gen | 225 ++++++++++++++++++++++++++++++++++++++++++++++++ make-dist | 1 + 6 files changed, 268 insertions(+), 19 deletions(-) create mode 100755 git-version-gen diff --git a/.gitignore b/.gitignore index 9ac93c7f..ca5703ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o .deps .libs +.version .*.swp /ChangeLog diff --git a/Makefile.am b/Makefile.am index 67e80aab..9bbda660 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = defs.h EXTRA_DIST = \ $(man_MANS) \ + .version \ COPYRIGHT \ CREDITS \ ChangeLog \ @@ -179,15 +180,34 @@ EXTRA_DIST = \ srpm: dist-xz rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz -BUILT_SOURCES = +BUILT_SOURCES = .version + +$(srcdir)/.version: + $(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@ + +dist-hook: + $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version + +today = $(shell date +%Y-%m-%d) +version_regexp = $(subst .,\.,$(VERSION)) +news_check_regexp = 'Noteworthy changes in release $(version_regexp) ($(today))' + +news-check: NEWS + $(AM_V_GEN)if head -1 $< | \ + grep -x $(news_check_regexp) >/dev/null; then \ + :; \ + else \ + echo >&2 '$<: check failed'; \ + exit 1; \ + fi if MAINTAINER_MODE gen_changelog_start_date = 2009-07-08 20:00 -$(srcdir)/ChangeLog: $(top_srcdir)/gitlog-to-changelog $(srcdir)/Makefile.in \ - $(top_srcdir)/.git/refs/heads/* +$(srcdir)/ChangeLog: $(srcdir)/gitlog-to-changelog $(srcdir)/Makefile.in \ + $(srcdir)/.version @rm -f $@.new - (cd $(top_srcdir); \ + (cd $(srcdir); \ ./gitlog-to-changelog --append-dot \ --since='$(gen_changelog_start_date)'; \ echo; echo; echo 'See ChangeLog-CVS for older changes.' \ @@ -195,11 +215,11 @@ $(srcdir)/ChangeLog: $(top_srcdir)/gitlog-to-changelog $(srcdir)/Makefile.in \ chmod 444 $@.new mv -f $@.new $@ -$(srcdir)/CREDITS: $(top_srcdir)/CREDITS.in $(top_srcdir)/.mailmap \ - $(srcdir)/Makefile.in $(top_srcdir)/.git/refs/heads/* +$(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \ + $(srcdir)/Makefile.in $(srcdir)/.version $(AM_V_GEN) \ { \ - cd $(top_srcdir); \ + cd $(srcdir); \ sed '/^##/,$$d' CREDITS.in; \ { sed -n '1,/^##>/d; s/ \+/\t/; s/^./&/p' CREDITS.in; \ git log --pretty=format:'%aN %aE'; \ diff --git a/NEWS b/NEWS index 06d3b98c..e7a2b1a4 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,8 @@ -Noteworthy changes in release ?.? -================================= +Noteworthy changes in release ?.? (????-??-??) +============================================== -Noteworthy changes in release 4.7 -================================= +Noteworthy changes in release 4.7 (2012-05-02) +============================================== * Changes in behavior * strace no longer suspends waitpid until there is a child @@ -77,8 +77,8 @@ Noteworthy changes in release 4.7 * Linux kernel >= 2.6.18 is recommended. Older versions might still work but they haven't been thoroughly tested with this release. -Noteworthy changes in release 4.6 -================================= +Noteworthy changes in release 4.6 (2011-03-15) +============================================== * Changes in behavior * Print diagnostic information about changes in personality mode to @@ -128,8 +128,8 @@ Noteworthy changes in release 4.6 * Fixed misleading italics in the manual page. (Addresses Debian bug #589323). -Noteworthy changes in release 4.5.20 -==================================== +Noteworthy changes in release 4.5.20 (2010-04-13) +================================================= * Improvements * Implemented decoding of new linux syscalls: inotify_init1, recvmmsg. @@ -163,8 +163,8 @@ Noteworthy changes in release 4.5.20 (Addresses Debian bug #513014) * Corrected handling of killed threads. -Noteworthy changes in release 4.5.19 -==================================== +Noteworthy changes in release 4.5.19 (2009-10-21) +================================================= * Changes in behavior * When command exits, strace now exits with the same exit status. diff --git a/configure.ac b/configure.ac index d545fd57..e4cd788d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,12 @@ dnl Process this file with autoconf to create configure. Use autoreconf. AC_PREREQ(2.57) -AC_INIT([strace],[4.7]) +AC_INIT([strace], + m4_esyscmd([./git-version-gen .tarball-version]), + [strace-devel@lists.sourceforge.net]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules]) +AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules]) AM_MAINTAINER_MODE AC_CANONICAL_HOST diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 00000000..8fee74e1 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,225 @@ +#!/bin/sh +# Print a version string. +scriptversion=2012-12-31.23; # UTC + +# Copyright (C) 2007-2013 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# As with any generated file in a VC'd directory, you should add +# /.version to .gitignore, so that you don't accidentally commit it. +# .tarball-version is never generated in a VC'd directory, so needn't +# be listed there. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .version and +# .tarball-version will exist in distribution tarballs. +# +# EXTRA_DIST = $(top_srcdir)/.version +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + + +me=$0 + +version="git-version-gen $scriptversion + +Copyright 2011 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING." + +usage="\ +Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +Print a version string. + +Options: + + --prefix prefix of git tags (default 'v') + --fallback fallback version to use if \"git --version\" fails + + --help display this help and exit + --version output version information and exit + +Running without arguments will suffice in most cases." + +prefix=v +fallback= + +while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; + --version) echo "$version"; exit 0;; + --prefix) shift; prefix="$1";; + --fallback) shift; fallback="$1";; + -*) + echo "$0: Unknown option '$1'." >&2 + echo "$0: Try '--help' for more information." >&2 + exit 1;; + *) + if test "x$tarball_version_file" = x; then + tarball_version_file="$1" + elif test "x$tag_sed_script" = x; then + tag_sed_script="$1" + else + echo "$0: extra non-option argument '$1'." >&2 + exit 1 + fi;; + esac + shift +done + +if test "x$tarball_version_file" = x; then + echo "$usage" + exit 1 +fi + +tag_sed_script="${tag_sed_script:-s/x/x/}" + +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= +v_from_git= + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || v= + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test "x$v" = x \ + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 +fi + +if test "x$v" != x +then + : # use $v +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ + && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + $prefix[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ + || { commit_list=failed; + echo "$0: WARNING: git rev-list failed" 1>&2; } + numcommits=`echo "$commit_list" | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + test "$commit_list" = failed && v=UNKNOWN + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/.0./;s/\(.*\)-g/\1-/'`; + v_from_git=1 +elif test "x$fallback" = x || git --version >/dev/null 2>&1; then + v=UNKNOWN +else + v=$fallback +fi + +v=`echo "$v" |sed "s/^$prefix//"` + +# Test whether to append the "-dirty" suffix only if the version +# string we're using came from git. I.e., skip the test if it's "UNKNOWN" +# or if it came from .tarball-version. +if test "x$v_from_git" != x; then + # Don't declare a version "dirty" merely because a time stamp has changed. + git update-index --refresh > /dev/null 2>&1 + + dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= + case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; + esac +fi + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d "$nl" + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/make-dist b/make-dist index fb5d8cea..fffedfb0 100755 --- a/make-dist +++ b/make-dist @@ -21,5 +21,6 @@ autoreconf -i -f ./configure --enable-maintainer-mode make -s $j distcheck +make -s $j news-check mv -f strace-*.tar.xz ..