* Makefile.maint (CVS): New.

(local-check): Run changelog-check. last.
(alpha): Don't depend upon local-check, since...
(cvs-dist): depends upon it.
This commit is contained in:
Akim Demaille 2001-08-15 11:43:28 +00:00
parent d98a887d5a
commit a12256cf8f
2 changed files with 28 additions and 17 deletions

View File

@ -1,3 +1,10 @@
2001-08-15 Akim Demaille <akim@epita.fr>
* Makefile.maint (CVS): New.
(local-check): Run changelog-check. last.
(alpha): Don't depend upon local-check, since...
(cvs-dist): depends upon it.
2001-08-15 Tim Van Holder <tim.van.holder@pandora.be>
* tests/Makefile.am: Use a clean-local rule to remove

View File

@ -1,6 +1,6 @@
# -*-Makefile-*-
# This Makefile fragment is shared between fileutils, sh-utils, textutils,
# and Autoconf.
# CPPI, Bison, and Autoconf.
## Copyright 2001 Free Software Foundation, Inc.
##
@ -19,6 +19,14 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
# Do not save the original name or timestamp in the .tar.gz file.
GZIP_ENV = '--no-name --best'
# Automake 1.4 does not define AMTAR.
AMTAR ?= $(TAR)
CVS = cvs
prev_version_file ?= .prev-version
THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
@ -43,7 +51,9 @@ release_archive_dir ?= ../release
## --------------- ##
# Checks that don't require cvs.
local-check: changelog-check po-check writable-files copyright-check
# Run `changelog-check' as previous test may reveal problems requiring
# new ChangeLog entries.
local-check: po-check copyright-check writable-files changelog-check
changelog-check:
if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
@ -88,13 +98,13 @@ copyright-check:
# Sanity checks with the CVS repository.
cvs-tag-check:
echo $(this-cvs-tag); \
if cvs -n log -h README | grep -e $(this-cvs-tag): >/dev/null; then \
if $(CVS) -n log -h README | grep -e $(this-cvs-tag): >/dev/null; then \
echo "$(this-cvs-tag) as already been used; not tagging" 1>&2; \
exit 1; \
else :; fi
cvs-diff-check:
if cvs diff >cvs-diffs; then \
if $(CVS) diff >cvs-diffs; then \
rm cvs-diffs; \
else \
echo "Some files are locally modified:" 1>&2; \
@ -109,18 +119,12 @@ maintainer-distcheck: changelog-check
$(MAKE) my-distcheck
# Do not save the original name or timestamp in the .tar.gz file.
GZIP_ENV = '--no-name --best'
# Automake 1.4 does not define AMTAR.
AMTAR ?= $(TAR)
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
# FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
cvs-dist: cvs-check maintainer-distcheck
cvs update po
cvs tag -c $(this-cvs-tag)
cvs-dist: local-check cvs-check maintainer-distcheck
$(CVS) update po
$(CVS) tag -c $(this-cvs-tag)
$(MAKE) dist
# Use this to make sure we don't run these programs when building
@ -220,7 +224,7 @@ announcement: NEWS ChangeLog $(rel-files)
echo; \
echo ChangeLog entries:; \
find . -name ChangeLog -maxdepth 2 \
| xargs cvs diff -up -r$(prev-cvs-tag) -rHEAD \
| xargs $(CVS) diff -up -r$(prev-cvs-tag) -rHEAD \
| sed -n 's/^+//p' \
| perl -ne 'm!^\+\+ (\./)?! or print,next;' \
-e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
@ -264,7 +268,7 @@ wget-update: $(get-targets)
for f in depcomp missing; do \
test -f $$f || continue; \
echo checking out $$f...; \
cvs -d $(automake_repo) co -p automake/lib/$$f > $$f.t \
$(CVS) -d $(automake_repo) co -p automake/lib/$$f > $$f.t \
&& $(move_if_change) $$f.t $$f; \
done
@ -282,12 +286,12 @@ endef
$(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
xdelta delta -9 $^ $@ || :
alpha: local-check
alpha:
$(MAKE) cvs-dist
$(MAKE) $(xd-delta)
$(MAKE) -s announcement > /tmp/announce-$(my_distdir)
ln $(rel-files) $(release_archive_dir)
chmod a-w $(rel-files)
echo $(VERSION) > $(prev_version_file)
cvs ci -m. $(prev_version_file)
$(CVS) ci -m. $(prev_version_file)
@$(emit-rsync-commands)