[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.5-27
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.5-273-gb8c7e3f |
|
Date: |
Fri, 14 Dec 2012 14:44:33 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff
The branch, master has been updated
via b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff (commit)
via 454a1acda60854294ca6953621150707c037ee9a (commit)
via 6dc13e5e952dc270b053b8ad1a80028d1810ab60 (commit)
via 43340dfe396f9186267338f787a70b9af23ca126 (commit)
via 89ea805745b63bf954d19786a723a15c667f9b8e (commit)
via f3baf34af641dafad64d4e849e7406013ac7261e (commit)
via 97947ba47519b21e81f1e6ecd6438060b924c40e (commit)
from 2674291c3389fcde8c7206f858df12d66f123837 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff
Merge: 2674291 454a1ac
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 15:43:27 2012 +0100
Merge branch 'maint'
* maint:
sync: update files from upstream with "make fetch"
gitignore: align with recent changes
fixup: add dummy rule for ChangeLog generation in Makefile.am
maint: no longer use AM_MAKEFLAGS in maintainer rules
maint: use more GNU make features in maintainer rules
maint: move maintainer make rules in maint.mk
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
GNUmakefile | 1 +
Makefile.am | 468 +---------------------------------------------------------
lib/gnupload | 17 ++-
maint.mk | 467 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 485 insertions(+), 470 deletions(-)
create mode 100644 maint.mk
diff --git a/.gitignore b/.gitignore
index b800a68..a32310e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@
/doc/amhello/depcomp
/doc/amhello/install-sh
/doc/amhello/missing
-/doc/web-manuals
+/doc/web-manual
/lib/Automake/Config.pm
/test-suite.log
/t/wrap/aclocal-1.*
diff --git a/GNUmakefile b/GNUmakefile
index 7ab58ca..c8eab6f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,6 +25,7 @@ ifeq ($(wildcard Makefile),)
$(error Fatal Error)
endif
include ./Makefile
+include $(srcdir)/maint.mk
include $(srcdir)/syntax-checks.mk
else # ! bootstrap in $(MAKECMDGOALS)
diff --git a/Makefile.am b/Makefile.am
index f3eb432..5686528 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ EXTRA_DIST += \
$(AUTOMAKESOURCES) \
bootstrap.sh \
GNUmakefile \
+ maint.mk \
syntax-checks.mk \
HACKING
@@ -115,6 +116,11 @@ INSTALL: lib/INSTALL
maintainer-clean-local:
rm -rf .autom4te.cache
+# So that automake won't complain about the missing ChangeLog.
+# The real rule for ChangeLog generation is now in maint.mk (as
+# it is maintainer-specific).
+ChangeLog:
+
## -------------------------------------------------------------------- ##
## Auxiliary scripts and files for use with "automake --add-missing". ##
@@ -661,465 +667,3 @@ EXTRA_DIST += \
old/ChangeLog.09 \
old/ChangeLog.11 \
old/TODO
-
-
-##########################################################################
-
-## Everything past here is useful to the maintainer, but probably not
-## to anybody else.
-
-##########################################################################
-
-
-## --------------------------------------------------------- ##
-## Automatic generation of the ChangeLog from git history. ##
-## --------------------------------------------------------- ##
-
-gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
-gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
- --since='2011-12-28 00:00:00' \
- --no-cluster --format '%s%n%n%b'
-
-EXTRA_DIST += lib/gitlog-to-changelog
-EXTRA_DIST += $(gitlog_to_changelog_fixes)
-
-# When executed from a git checkout, generate the ChangeLog from the git
-# history. When executed from an extracted distribution tarball, just
-# copy the distributed ChangeLog in the build directory (and if this
-# fails, or if no distributed ChangeLog file is present, complain and
-# give an error).
-#
-# We need the apparently useless dependency from another .PHONY target
-# 'am--changelog-regen-hook' to work around a bug of Solaris make, which
-# doesn't execute the recipe of a target named as an existing file, even
-# if such target is declared '.PHONY' (yikes!)
-#
-.PHONY: am--changelog-regen-hook
-am--changelog-regen-hook:
-ChangeLog: am--changelog-regen-hook
- $(AM_V_GEN)set -e; set -u; \
-## The ChangeLog should be regenerated unconditionally when working from
-## checked-out sources; otherwise, if we're working from a distribution
-## tarball, we expect the ChangeLog to be distributed, so check that it
-## is indeed present in the source directory.
- if test -d $(srcdir)/.git; then \
- rm -f address@hidden \
- && $(gitlog_to_changelog_command) \
- $(gitlog_to_changelog_options) >address@hidden \
- && chmod a-w address@hidden \
- && mv -f address@hidden $@ \
- || exit 1; \
- elif test ! -f $(srcdir)/$@; then \
- echo "Source tree is not a git checkout, and no pre-existent" \
- "$@ file has been found there" >&2; \
- exit 1; \
- fi
-
-
-## --------------------------- ##
-## Perl coverage statistics. ##
-## --------------------------- ##
-
-PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
-PERL_COVERAGE_FLAGS =
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
-PERL_COVER = cover
-
-check-coverage-run recheck-coverage-run: all
- $(mkinstalldirs) $(PERL_COVERAGE_DB)
- PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
- WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
- $(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed 's/-coverage-run//'`
-
-check-coverage-report:
- @if test ! -d "$(PERL_COVERAGE_DB)"; then \
- echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \
- echo "Please run \"make check-coverage\" first" >&2; \
- exit 1; \
- fi
- $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)"
-
-# We don't use direct dependencies here because we'd like to be able
-# to invoke the report even after interrupted check-coverage.
-check-coverage: check-coverage-run
- $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
-
-recheck-coverage: recheck-coverage-run
- $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
-
-clean-coverage:
- rm -rf "$(PERL_COVERAGE_DB)"
-clean-local: clean-coverage
-
-.PHONY: check-coverage recheck-coverage check-coverage-run \
- recheck-coverage-run check-coverage-report clean-coverage
-
-
-## ---------------------------------------------------- ##
-## Tagging and/or uploading stable and beta releases. ##
-## ---------------------------------------------------- ##
-
-GIT = git
-
-EXTRA_DIST += lib/gnupload
-
-base_version_rx = ^[1-9][0-9]*\.[0-9][0-9]*
-stable_major_version_rx = $(base_version_rx)$$
-stable_minor_version_rx = $(base_version_rx)\.[0-9][0-9]*$$
-beta_version_rx = $(base_version_rx)(\.[0-9][0-9]*)?[bdfhjlnprtvxz]$$
-match_version = echo "$(VERSION)" | $(EGREP) >/dev/null
-
-## Check that we don't have uncommitted or unstaged changes.
-## TODO: Maybe the git suite already offers a shortcut to verify if the
-## TODO: working directory is "clean" or not? If yes, use that instead
-## TODO: of duplicating the logic here.
-git_must_have_clean_workdir = \
- $(GIT) rev-parse --verify HEAD >/dev/null \
- && $(GIT) update-index -q --refresh \
- && $(GIT) diff-files --quiet \
- && $(GIT) diff-index --quiet --cached HEAD \
- || fatal "you have uncommitted or unstaged changes"
-
-determine_release_type = \
- if $(match_version) '$(stable_major_version_rx)'; then \
- release_type='Major release'; \
- announcement_type='major release'; \
- dest=ftp; \
- elif $(match_version) '$(stable_minor_version_rx)'; then \
- release_type='Minor release'; \
- announcement_type='maintenance release'; \
- dest=ftp; \
- elif $(match_version) '$(beta_version_rx)'; then \
- release_type='Beta release'; \
- announcement_type='test release'; \
- dest=alpha; \
- else \
- fatal "invalid version '$(VERSION)' for a release"; \
- fi
-
-# Help the debugging of $(determine_release_type) and related code.
-print-release-type:
- @set -e -u \
- && fatal () { echo "$@: $$*"; exit 0; } \
- && $(determine_release_type) \
- && echo "$$release_type $(VERSION);" \
- "it will be announced as a $$announcement_type"
-
-git-tag-release: maintainer-check
- @set -e; set -u; \
- fatal () { echo "$@: $$*; not tagging" >&2; exit 1; }; \
- case '$(AM_TAG_DRYRUN)' in \
- ""|[nN]|[nN]o|NO) run="";; \
- *) run="echo Running:";; \
- esac; \
- $(determine_release_type); \
- $(git_must_have_clean_workdir); \
-## If all was successful, tag the release in the local repository.
- $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
-
-git-upload-release:
- @set -e; set -u; \
- fatal () { echo "$@: $$*; not releasing" >&2; exit 1; }; \
- $(determine_release_type); \
- dest=$$dest.gnu.org:automake; \
- $(git_must_have_clean_workdir); \
-## Check that we are releasing from a valid tag.
- tag=`$(GIT) describe` \
- && case $$tag in "v$(VERSION)") true;; *) false;; esac \
- || fatal "you can only create a release from a tagged version"; \
-## Build and upload the distribution tarball(s).
- $(MAKE) $(AM_MAKEFLAGS) dist || exit 1; \
- echo Will upload to $$dest: $(DIST_ARCHIVES); \
- $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest $(DIST_ARCHIVES)
-
-.PHONY: print-release-type git-upload-release git-tag-release
-
-
-## ------------------------------------------------------------------ ##
-## Explore differences of autogenerated files in different commits. ##
-## ------------------------------------------------------------------ ##
-
-## Visually comparing differences between the Makefile.in files in
-## automake's own build system as generated in two different branches
-## might help to catch bugs and blunders. This has already happened a
-## few times in the past, when we used to version-control Makefile.in.
-autodiffs:
- @set -u; \
- NEW_COMMIT=$${NEW_COMMIT-"HEAD"}; \
- OLD_COMMIT=$${OLD_COMMIT-"HEAD~1"}; \
- am_gitdir='$(abs_top_srcdir)/.git'; \
- get_autofiles_from_rev () \
- { \
- rev=$$1 dir=$$2 \
- && echo "$@: will get files from revision $$rev" \
- && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
- && $(am__cd) tmp \
- && $(GIT) checkout -q "$$rev" \
- && echo "$@: bootstrapping $$rev" \
- && $(SHELL) ./bootstrap.sh \
- && echo "$@: copying files from $$rev" \
- && makefile_ins=`find . -name Makefile.in` \
- && (tar cf - configure aclocal.m4 $$makefile_ins) | \
- (cd .. && $(am__cd) "$$dir" && tar xf -) \
- && cd .. \
- && rm -rf tmp; \
- }; \
- address@hidden \
-## Before proceeding, ensure the specified revisions truly exist.
- && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
- && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
- && rm -rf $$outdir \
- && mkdir $$outdir \
- && $(am__cd) $$outdir \
- && mkdir new old \
- && get_autofiles_from_rev $$OLD_COMMIT old \
- && get_autofiles_from_rev $$NEW_COMMIT new \
- && exit 0
-
-## With lots of eye candy; we like our developers pampered and spoiled :-)
-compare-autodiffs: autodiffs
- @set -u; \
- : $${COLORDIFF=colordiff} $${DIFF=diff}; \
- dir=autodiffs.dir; \
- if test ! -d "$$dir"; then \
- echo "$@: $$dir: Not a directory" >&2; \
- exit 1; \
- fi; \
- mydiff=false mypager=false; \
- if test -t 1; then \
- if ($$COLORDIFF -r . .) </dev/null >/dev/null 2>&1; then \
- mydiff=$$COLORDIFF; \
- mypager="less -R"; \
- else \
- mypager=less; \
- fi; \
- else \
- mypager=cat; \
- fi; \
- if test "$$mydiff" = false; then \
- if ($$DIFF -r -u . .); then \
- mydiff=$$DIFF; \
- else \
- echo "$@: no good-enough diff program specified" >&2; \
- exit 1; \
- fi; \
- fi; \
- st=0; $$mydiff -r -u $$dir/old $$dir/new | $$mypager || st=$$?; \
- rm -rf $$dir; \
- exit $$st
-.PHONY: autodiffs compare-autodiffs
-
-## ---------------------------------------------- ##
-## Help writing the announcement for a release. ##
-## ---------------------------------------------- ##
-
-PACKAGE_MAILINGLIST = address@hidden
-
-announcement: NEWS
- $(AM_V_GEN): \
- && rm -f $@ address@hidden \
- && fatal () { echo "$@: $$*" >&2; exit 1; } \
- && $(determine_release_type) \
- && ftp_base="ftp://$$dest.gnu.org/gnu/$(PACKAGE)" \
- && X () { printf '%s\n' "$$*" >> address@hidden; } \
- && X "We are pleased to announce the $(PACKAGE_NAME) $(VERSION)" \
- "$$announcement_type." \
- && X \
- && X "**TODO** Brief description of the release here." \
- && X \
- && X "**TODO** This description can span multiple paragraphs." \
- && X \
- && X "See below for the detailed list of changes since the" \
- && X "previous version, as summarized by the NEWS file." \
- && X \
- && X "Download here:" \
- && X \
- && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.gz" \
- && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.xz" \
- && X \
- && X "Please report bugs and problems to" \
- "<$(PACKAGE_BUGREPORT)>," \
- && X "and send general comments and feedback to" \
- "<$(PACKAGE_MAILINGLIST)>." \
- && X \
- && X "Thanks to everyone who has reported problems, contributed" \
- && X "patches, and helped testing Automake!" \
- && X \
- && X "-*-*-*-" \
- && X \
- && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> address@hidden \
- && mv -f address@hidden $@
-.PHONY: announcement
-CLEANFILES += announcement
-
-## --------------------------------------------------------------------- ##
-## Synchronize third-party files that are committed in our repository. ##
-## --------------------------------------------------------------------- ##
-
-# Program to use to fetch files.
-WGET = wget
-
-# Some repositories we sync files from.
-SV_CVS = 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/'
-SV_GIT_CF =
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
-SV_GIT_AC =
'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
-SV_GIT_GL =
'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
-
-# Files that we fetch and which we compare against.
-# Note that the 'lib/COPYING' file must still be synced by hand.
-FETCHFILES = \
- $(SV_GIT_CF)config.guess \
- $(SV_GIT_CF)config.sub \
- $(SV_CVS)texinfo/texinfo/doc/texinfo.tex \
- $(SV_CVS)texinfo/texinfo/util/gendocs.sh \
- $(SV_CVS)texinfo/texinfo/util/gendocs_template \
- $(SV_GIT_GL)build-aux/gitlog-to-changelog \
- $(SV_GIT_GL)build-aux/gnupload \
- $(SV_GIT_GL)build-aux/update-copyright \
- $(SV_GIT_GL)doc/INSTALL
-
-# Fetch the latest versions of few scripts and files we care about.
-fetch:
- $(AM_V_at)rm -rf Fetchdir
- $(AM_V_at)mkdir Fetchdir
- $(AM_V_GEN)set -e; \
- if $(AM_V_P); then wget_opts=; else wget_opts=-nv; fi; \
- for url in $(FETCHFILES); do \
- file=`printf '%s\n' "$$url" | sed 's|^.*/||; s|^.*=||'`; \
-## A retrieval failure usually means a serious problem. Just bail out.
- $(WGET) $$wget_opts "$$url" -O Fetchdir/$$file || exit 1; \
- if cmp Fetchdir/$$file $(srcdir)/lib/$$file >/dev/null; then \
- : Nothing to do; \
- else \
- echo "$@: updating file $$file"; \
-## Ditto for a copying failure.
- cp Fetchdir/$$file $(srcdir)/lib/$$file || exit 1; \
- fi; \
- done
- $(AM_V_at)rm -rf Fetchdir
-.PHONY: fetch
-
-## ---------------------------------------------------------------------- ##
-## Generate and upload manuals in several formats, for the GNU website. ##
-## ---------------------------------------------------------------------- ##
-
-web_manual_dir = doc/web-manual
-
-RSYNC = rsync
-CVS = cvs
-CVSU = cvsu
-CVS_USER = $${USER}
-WEBCVS_ROOT = cvs.savannah.gnu.org:/web
-
-web-manual:
- $(AM_V_at)rm -rf $(web_manual_dir)
- $(AM_V_GEN)address@hidden \
- && rm -rf $$tmp \
- && mkdir $$tmp \
- && $(am__cd) $$tmp \
- && GENDOCS_TEMPLATE_DIR='$(abs_srcdir)/lib' \
- && export GENDOCS_TEMPLATE_DIR \
-## Needed to pacify extra checks from gendocs.sh.
- && $(LN_S) '$(abs_srcdir)/doc/$(PACKAGE).texi' . \
-## Try to respect silent rules.
- && if $(AM_V_P); then :; else exec >/dev/null 2>&1; fi \
-## Finally generate the manual in several formats.
- && $(SHELL) '$(abs_srcdir)/lib/gendocs.sh' \
- -I '$(abs_srcdir)/doc' --email $(PACKAGE_BUGREPORT) \
- $(PACKAGE) '$(PACKAGE_NAME)'
- $(AM_V_at)address@hidden \
- && mkdir $(web_manual_dir) \
- && mv -f $$tmp/manual/* $(web_manual_dir) \
- && rm -rf $$tmp \
- && { ! $(AM_V_P) || ls -l $(web_manual_dir); }
-.PHONY: web-manual
-
-web-manual-update:
- $(AM_V_at)fatal () { echo "$@: $$*" >&2; exit 1; }; \
- $(determine_release_type); \
- case $$release_type in \
- [Mm]ajor\ release|[Mm]inor\ release);; \
- *) echo "Cannot upload manuals from a \"$$release_type\"" >&2; \
- exit 1;; \
- esac
- $(AM_V_at)test -f $(web_manual_dir)/$(PACKAGE).html || { \
- echo 'You have to run "$(MAKE) web-manuals" before' \
- 'invoking "$(MAKE) $@"' >&2; \
- exit 1; \
- }
- $(AM_V_GEN): \
- && CVS_RSH=ssh && export CVS_RSH=ssh \
- && address@hidden \
- && rm -rf $$tmp \
- && mkdir $$tmp \
- && $(am__cd) $$tmp \
- && $(CVS) -z3 -d :ext:$(CVS_USER)@$(WEBCVS_ROOT)/$(PACKAGE) \
- co $(PACKAGE) \
- && cd .. \
-## According to the rsync manpage, "a trailing slash on the source [...]
-## avoids creating an additional directory level at the destination".
-## So the trailing '/' after '$(web_manual_dir)' below is intended.
- && $(RSYNC) -avP $(web_manual_dir)/ $$tmp/$(PACKAGE)/manual \
- && ( \
- cd $$tmp/$(PACKAGE)/manual \
- && new_files=`$(CVSU) --types='?'` \
- && new_files=`echo "$$new_files" | sed s/^..//` \
- && { test -z "$$new_files" || $(CVS) add -ko $$new_files; } \
- && $(CVS) ci -m $(VERSION) \
- ) \
- && rm -rf $$tmp
-.PHONY: web-manual-update
-
-clean-web-manual:
- $(AM_V_at)rm -rf $(web_manual_dir)
-.PHONY: clean-web-manual
-clean-local: clean-web-manual
-
-EXTRA_DIST += lib/gendocs.sh lib/gendocs_template
-
-## ------------------------------------------------ ##
-## Update copyright years of all committed files. ##
-## ------------------------------------------------ ##
-
-EXTRA_DIST += lib/update-copyright
-
-update_copyright_env = \
- UPDATE_COPYRIGHT_FORCE=1 \
- UPDATE_COPYRIGHT_USE_INTERVALS=2
-
-# In addition to the several README files, these as well are
-# not expected to have a copyright notice.
-files_without_copyright = \
- .autom4te.cfg \
- .git-log-fix \
- .gitattributes \
- .gitignore \
- INSTALL \
- COPYING \
- AUTHORS \
- THANKS \
- lib/INSTALL \
- lib/COPYING
-
-# This script is in the public domain.
-files_without_copyright += lib/mkinstalldirs
-
-# This script has an MIT-style license
-files_without_copyright += lib/install-sh
-
-.PHONY: update-copyright
-update-copyright:
- $(AM_V_GEN)set -e; \
- current_year=`date +%Y` && test -n "$$current_year" \
- || { echo "$@: cannot get current year" >&2; exit 1; }; \
- sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
- bootstrap.sh configure.ac; \
- excluded_re=`( \
- for url in $(FETCHFILES); do echo "$$url"; done \
- | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \
- && for f in $(files_without_copyright); do echo $$f; done \
- ) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
- $(GIT) ls-files \
- | grep -Ev '(^|/)README$$' \
- | grep -Ev "^($$excluded_re)$$" \
- | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/lib/gnupload b/lib/gnupload
index 186d2ad..f6b999b 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2012-06-11.00; # UTC
+scriptversion=2012-12-11.16; # UTC
# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
@@ -242,6 +242,8 @@ fi
# Make sure passphrase is not exported in the environment.
unset passphrase
+unset passphrase_fd_0
+GNUPGHOME=${GNUPGHOME:-$HOME/.gnupg}
# Reset PATH to be sure that echo is a built-in. We will later use
# 'echo $passphrase' to output the passphrase, so it is important that
@@ -249,12 +251,13 @@ unset passphrase
# listings with their arguments...).
# Remember this script runs with 'set -e', so if echo is not built-in
# it will exit now.
-if $dry_run; then :; else
+if $dry_run || grep -q "^use-agent" $GNUPGHOME/gpg.conf; then :; else
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
read -r passphrase
stty echo
echo
+ passphrase_fd_0="--passphrase-fd 0"
fi
if test $# -ne 0; then
@@ -262,7 +265,7 @@ if test $# -ne 0; then
do
echo "Signing $file ..."
rm -f $file.sig
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 -ba -o $file.sig $file
done
fi
@@ -320,12 +323,12 @@ upload ()
case $dest in
alpha.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files
$base.directive.asc
;;
ftp.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
;;
savannah.gnu.org:*)
@@ -344,7 +347,7 @@ upload ()
destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'`
destdir_topdir=`echo "$destdir" | sed 's,/.*,,'`
mkdirective "$destdir_p1" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
for f in $files $base.directive.asc
do
echo put $f
@@ -353,7 +356,7 @@ upload ()
/*)
dest_host=`echo "$dest" | sed 's,:.*,,'`
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg cp $files $base.directive.asc $dest_host
;;
*)
diff --git a/maint.mk b/maint.mk
new file mode 100644
index 0000000..236ebc6
--- /dev/null
+++ b/maint.mk
@@ -0,0 +1,467 @@
+# Maintainer makefile rules for Automake.
+#
+# Copyright (C) 1995-2012 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 2, 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/>.
+
+# Avoid CDPATH issues.
+unexport CDPATH
+
+# --------------------------------------------------------- #
+# Automatic generation of the ChangeLog from git history. #
+# --------------------------------------------------------- #
+
+gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
+gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
+gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
+ --since='2011-12-28 00:00:00' \
+ --no-cluster --format '%s%n%n%b'
+
+EXTRA_DIST += lib/gitlog-to-changelog
+EXTRA_DIST += $(gitlog_to_changelog_fixes)
+
+# When executed from a git checkout, generate the ChangeLog from the git
+# history. When executed from an extracted distribution tarball, just
+# copy the distributed ChangeLog in the build directory (and if this
+# fails, or if no distributed ChangeLog file is present, complain and
+# give an error).
+#
+# The ChangeLog should be regenerated unconditionally when working from
+# checked-out sources; otherwise, if we're working from a distribution
+# tarball, we expect the ChangeLog to be distributed, so check that it
+# is indeed present in the source directory.
+ChangeLog:
+ $(AM_V_GEN)set -e; set -u; \
+ if test -d $(srcdir)/.git; then \
+ rm -f address@hidden \
+ && $(gitlog_to_changelog_command) \
+ $(gitlog_to_changelog_options) >address@hidden \
+ && chmod a-w address@hidden \
+ && mv -f address@hidden $@ \
+ || exit 1; \
+ elif test ! -f $(srcdir)/$@; then \
+ echo "Source tree is not a git checkout, and no pre-existent" \
+ "$@ file has been found there" >&2; \
+ exit 1; \
+ fi
+.PHONY: ChangeLog
+
+
+# --------------------------- #
+# Perl coverage statistics. #
+# --------------------------- #
+
+PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
+PERL_COVERAGE_FLAGS =
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
+PERL_COVER = cover
+
+check-coverage-run recheck-coverage-run: %-coverage-run: all
+ $(mkinstalldirs) $(PERL_COVERAGE_DB)
+ PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
+ WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
+ $(MAKE) $*
+
+check-coverage-report:
+ @if test ! -d "$(PERL_COVERAGE_DB)"; then \
+ echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \
+ echo "Please run \"make check-coverage\" first" >&2; \
+ exit 1; \
+ fi
+ $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)"
+
+# We don't use direct dependencies here because we'd like to be able
+# to invoke the report even after interrupted check-coverage.
+check-coverage: check-coverage-run
+ $(MAKE) check-coverage-report
+
+recheck-coverage: recheck-coverage-run
+ $(MAKE) check-coverage-report
+
+clean-coverage:
+ rm -rf "$(PERL_COVERAGE_DB)"
+clean-local: clean-coverage
+
+.PHONY: check-coverage recheck-coverage check-coverage-run \
+ recheck-coverage-run check-coverage-report clean-coverage
+
+
+# ---------------------------------------------------- #
+# Tagging and/or uploading stable and beta releases. #
+# ---------------------------------------------------- #
+
+GIT = git
+
+EXTRA_DIST += lib/gnupload
+
+base_version_rx = ^[1-9][0-9]*\.[0-9][0-9]*
+stable_major_version_rx = $(base_version_rx)$$
+stable_minor_version_rx = $(base_version_rx)\.[0-9][0-9]*$$
+beta_version_rx = $(base_version_rx)(\.[0-9][0-9]*)?[bdfhjlnprtvxz]$$
+match_version = echo "$(VERSION)" | $(EGREP) >/dev/null
+
+# Check that we don't have uncommitted or unstaged changes.
+# TODO: Maybe the git suite already offers a shortcut to verify if the
+# TODO: working directory is "clean" or not? If yes, use that instead
+# TODO: of duplicating the logic here.
+git_must_have_clean_workdir = \
+ $(GIT) rev-parse --verify HEAD >/dev/null \
+ && $(GIT) update-index -q --refresh \
+ && $(GIT) diff-files --quiet \
+ && $(GIT) diff-index --quiet --cached HEAD \
+ || { echo "$@: you have uncommitted or unstaged changes" >&2; exit 1; }
+
+determine_release_type = \
+ if $(match_version) '$(stable_major_version_rx)'; then \
+ release_type='Major release'; \
+ announcement_type='major release'; \
+ dest=ftp; \
+ elif $(match_version) '$(stable_minor_version_rx)'; then \
+ release_type='Minor release'; \
+ announcement_type='maintenance release'; \
+ dest=ftp; \
+ elif $(match_version) '$(beta_version_rx)'; then \
+ release_type='Beta release'; \
+ announcement_type='test release'; \
+ dest=alpha; \
+ else \
+ echo "$@: invalid version '$(VERSION)' for a release" >&2; \
+ exit 1; \
+ fi
+
+# Help the debugging of $(determine_release_type) and related code.
+print-release-type:
+ @$(determine_release_type); \
+ echo "$$release_type $(VERSION);" \
+ "it will be announced as a $$announcement_type"
+
+git-tag-release: maintainer-check
+ @set -e -u; \
+ case '$(AM_TAG_DRYRUN)' in \
+ ""|[nN]|[nN]o|NO) run="";; \
+ *) run="echo Running:";; \
+ esac; \
+ $(determine_release_type); \
+ $(git_must_have_clean_workdir); \
+ $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
+
+git-upload-release:
+ @# Check this a version we can cut a release release from the
+ @# current repository: we must have a beta version, and the
+ @# repository must be clean.
+ @$(determine_release_type)
+ @$(git_must_have_clean_workdir)
+ @# Check that we are releasing from a valid tag.
+ tag=`$(GIT) describe` \
+ && case $$tag in "v$(VERSION)") true;; *) false;; esac \
+ || { echo "$@: you can only create a release from a tagged" \
+ "version" >&2; \
+ exit 1; }
+ @# Build the distribution tarball(s).
+ $(MAKE) dist
+ @# Upload it to the correct FTP repository.
+ @$(determine_release_type) \
+ && dest=$$dest.gnu.org:automake \
+ && echo "Will upload to $$dest: $(DIST_ARCHIVES)" \
+ && $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest \
+ $(DIST_ARCHIVES)
+
+.PHONY: print-release-type git-upload-release git-tag-release
+
+
+# ------------------------------------------------------------------ #
+# Explore differences of autogenerated files in different commits. #
+# ------------------------------------------------------------------ #
+
+# Visually comparing differences between the Makefile.in files in
+# automake's own build system as generated in two different branches
+# might help to catch bugs and blunders. This has already happened a
+# few times in the past, when we used to version-control Makefile.in.
+autodiffs:
+ @set -u; \
+ NEW_COMMIT=$${NEW_COMMIT-"HEAD"}; \
+ OLD_COMMIT=$${OLD_COMMIT-"HEAD~1"}; \
+ am_gitdir='$(abs_top_srcdir)/.git'; \
+ get_autofiles_from_rev () \
+ { \
+ rev=$$1 dir=$$2 \
+ && echo "$@: will get files from revision $$rev" \
+ && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
+ && cd tmp \
+ && $(GIT) checkout -q "$$rev" \
+ && echo "$@: bootstrapping $$rev" \
+ && $(SHELL) ./bootstrap.sh \
+ && echo "$@: copying files from $$rev" \
+ && makefile_ins=`find . -name Makefile.in` \
+ && (tar cf - configure aclocal.m4 $$makefile_ins) | \
+ (cd .. && cd "$$dir" && tar xf -) \
+ && cd .. \
+ && rm -rf tmp; \
+ }; \
+ address@hidden \
+ && : Before proceeding, ensure the specified revisions truly exist. \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
+ && rm -rf $$outdir \
+ && mkdir $$outdir \
+ && cd $$outdir \
+ && mkdir new old \
+ && get_autofiles_from_rev $$OLD_COMMIT old \
+ && get_autofiles_from_rev $$NEW_COMMIT new \
+ && exit 0
+
+# With lots of eye candy; we like our developers pampered and spoiled :-)
+compare-autodiffs: autodiffs
+ @set -u; \
+ : $${COLORDIFF=colordiff} $${DIFF=diff}; \
+ dir=autodiffs.dir; \
+ if test ! -d "$$dir"; then \
+ echo "$@: $$dir: Not a directory" >&2; \
+ exit 1; \
+ fi; \
+ mydiff=false mypager=false; \
+ if test -t 1; then \
+ if ($$COLORDIFF -r . .) </dev/null >/dev/null 2>&1; then \
+ mydiff=$$COLORDIFF; \
+ mypager="less -R"; \
+ else \
+ mypager=less; \
+ fi; \
+ else \
+ mypager=cat; \
+ fi; \
+ if test "$$mydiff" = false; then \
+ if ($$DIFF -r -u . .); then \
+ mydiff=$$DIFF; \
+ else \
+ echo "$@: no good-enough diff program specified" >&2; \
+ exit 1; \
+ fi; \
+ fi; \
+ st=0; $$mydiff -r -u $$dir/old $$dir/new | $$mypager || st=$$?; \
+ rm -rf $$dir; \
+ exit $$st
+.PHONY: autodiffs compare-autodiffs
+
+# ---------------------------------------------- #
+# Help writing the announcement for a release. #
+# ---------------------------------------------- #
+
+PACKAGE_MAILINGLIST = address@hidden
+
+announcement: NEWS
+ $(AM_V_GEN): \
+ && rm -f $@ address@hidden \
+ && $(determine_release_type) \
+ && ftp_base="ftp://$$dest.gnu.org/gnu/$(PACKAGE)" \
+ && X () { printf '%s\n' "$$*" >> address@hidden; } \
+ && X "We are pleased to announce the $(PACKAGE_NAME) $(VERSION)" \
+ "$$announcement_type." \
+ && X \
+ && X "**TODO** Brief description of the release here." \
+ && X \
+ && X "**TODO** This description can span multiple paragraphs." \
+ && X \
+ && X "See below for the detailed list of changes since the" \
+ && X "previous version, as summarized by the NEWS file." \
+ && X \
+ && X "Download here:" \
+ && X \
+ && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.gz" \
+ && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.xz" \
+ && X \
+ && X "Please report bugs and problems to" \
+ "<$(PACKAGE_BUGREPORT)>," \
+ && X "and send general comments and feedback to" \
+ "<$(PACKAGE_MAILINGLIST)>." \
+ && X \
+ && X "Thanks to everyone who has reported problems, contributed" \
+ && X "patches, and helped testing Automake!" \
+ && X \
+ && X "-*-*-*-" \
+ && X \
+ && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> address@hidden \
+ && mv -f address@hidden $@
+.PHONY: announcement
+CLEANFILES += announcement
+
+# --------------------------------------------------------------------- #
+# Synchronize third-party files that are committed in our repository. #
+# --------------------------------------------------------------------- #
+
+# Program to use to fetch files.
+WGET = wget
+
+# Some repositories we sync files from.
+SV_CVS = 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/'
+SV_GIT_CF =
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
+SV_GIT_AC =
'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
+SV_GIT_GL =
'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
+
+# Files that we fetch and which we compare against.
+# Note that the 'lib/COPYING' file must still be synced by hand.
+FETCHFILES = \
+ $(SV_GIT_CF)config.guess \
+ $(SV_GIT_CF)config.sub \
+ $(SV_CVS)texinfo/texinfo/doc/texinfo.tex \
+ $(SV_CVS)texinfo/texinfo/util/gendocs.sh \
+ $(SV_CVS)texinfo/texinfo/util/gendocs_template \
+ $(SV_GIT_GL)build-aux/gitlog-to-changelog \
+ $(SV_GIT_GL)build-aux/gnupload \
+ $(SV_GIT_GL)build-aux/update-copyright \
+ $(SV_GIT_GL)doc/INSTALL
+
+# Fetch the latest versions of few scripts and files we care about.
+# A retrieval failure or a copying failure usually mean serious problems,
+# so we'll just bail out if 'wget' or 'cp' fail.
+fetch:
+ $(AM_V_at)rm -rf Fetchdir
+ $(AM_V_at)mkdir Fetchdir
+ $(AM_V_GEN)set -e; \
+ if $(AM_V_P); then wget_opts=; else wget_opts=-nv; fi; \
+ for url in $(FETCHFILES); do \
+ file=`printf '%s\n' "$$url" | sed 's|^.*/||; s|^.*=||'`; \
+ $(WGET) $$wget_opts "$$url" -O Fetchdir/$$file || exit 1; \
+ if cmp Fetchdir/$$file $(srcdir)/lib/$$file >/dev/null; then \
+ : Nothing to do; \
+ else \
+ echo "$@: updating file $$file"; \
+ cp Fetchdir/$$file $(srcdir)/lib/$$file || exit 1; \
+ fi; \
+ done
+ $(AM_V_at)rm -rf Fetchdir
+.PHONY: fetch
+
+# ---------------------------------------------------------------------- #
+# Generate and upload manuals in several formats, for the GNU website. #
+# ---------------------------------------------------------------------- #
+
+web_manual_dir = doc/web-manual
+
+RSYNC = rsync
+CVS = cvs
+CVSU = cvsu
+CVS_USER = $${USER}
+WEBCVS_ROOT = cvs.savannah.gnu.org:/web
+CVS_RSH = ssh
+export CVS_RSH
+
+.PHONY: web-manual web-manual-update
+web-manual web-manual-update: t = address@hidden
+
+# Build manual in several formats. Note to the recipe:
+# 1. The symlinking of automake.texi into the temporary directory is
+# required to pacify extra checks from gendocs.sh.
+# 2. The redirection to /dev/null before the invocation of gendocs.sh
+# is done to better respect silent rules.
+web-manual:
+ $(AM_V_at)rm -rf $(web_manual_dir) $t
+ $(AM_V_at)mkdir $t
+ $(AM_V_at)$(LN_S) '$(abs_srcdir)/doc/$(PACKAGE).texi' '$t/'
+ $(AM_V_GEN)cd $t \
+ && GENDOCS_TEMPLATE_DIR='$(abs_srcdir)/lib' \
+ && export GENDOCS_TEMPLATE_DIR \
+ && if $(AM_V_P); then :; else exec >/dev/null 2>&1; fi \
+ && $(SHELL) '$(abs_srcdir)/lib/gendocs.sh' \
+ -I '$(abs_srcdir)/doc' --email $(PACKAGE_BUGREPORT) \
+ $(PACKAGE) '$(PACKAGE_NAME)'
+ $(AM_V_at)mkdir $(web_manual_dir)
+ $(AM_V_at)mv -f $t/manual/* $(web_manual_dir)
+ $(AM_V_at)rm -rf $t
+ @! $(AM_V_P) || ls -l $(web_manual_dir)
+
+# Upload manual to www.gnu.org, using CVS (sigh!)
+web-manual-update:
+ $(AM_V_at)$(determine_release_type); \
+ case $$release_type in \
+ [Mm]ajor\ release|[Mm]inor\ release);; \
+ *) echo "Cannot upload manuals from a \"$$release_type\"" >&2; \
+ exit 1;; \
+ esac
+ $(AM_V_at)test -f $(web_manual_dir)/$(PACKAGE).html || { \
+ echo 'You have to run "$(MAKE) web-manuals" before' \
+ 'invoking "$(MAKE) $@"' >&2; \
+ exit 1; \
+ }
+ $(AM_V_at)rm -rf $t
+ $(AM_V_at)mkdir $t
+ $(AM_V_at)cd $t \
+ && $(CVS) -z3 -d :ext:$(CVS_USER)@$(WEBCVS_ROOT)/$(PACKAGE) \
+ co $(PACKAGE)
+ @# According to the rsync manpage, "a trailing slash on the
+ @# source [...] avoids creating an additional directory
+ @# level at the destination". So the trailing '/' after
+ @# '$(web_manual_dir)' below is intended.
+ $(AM_V_at)$(RSYNC) -avP $(web_manual_dir)/ $t/$(PACKAGE)/manual
+ $(AM_V_GEN): \
+ && cd $t/$(PACKAGE)/manual \
+ && new_files=`$(CVSU) --types='?'` \
+ && new_files=`echo "$$new_files" | sed s/^..//` \
+ && { test -z "$$new_files" || $(CVS) add -ko $$new_files; } \
+ && $(CVS) ci -m $(VERSION)
+ $(AM_V_at)rm -rf $t
+.PHONY: web-manual-update
+
+clean-web-manual:
+ $(AM_V_at)rm -rf $(web_manual_dir)
+.PHONY: clean-web-manual
+clean-local: clean-web-manual
+
+EXTRA_DIST += lib/gendocs.sh lib/gendocs_template
+
+# ------------------------------------------------ #
+# Update copyright years of all committed files. #
+# ------------------------------------------------ #
+
+EXTRA_DIST += lib/update-copyright
+
+update_copyright_env = \
+ UPDATE_COPYRIGHT_FORCE=1 \
+ UPDATE_COPYRIGHT_USE_INTERVALS=2
+
+# In addition to the several README files, these as well are
+# not expected to have a copyright notice.
+files_without_copyright = \
+ .autom4te.cfg \
+ .git-log-fix \
+ .gitattributes \
+ .gitignore \
+ INSTALL \
+ COPYING \
+ AUTHORS \
+ THANKS \
+ lib/INSTALL \
+ lib/COPYING
+
+# This script is in the public domain.
+files_without_copyright += lib/mkinstalldirs
+
+# This script has an MIT-style license
+files_without_copyright += lib/install-sh
+
+.PHONY: update-copyright
+update-copyright:
+ $(AM_V_GEN)set -e; \
+ current_year=`date +%Y` && test -n "$$current_year" \
+ || { echo "$@: cannot get current year" >&2; exit 1; }; \
+ sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
+ bootstrap.sh configure.ac; \
+ excluded_re=`( \
+ for url in $(FETCHFILES); do echo "$$url"; done \
+ | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \
+ && for f in $(files_without_copyright); do echo $$f; done \
+ ) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
+ $(GIT) ls-files \
+ | grep -Ev '(^|/)README$$' \
+ | grep -Ev "^($$excluded_re)$$" \
+ | $(update_copyright_env) xargs $(srcdir)/lib/$@
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.5-273-gb8c7e3f,
Stefano Lattarini <=