X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/32f0598d06d317a776da36103449127e7693983d..831d3c996da55ab855e97d72611f3685f36a4eee:/Makefile.maint diff --git a/Makefile.maint b/Makefile.maint index bd6072d4..83efdf30 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -2,7 +2,7 @@ # This Makefile fragment is shared between fileutils, sh-utils, textutils, # CPPI, Bison, and Autoconf. -## Copyright 2001 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002 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 @@ -43,101 +43,42 @@ release_archive_dir ?= ../release -## ---------------- ## -## Updating files. ## -## ---------------- ## - -WGET = wget -ftp-gnu = ftp://ftp.gnu.org/gnu - -# Use mv, if you don't have/want move-if-change. -move_if_change ?= move-if-change - -# ------------------- # -# Updating PO files. # -# ------------------- # - -po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE) -.PHONY: do-po-update po-update -do-po-update: - tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\ - rm -rf $$tmppo && \ - mkdir $$tmppo && \ - (cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\ - cp $$tmppo/*.po po - cd po && $(MAKE) update-po - $(MAKE) po-check - -po-update: - if test -d "po"; then \ - $(MAKE) do-po-update; \ - fi - -# -------------------------- # -# Updating GNU build tools. # -# -------------------------- # - -# The following pseudo table associates a local directory and a URL -# with each of the files that belongs to some other package and is -# regularly updated from the specified URL. -wget_files ?= $(srcdir)/config.guess $(srcdir)/config.sub \ - $(srcdir)/src/ansi2knr.c \ - $(srcdir)/doc/texinfo.tex -wget-targets = $(patsubst %, get-%, $(wget_files)) - -config.guess-url_prefix = $(ftp-gnu)/config/ -config.sub-url_prefix = $(ftp-gnu)/config/ - -ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/ - -texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/ - -standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/ -make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/ - -target = $(patsubst get-%, %, $@) -url = $($(notdir $(target))-url_prefix)$(notdir $(target)) - -.PHONY: $(wget-targets) -$(wget-targets): - $(WGET) $(url) -O $(target).t \ - && $(move_if_change) $(target).t $(target) - -.PHONY: wget-update -wget-update: $(wget-targets) - - -# Updating tools via CVS. -cvs_files ?= depcomp missing -cvs-targets = $(patsubst %, get-%, $(cvs_files)) - -automake_repo = :pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake -.PHONY: $(cvs-targets) -$(cvs-targets): - $(CVS) -d $(automake_repo) co -p automake/lib/$(notdir $(target)) \ - >$(target).t \ - && $(move_if_change) $(target).t $(target); - -.PHONY: cvs-update -cvs-update: $(cvs-targets) - - -# --------------------- # -# Updating everything. # -# --------------------- # - -.PHONY: update -update: wget-update cvs-update po-update - - - ## --------------- ## ## Sanity checks. ## ## --------------- ## -# Checks that don't require cvs. Run `changelog-check' last as -# previous test may reveal problems requiring new ChangeLog entries. -local-check: po-check copyright-check writable-files changelog-check +# Checks that don't require cvs. +# Run `changelog-check' last, as previous test may reveal problems requiring +# new ChangeLog entries. +local-check = \ + po-check copyright-check writable-files m4-check author_mark_check \ + changelog-check strftime-check header-check +.PHONY: $(local-check) + +# Make sure C source files in src/ don't include xalloc.h directly, +# since they all already include it via sys2.h. +# It's not a big deal -- just aesthetics. +header-check: + if test -f $(srcdir)/src/sys2.h; then \ + if grep 'xalloc\.h' $(srcdir)/src/*.c; then \ + exit 1; \ + fi; \ + fi + +# Ensure that date's --help output stays in sync with the info +# documentation for GNU strftime. The only exception is %N, +# which date accepts but GNU strftime does not. +extract_char = sed 's/^[^%][^%]*%\(.\).*/\1/' +strftime-check: + if test -f $(srcdir)/src/date.c; then \ + grep '^ %. ' $(srcdir)/src/date.c | sort \ + | $(extract_char) > $@-src; \ + { echo N; \ + info libc date calendar format | grep '^ `%.'\' \ + | $(extract_char); } | sort > $@-info; \ + diff -u $@-src $@-info || exit 1; \ + rm -f $@-src $@-info; \ + fi changelog-check: if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \ @@ -147,15 +88,37 @@ changelog-check: exit 1; \ fi +m4-check: + @grep 'AC_DEFUN([^[]' m4/*.m4 \ + && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \ + exit 1; } || : + # Verify that all source files using _() are listed in po/POTFILES.in. po-check: if test -f po/POTFILES.in; then \ grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1; \ - grep -E -l '\b_\(' lib/*.c src/*.c | sort > $@-2; \ + files=; \ + for file in lib/*.[chly] src/*.[chly]; do \ + case $$file in \ + *.[ch]) \ + base=`expr " $$file" : ' \(.*\)\..'`; \ + { test -f $$base.l || test -f $$base.y; } && continue;; \ + esac; \ + files="$$files $$file"; \ + done; \ + grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2; \ diff -u $@-1 $@-2 || exit 1; \ rm -f $@-1 $@-2; \ fi +# In a definition of #define AUTHORS "... and ..." where the RHS contains +# the English word `and', the string must be marked with `N_ (...)' so that +# gettext recognizes it as a string requiring translation. +author_mark_check: + @grep '^# *define AUTHORS "[^"]* and ' src/*.c |grep -v ' N_ (' && \ + { echo 'Makefile.maint: enclose the above strings in N_ (...)' 1>&2; \ + exit 1; } || : + # Check that `make alpha' will not fail at the end of the process. writable-files: if test -d $(release_archive_dir); then :; else \ @@ -170,12 +133,14 @@ writable-files: done; \ test "$$fail" && exit 1 || : -# Make sure that the copyright date in lib/version-etc.c is up to date. +v_etc_file = lib/version-etc.c +# Make sure that the copyright date in $(v_etc_file) is up to date. copyright-check: - @if test -f lib/version-etc.c; then \ - grep 'N_("Copyright (C) $(shell date +%Y) Free' lib/version-etc.c \ + @if test -f $(v_etc_file); then \ + grep '"Copyright (C) $(shell date +%Y) Free' $(v_etc_file) \ >/dev/null \ - || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }; \ + || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \ + exit 1; }; \ fi @@ -203,16 +168,10 @@ maintainer-distcheck: changelog-check $(MAKE) my-distcheck - -## -------------- ## -## Making dists. ## -## -------------- ## - - # 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: local-check cvs-check maintainer-distcheck +cvs-dist: $(local-check) cvs-check maintainer-distcheck $(CVS) update po $(CVS) tag -c $(this-cvs-tag) $(MAKE) dist @@ -222,7 +181,6 @@ cvs-dist: local-check cvs-check maintainer-distcheck null_AM_MAKEFLAGS = \ ACLOCAL=false \ AUTOCONF=false \ - AUTOM4TE=false \ AUTOMAKE=false \ AUTOHEADER=false \ MAKEINFO=false @@ -232,7 +190,7 @@ null_AM_MAKEFLAGS = \ # and building with CFLAGS='-Wformat -Werror' causes any format warning to be # treated as a failure. t=./=test -my-distcheck: writable-files po-check +my-distcheck: $(local-check) -rm -rf $(t) mkdir $(t) GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz @@ -266,7 +224,7 @@ rel-check: md5_tmp=/tmp/rel-check-md5-$$$$; \ set -e; \ trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \ - $(WGET) -q --output-document=$$tarz $(url); \ + wget -q --output-document=$$tarz $(url); \ echo "$(md5) -" > $$md5_tmp; \ md5sum -c $$md5_tmp < $$tarz @@ -315,6 +273,94 @@ announcement: NEWS ChangeLog $(rel-files) -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \ ) + +## ---------------- ## +## Updating files. ## +## ---------------- ## + +WGET = wget +ftp-gnu = ftp://ftp.gnu.org/gnu + +# Use mv, if you don't have/want move-if-change. +move_if_change ?= move-if-change + + +# --------------------- # +# Updating everything. # +# --------------------- # + +.PHONY: update +local_updates ?= wget-update cvs-update po-update +update: $(local_updates) + + +# ------------------- # +# Updating PO files. # +# ------------------- # + +po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE) +.PHONY: do-po-update po-update +do-po-update: + tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\ + rm -rf $$tmppo && \ + mkdir $$tmppo && \ + (cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\ + cp $$tmppo/*.po po + cd po && $(MAKE) update-po + $(MAKE) po-check + +po-update: + if test -d "po"; then \ + $(MAKE) do-po-update; \ + fi + +# -------------------------- # +# Updating GNU build tools. # +# -------------------------- # + +# The following pseudo table associates a local directory and a URL +# with each of the files that belongs to some other package and is +# regularly updated from the specified URL. +wget_files ?= $(srcdir)/config/config.guess \ + $(srcdir)/config/config.sub \ + $(srcdir)/src/ansi2knr.c \ + $(srcdir)/config/texinfo.tex +get-targets = $(patsubst %, get-%, $(wget_files)) + +config.guess-url_prefix = $(ftp-gnu)/config/ +config.sub-url_prefix = $(ftp-gnu)/config/ + +ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/ + +texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/ + +standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/ +make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/ + +target = $(patsubst get-%, %, $@) +url = $($(notdir $(target))-url_prefix)$(notdir $(target)) + +.PHONY: $(get-targets) +$(get-targets): + $(WGET) $(url) -O $(target).t \ + && $(move_if_change) $(target).t $(target) + +cvs_files ?= $(srcdir)/config/depcomp $(srcdir)/config/missing $(srcdir)/config/mkinstalldirs \ + $(srcdir)/config/install-sh $(srcdir)/src/ansi2knr.c +automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake +.PHONY: wget-update +wget-update: $(get-targets) + +.PHONY: cvs-update +cvs-update: + for f in $(cvs_files); do \ + test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \ + file=$$(basename $$f); \ + echo checking out $$file...; \ + $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t \ + && $(move_if_change) $$f.t $$f; \ + done + define emit-upload-commands echo ===================================== echo ===================================== @@ -327,7 +373,7 @@ endef $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz xdelta delta -9 $^ $@ || : -alpha: +alpha: $(local-check) $(MAKE) cvs-dist $(MAKE) $(xd-delta) $(MAKE) -s announcement > /tmp/announce-$(my_distdir)