final push for 1.1.2
This commit is contained in:
parent
d51685b2eb
commit
d4b48ee300
10 changed files with 2 additions and 757 deletions
18
Makefile.am
Normal file → Executable file
18
Makefile.am
Normal file → Executable file
|
|
@ -146,24 +146,6 @@ TESTS = \
|
||||||
## Distribution. ##
|
## Distribution. ##
|
||||||
## -------------- ##
|
## -------------- ##
|
||||||
|
|
||||||
dist-hook: gen-ChangeLog
|
|
||||||
$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
|
|
||||||
|
|
||||||
# Generate the ChangeLog file from Git commit logs.
|
|
||||||
gen_start_date = 2015-06-26
|
|
||||||
.PHONY: gen-ChangeLog
|
|
||||||
gen-ChangeLog:
|
|
||||||
$(AM_V_GEN)if test -d $(srcdir)/.git; then \
|
|
||||||
log_fix="$(srcdir)/build-aux/git-log-fix"; \
|
|
||||||
test -e "$$log_fix" \
|
|
||||||
&& amend_git_log="--amend=$$log_fix" \
|
|
||||||
|| amend_git_log=; \
|
|
||||||
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
|
||||||
$$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
|
|
||||||
{ rm -f $(distdir)/ChangeLog && \
|
|
||||||
mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
|
|
||||||
fi
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
bootstrap \
|
bootstrap \
|
||||||
build-aux/guix.scm \
|
build-aux/guix.scm \
|
||||||
|
|
|
||||||
0
build-aux/announce-gen
Executable file → Normal file
0
build-aux/announce-gen
Executable file → Normal file
0
build-aux/do-release-commit-and-tag
Executable file → Normal file
0
build-aux/do-release-commit-and-tag
Executable file → Normal file
|
|
@ -1,226 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# Print a version string.
|
|
||||||
scriptversion=2016-05-08.18; # UTC
|
|
||||||
|
|
||||||
# Copyright (C) 2007-2016 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 prefix of git tags (default 'v')
|
|
||||||
--fallback VERSION
|
|
||||||
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/-/./;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.
|
|
||||||
printf %s "$v"
|
|
||||||
|
|
||||||
# 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: "UTC0"
|
|
||||||
# time-stamp-end: "; # UTC"
|
|
||||||
# End:
|
|
||||||
|
|
@ -1,499 +0,0 @@
|
||||||
eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
|
|
||||||
& eval 'exec perl -wS "$0" $argv:q'
|
|
||||||
if 0;
|
|
||||||
# Convert git log output to ChangeLog format.
|
|
||||||
|
|
||||||
my $VERSION = '2018-03-07 03:47'; # UTC
|
|
||||||
# The definition above must lie within the first 8 lines in order
|
|
||||||
# for the Emacs time-stamp write hook (at end) to update it.
|
|
||||||
# If you change this file with Emacs, please let the write hook
|
|
||||||
# do its job. Otherwise, update this string manually.
|
|
||||||
|
|
||||||
# Copyright (C) 2008-2018 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 <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Written by Jim Meyering
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use warnings;
|
|
||||||
use Getopt::Long;
|
|
||||||
use POSIX qw(strftime);
|
|
||||||
|
|
||||||
(my $ME = $0) =~ s|.*/||;
|
|
||||||
|
|
||||||
# use File::Coda; # https://meyering.net/code/Coda/
|
|
||||||
END {
|
|
||||||
defined fileno STDOUT or return;
|
|
||||||
close STDOUT and return;
|
|
||||||
warn "$ME: failed to close standard output: $!\n";
|
|
||||||
$? ||= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub usage ($)
|
|
||||||
{
|
|
||||||
my ($exit_code) = @_;
|
|
||||||
my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
|
|
||||||
if ($exit_code != 0)
|
|
||||||
{
|
|
||||||
print $STREAM "Try '$ME --help' for more information.\n";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print $STREAM <<EOF;
|
|
||||||
Usage: $ME [OPTIONS] [ARGS]
|
|
||||||
|
|
||||||
Convert git log output to ChangeLog format. If present, any ARGS
|
|
||||||
are passed to "git log". To avoid ARGS being parsed as options to
|
|
||||||
$ME, they may be preceded by '--'.
|
|
||||||
|
|
||||||
OPTIONS:
|
|
||||||
|
|
||||||
--amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
|
|
||||||
makes a change to SHA1's commit log text or metadata.
|
|
||||||
--append-dot append a dot to the first line of each commit message if
|
|
||||||
there is no other punctuation or blank at the end.
|
|
||||||
--no-cluster never cluster commit messages under the same date/author
|
|
||||||
header; the default is to cluster adjacent commit messages
|
|
||||||
if their headers are the same and neither commit message
|
|
||||||
contains multiple paragraphs.
|
|
||||||
--srcdir=DIR the root of the source tree, from which the .git/
|
|
||||||
directory can be derived.
|
|
||||||
--since=DATE convert only the logs since DATE;
|
|
||||||
the default is to convert all log entries.
|
|
||||||
--until=DATE convert only the logs older than DATE.
|
|
||||||
--ignore-matching=PAT ignore commit messages whose first lines match PAT.
|
|
||||||
--ignore-line=PAT ignore lines of commit messages that match PAT.
|
|
||||||
--format=FMT set format string for commit subject and body;
|
|
||||||
see 'man git-log' for the list of format metacharacters;
|
|
||||||
the default is '%s%n%b%n'
|
|
||||||
--strip-tab remove one additional leading TAB from commit message lines.
|
|
||||||
--strip-cherry-pick remove data inserted by "git cherry-pick";
|
|
||||||
this includes the "cherry picked from commit ..." line,
|
|
||||||
and the possible final "Conflicts:" paragraph.
|
|
||||||
--help display this help and exit
|
|
||||||
--version output version information and exit
|
|
||||||
|
|
||||||
EXAMPLE:
|
|
||||||
|
|
||||||
$ME --since=2008-01-01 > ChangeLog
|
|
||||||
$ME -- -n 5 foo > last-5-commits-to-branch-foo
|
|
||||||
|
|
||||||
SPECIAL SYNTAX:
|
|
||||||
|
|
||||||
The following types of strings are interpreted specially when they appear
|
|
||||||
at the beginning of a log message line. They are not copied to the output.
|
|
||||||
|
|
||||||
Copyright-paperwork-exempt: Yes
|
|
||||||
Append the "(tiny change)" notation to the usual "date name email"
|
|
||||||
ChangeLog header to mark a change that does not require a copyright
|
|
||||||
assignment.
|
|
||||||
Co-authored-by: Joe User <user\@example.com>
|
|
||||||
List the specified name and email address on a second
|
|
||||||
ChangeLog header, denoting a co-author.
|
|
||||||
Signed-off-by: Joe User <user\@example.com>
|
|
||||||
These lines are simply elided.
|
|
||||||
|
|
||||||
In a FILE specified via --amend, comment lines (starting with "#") are ignored.
|
|
||||||
FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
|
|
||||||
a line) referring to a commit in the current project, and CODE refers to one
|
|
||||||
or more consecutive lines of Perl code. Pairs must be separated by one or
|
|
||||||
more blank line.
|
|
||||||
|
|
||||||
Here is sample input for use with --amend=FILE, from coreutils:
|
|
||||||
|
|
||||||
3a169f4c5d9159283548178668d2fae6fced3030
|
|
||||||
# fix typo in title:
|
|
||||||
s/all tile types/all file types/
|
|
||||||
|
|
||||||
1379ed974f1fa39b12e2ffab18b3f7a607082202
|
|
||||||
# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
|
|
||||||
# Change the author to be Paul. Note the escaped "@":
|
|
||||||
s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>,
|
|
||||||
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
exit $exit_code;
|
|
||||||
}
|
|
||||||
|
|
||||||
# If the string $S is a well-behaved file name, simply return it.
|
|
||||||
# If it contains white space, quotes, etc., quote it, and return the new string.
|
|
||||||
sub shell_quote($)
|
|
||||||
{
|
|
||||||
my ($s) = @_;
|
|
||||||
if ($s =~ m![^\w+/.,-]!)
|
|
||||||
{
|
|
||||||
# Convert each single quote to '\''
|
|
||||||
$s =~ s/\'/\'\\\'\'/g;
|
|
||||||
# Then single quote the string.
|
|
||||||
$s = "'$s'";
|
|
||||||
}
|
|
||||||
return $s;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub quoted_cmd(@)
|
|
||||||
{
|
|
||||||
return join (' ', map {shell_quote $_} @_);
|
|
||||||
}
|
|
||||||
|
|
||||||
# Parse file F.
|
|
||||||
# Comment lines (starting with "#") are ignored.
|
|
||||||
# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
|
|
||||||
# (alone on a line) referring to a commit in the current project, and
|
|
||||||
# CODE refers to one or more consecutive lines of Perl code.
|
|
||||||
# Pairs must be separated by one or more blank line.
|
|
||||||
sub parse_amend_file($)
|
|
||||||
{
|
|
||||||
my ($f) = @_;
|
|
||||||
|
|
||||||
open F, '<', $f
|
|
||||||
or die "$ME: $f: failed to open for reading: $!\n";
|
|
||||||
|
|
||||||
my $fail;
|
|
||||||
my $h = {};
|
|
||||||
my $in_code = 0;
|
|
||||||
my $sha;
|
|
||||||
while (defined (my $line = <F>))
|
|
||||||
{
|
|
||||||
$line =~ /^\#/
|
|
||||||
and next;
|
|
||||||
chomp $line;
|
|
||||||
$line eq ''
|
|
||||||
and $in_code = 0, next;
|
|
||||||
|
|
||||||
if (!$in_code)
|
|
||||||
{
|
|
||||||
$line =~ /^([0-9a-fA-F]{40})$/
|
|
||||||
or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
|
|
||||||
$fail = 1, next;
|
|
||||||
$sha = lc $1;
|
|
||||||
$in_code = 1;
|
|
||||||
exists $h->{$sha}
|
|
||||||
and (warn "$ME: $f:$.: duplicate SHA1\n"),
|
|
||||||
$fail = 1, next;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$h->{$sha} ||= '';
|
|
||||||
$h->{$sha} .= "$line\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close F;
|
|
||||||
|
|
||||||
$fail
|
|
||||||
and exit 1;
|
|
||||||
|
|
||||||
return $h;
|
|
||||||
}
|
|
||||||
|
|
||||||
# git_dir_option $SRCDIR
|
|
||||||
#
|
|
||||||
# From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR
|
|
||||||
# is undef). Return as a list (0 or 1 element).
|
|
||||||
sub git_dir_option($)
|
|
||||||
{
|
|
||||||
my ($srcdir) = @_;
|
|
||||||
my @res = ();
|
|
||||||
if (defined $srcdir)
|
|
||||||
{
|
|
||||||
my $qdir = shell_quote $srcdir;
|
|
||||||
my $cmd = "cd $qdir && git rev-parse --show-toplevel";
|
|
||||||
my $qcmd = shell_quote $cmd;
|
|
||||||
my $git_dir = qx($cmd);
|
|
||||||
defined $git_dir
|
|
||||||
or die "$ME: cannot run $qcmd: $!\n";
|
|
||||||
$? == 0
|
|
||||||
or die "$ME: $qcmd had unexpected exit code or signal ($?)\n";
|
|
||||||
chomp $git_dir;
|
|
||||||
push @res, "--git-dir=$git_dir/.git";
|
|
||||||
}
|
|
||||||
@res;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
my $since_date;
|
|
||||||
my $until_date;
|
|
||||||
my $format_string = '%s%n%b%n';
|
|
||||||
my $amend_file;
|
|
||||||
my $append_dot = 0;
|
|
||||||
my $cluster = 1;
|
|
||||||
my $ignore_matching;
|
|
||||||
my $ignore_line;
|
|
||||||
my $strip_tab = 0;
|
|
||||||
my $strip_cherry_pick = 0;
|
|
||||||
my $srcdir;
|
|
||||||
GetOptions
|
|
||||||
(
|
|
||||||
help => sub { usage 0 },
|
|
||||||
version => sub { print "$ME version $VERSION\n"; exit },
|
|
||||||
'since=s' => \$since_date,
|
|
||||||
'until=s' => \$until_date,
|
|
||||||
'format=s' => \$format_string,
|
|
||||||
'amend=s' => \$amend_file,
|
|
||||||
'append-dot' => \$append_dot,
|
|
||||||
'cluster!' => \$cluster,
|
|
||||||
'ignore-matching=s' => \$ignore_matching,
|
|
||||||
'ignore-line=s' => \$ignore_line,
|
|
||||||
'strip-tab' => \$strip_tab,
|
|
||||||
'strip-cherry-pick' => \$strip_cherry_pick,
|
|
||||||
'srcdir=s' => \$srcdir,
|
|
||||||
) or usage 1;
|
|
||||||
|
|
||||||
defined $since_date
|
|
||||||
and unshift @ARGV, "--since=$since_date";
|
|
||||||
defined $until_date
|
|
||||||
and unshift @ARGV, "--until=$until_date";
|
|
||||||
|
|
||||||
# This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
|
|
||||||
# that makes a correction in the log or attribution of that commit.
|
|
||||||
my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
|
|
||||||
|
|
||||||
my @cmd = ('git',
|
|
||||||
git_dir_option $srcdir,
|
|
||||||
qw(log --log-size),
|
|
||||||
'--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV);
|
|
||||||
open PIPE, '-|', @cmd
|
|
||||||
or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
|
|
||||||
. "(Is your Git too old? Version 1.5.1 or later is required.)\n");
|
|
||||||
|
|
||||||
my $prev_multi_paragraph;
|
|
||||||
my $prev_date_line = '';
|
|
||||||
my @prev_coauthors = ();
|
|
||||||
my @skipshas = ();
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
defined (my $in = <PIPE>)
|
|
||||||
or last;
|
|
||||||
$in =~ /^log size (\d+)$/
|
|
||||||
or die "$ME:$.: Invalid line (expected log size):\n$in";
|
|
||||||
my $log_nbytes = $1;
|
|
||||||
|
|
||||||
my $log;
|
|
||||||
my $n_read = read PIPE, $log, $log_nbytes;
|
|
||||||
$n_read == $log_nbytes
|
|
||||||
or die "$ME:$.: unexpected EOF\n";
|
|
||||||
|
|
||||||
# Extract leading hash.
|
|
||||||
my ($sha, $rest) = split ':', $log, 2;
|
|
||||||
defined $sha
|
|
||||||
or die "$ME:$.: malformed log entry\n";
|
|
||||||
$sha =~ /^[0-9a-fA-F]{40}$/
|
|
||||||
or die "$ME:$.: invalid SHA1: $sha\n";
|
|
||||||
|
|
||||||
my $skipflag = 0;
|
|
||||||
if (@skipshas)
|
|
||||||
{
|
|
||||||
foreach(@skipshas)
|
|
||||||
{
|
|
||||||
if ($sha =~ /^$_/)
|
|
||||||
{
|
|
||||||
$skipflag = $_;
|
|
||||||
last;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# If this commit's log requires any transformation, do it now.
|
|
||||||
my $code = $amend_code->{$sha};
|
|
||||||
if (defined $code)
|
|
||||||
{
|
|
||||||
eval 'use Safe';
|
|
||||||
my $s = new Safe;
|
|
||||||
# Put the unpreprocessed entry into "$_".
|
|
||||||
$_ = $rest;
|
|
||||||
|
|
||||||
# Let $code operate on it, safely.
|
|
||||||
my $r = $s->reval("$code")
|
|
||||||
or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
|
|
||||||
|
|
||||||
# Note that we've used this entry.
|
|
||||||
delete $amend_code->{$sha};
|
|
||||||
|
|
||||||
# Update $rest upon success.
|
|
||||||
$rest = $_;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Remove lines inserted by "git cherry-pick".
|
|
||||||
if ($strip_cherry_pick)
|
|
||||||
{
|
|
||||||
$rest =~ s/^\s*Conflicts:\n.*//sm;
|
|
||||||
$rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
|
|
||||||
}
|
|
||||||
|
|
||||||
my @line = split /[ \t]*\n/, $rest;
|
|
||||||
my $author_line = shift @line;
|
|
||||||
defined $author_line
|
|
||||||
or die "$ME:$.: unexpected EOF\n";
|
|
||||||
$author_line =~ /^(\d+) (.*>)$/
|
|
||||||
or die "$ME:$.: Invalid line "
|
|
||||||
. "(expected date/author/email):\n$author_line\n";
|
|
||||||
|
|
||||||
# Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
|
|
||||||
# `(tiny change)' annotation.
|
|
||||||
my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line)
|
|
||||||
? ' (tiny change)' : '');
|
|
||||||
|
|
||||||
my $date_line = sprintf "%s %s$tiny\n",
|
|
||||||
strftime ("%Y-%m-%d", localtime ($1)), $2;
|
|
||||||
|
|
||||||
my @coauthors = grep /^Co-authored-by:.*$/, @line;
|
|
||||||
# Omit meta-data lines we've already interpreted.
|
|
||||||
@line = grep !/^(?:Signed-off-by:[ ].*>$
|
|
||||||
|Co-authored-by:[ ]
|
|
||||||
|Copyright-paperwork-exempt:[ ]
|
|
||||||
|Tiny-change:[ ]
|
|
||||||
)/x, @line;
|
|
||||||
|
|
||||||
# Remove leading and trailing blank lines.
|
|
||||||
if (@line)
|
|
||||||
{
|
|
||||||
while ($line[0] =~ /^\s*$/) { shift @line; }
|
|
||||||
while ($line[$#line] =~ /^\s*$/) { pop @line; }
|
|
||||||
}
|
|
||||||
|
|
||||||
# Handle Emacs gitmerge.el "skipped" commits.
|
|
||||||
# Yes, this should be controlled by an option. So sue me.
|
|
||||||
if ( grep /^(; )?Merge from /, @line )
|
|
||||||
{
|
|
||||||
my $found = 0;
|
|
||||||
foreach (@line)
|
|
||||||
{
|
|
||||||
if (grep /^The following commit.*skipped:$/, $_)
|
|
||||||
{
|
|
||||||
$found = 1;
|
|
||||||
## Reset at each merge to reduce chance of false matches.
|
|
||||||
@skipshas = ();
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/)
|
|
||||||
{
|
|
||||||
push ( @skipshas, $1 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Ignore commits that match the --ignore-matching pattern, if specified.
|
|
||||||
if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/)
|
|
||||||
{
|
|
||||||
$skipflag = 1;
|
|
||||||
}
|
|
||||||
elsif ($skipflag)
|
|
||||||
{
|
|
||||||
## Perhaps only warn if a pattern matches more than once?
|
|
||||||
warn "$ME: warning: skipping $sha due to $skipflag\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $skipflag)
|
|
||||||
{
|
|
||||||
if (defined $ignore_line && @line)
|
|
||||||
{
|
|
||||||
@line = grep ! /$ignore_line/, @line;
|
|
||||||
while ($line[$#line] =~ /^\s*$/) { pop @line; }
|
|
||||||
}
|
|
||||||
|
|
||||||
# Record whether there are two or more paragraphs.
|
|
||||||
my $multi_paragraph = grep /^\s*$/, @line;
|
|
||||||
|
|
||||||
# Format 'Co-authored-by: A U Thor <email@example.com>' lines in
|
|
||||||
# standard multi-author ChangeLog format.
|
|
||||||
for (@coauthors)
|
|
||||||
{
|
|
||||||
s/^Co-authored-by:\s*/\t /;
|
|
||||||
s/\s*</ </;
|
|
||||||
|
|
||||||
/<.*?@.*\..*>/
|
|
||||||
or warn "$ME: warning: missing email address for "
|
|
||||||
. substr ($_, 5) . "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
# If clustering of commit messages has been disabled, if this header
|
|
||||||
# would be different from the previous date/name/etc. header,
|
|
||||||
# or if this or the previous entry consists of two or more paragraphs,
|
|
||||||
# then print the header.
|
|
||||||
if ( ! $cluster
|
|
||||||
|| $date_line ne $prev_date_line
|
|
||||||
|| "@coauthors" ne "@prev_coauthors"
|
|
||||||
|| $multi_paragraph
|
|
||||||
|| $prev_multi_paragraph)
|
|
||||||
{
|
|
||||||
$prev_date_line eq ''
|
|
||||||
or print "\n";
|
|
||||||
print $date_line;
|
|
||||||
@coauthors
|
|
||||||
and print join ("\n", @coauthors), "\n";
|
|
||||||
}
|
|
||||||
$prev_date_line = $date_line;
|
|
||||||
@prev_coauthors = @coauthors;
|
|
||||||
$prev_multi_paragraph = $multi_paragraph;
|
|
||||||
|
|
||||||
# If there were any lines
|
|
||||||
if (@line == 0)
|
|
||||||
{
|
|
||||||
warn "$ME: warning: empty commit message:\n $date_line\n";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ($append_dot)
|
|
||||||
{
|
|
||||||
# If the first line of the message has enough room, then
|
|
||||||
if (length $line[0] < 72)
|
|
||||||
{
|
|
||||||
# append a dot if there is no other punctuation or blank
|
|
||||||
# at the end.
|
|
||||||
$line[0] =~ /[[:punct:]\s]$/
|
|
||||||
or $line[0] .= '.';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Remove one additional leading TAB from each line.
|
|
||||||
$strip_tab
|
|
||||||
and map { s/^\t// } @line;
|
|
||||||
|
|
||||||
# Prefix each non-empty line with a TAB.
|
|
||||||
@line = map { length $_ ? "\t$_" : '' } @line;
|
|
||||||
|
|
||||||
print "\n", join ("\n", @line), "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
defined ($in = <PIPE>)
|
|
||||||
or last;
|
|
||||||
$in ne "\n"
|
|
||||||
and die "$ME:$.: unexpected line:\n$in";
|
|
||||||
}
|
|
||||||
|
|
||||||
close PIPE
|
|
||||||
or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
|
|
||||||
# FIXME-someday: include $PROCESS_STATUS in the diagnostic
|
|
||||||
|
|
||||||
# Complain about any unused entry in the --amend=F specified file.
|
|
||||||
my $fail = 0;
|
|
||||||
foreach my $sha (keys %$amend_code)
|
|
||||||
{
|
|
||||||
warn "$ME:$amend_file: unused entry: $sha\n";
|
|
||||||
$fail = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
exit $fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# mode: perl
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
|
||||||
# time-stamp-start: "my $VERSION = '"
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
|
|
||||||
# time-stamp-time-zone: "UTC0"
|
|
||||||
# time-stamp-end: "'; # UTC"
|
|
||||||
# End:
|
|
||||||
0
build-aux/gnu-web-doc-update
Executable file → Normal file
0
build-aux/gnu-web-doc-update
Executable file → Normal file
0
build-aux/gnupload
Executable file → Normal file
0
build-aux/gnupload
Executable file → Normal file
|
|
@ -38,17 +38,9 @@
|
||||||
(define %srcdir
|
(define %srcdir
|
||||||
(or (current-source-directory) "."))
|
(or (current-source-directory) "."))
|
||||||
|
|
||||||
(define (git-version-gen)
|
|
||||||
;; Return a string containing Cuirass version number.
|
|
||||||
(let* ((cmd "git-version-gen .version")
|
|
||||||
(port (open-input-pipe (string-append %srcdir "/" cmd)))
|
|
||||||
(str (read-line port)))
|
|
||||||
(close-pipe port)
|
|
||||||
str))
|
|
||||||
|
|
||||||
(package
|
(package
|
||||||
(inherit (specification->package "mcron2"))
|
(inherit (specification->package "mcron2"))
|
||||||
(version (git-version-gen))
|
(version "1.1.2")
|
||||||
(source (local-file (dirname %srcdir) #:recursive? #t
|
(source (local-file (dirname %srcdir) #:recursive? #t
|
||||||
#:select? keep-mcron-file?))
|
#:select? keep-mcron-file?))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
||||||
5
configure.ac
Normal file → Executable file
5
configure.ac
Normal file → Executable file
|
|
@ -20,13 +20,10 @@
|
||||||
# along with GNU Mcron. If not, see <http://www.gnu.org/licenses/>.
|
# along with GNU Mcron. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
AC_PREREQ(2.61)
|
AC_PREREQ(2.61)
|
||||||
AC_INIT([GNU Mcron],
|
AC_INIT([GNU Mcron], [1.1.2], [bug-mcron@gnu.org])
|
||||||
m4_esyscmd([build-aux/git-version-gen .tarball-version]),
|
|
||||||
[bug-mcron@gnu.org])
|
|
||||||
AC_CONFIG_SRCDIR([src/mcron.c])
|
AC_CONFIG_SRCDIR([src/mcron.c])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_REQUIRE_AUX_FILE([test-driver.scm])
|
AC_REQUIRE_AUX_FILE([test-driver.scm])
|
||||||
AC_REQUIRE_AUX_FILE([git-version-gen])
|
|
||||||
AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-override std-options])
|
AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-override std-options])
|
||||||
AM_SILENT_RULES([yes]) # enables silent rules by default
|
AM_SILENT_RULES([yes]) # enables silent rules by default
|
||||||
|
|
||||||
|
|
|
||||||
1
maint.mk
Normal file → Executable file
1
maint.mk
Normal file → Executable file
|
|
@ -37,7 +37,6 @@ sv_git_gl = 'https://$(git_sv_host)/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=
|
||||||
fetchfiles = \
|
fetchfiles = \
|
||||||
$(sv_git_am)contrib/test-driver.scm \
|
$(sv_git_am)contrib/test-driver.scm \
|
||||||
$(sv_git_gl)build-aux/do-release-commit-and-tag \
|
$(sv_git_gl)build-aux/do-release-commit-and-tag \
|
||||||
$(sv_git_gl)build-aux/gitlog-to-changelog \
|
|
||||||
${sv_git_gl}build-aux/gnu-web-doc-update \
|
${sv_git_gl}build-aux/gnu-web-doc-update \
|
||||||
$(sv_git_gl)build-aux/gnupload
|
$(sv_git_gl)build-aux/gnupload
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue