[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Update several administrative files mainly to facilitate rel
|
From: |
Joel E. Denny |
|
Subject: |
Re: [PATCH] Update several administrative files mainly to facilitate releasing. |
|
Date: |
Tue, 21 Oct 2008 10:54:40 -0400 (EDT) |
As far as I can tell, this message was never delivered, so I'm resending.
On Sat, 18 Oct 2008, Joel E. Denny wrote:
> I pushed this.
>
> >From 548e2104e2a7f8f751054f72098227dd323ec861 Mon Sep 17 00:00:00 2001
> From: Joel E. Denny <address@hidden>
> Date: Sat, 18 Oct 2008 12:17:35 -0400
> Subject: [PATCH] Update several administrative files mainly to facilitate
> releasing.
>
> * HACKING (Administrivia): Make the git-merge-changelog notes more
> helpful.
> (Test suite): Don't say lalr1.cc is not exercised in the test suite.
> (Release Procedure): Update for git and add numerous details that were
> previously missing.
> * Makefile.am (EXTRA_DIST): Remove Makefile.cfg and Makefile.maint.
> * maint.mk (announcement): Don't list bison as a bootstrap tool so
> that announcements don't claim we bootstrapped with whatever bison
> happened to be in PATH. Add flex as a bootstrap tool.
> * Makefile.maint: Remove, previously replaced by maint.mk.
> * Makefile.cfg: Remove, and migrate settings to...
> * cfg.mk: ... here for the sake of `make announcement'.
> * bootstrap.conf (gnulib_modules): Add announce-gen.
> * README: Say GNU Bison instead of just Bison. Suggested by Karl
> Berry.
>
> diff --git a/HACKING b/HACKING
> index c2a790e..091ba66 100644
> --- a/HACKING
> +++ b/HACKING
> @@ -25,9 +25,14 @@ The correct response to most actual bugs is to write a new
> test case
> which demonstrates the bug. Then fix the bug, re-run the test suite,
> and check everything in.
>
> -** You may find it useful to install the git-merge-changelog merge driver.
> -See http://www.mail-archive.com/address@hidden/msg09699.html for
> -information on how to install it.
> +** You may find it useful to install the git-merge-changelog merge driver:
> +
> +
> http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
> +
> +When following the generic installation instructions there, keep in mind that
> +your clone of Bison's git repository already contains appropriate
> +.gitattributes files, and running Bison's bootstrap script will make the
> +necessary changes to .git/config.
>
>
> * Hacking
> @@ -75,8 +80,7 @@ release:
> - Change tests/atlocal/CFLAGS to add your preferred options. For
> instance, `-traditional' to check that the parsers are K&R. Note
> that it does not make sense for glr.c, which should be ANSI,
> - but currently is actually GNU C, nor for lalr1.cc, which anyway is
> - not exercised yet in the test suite.
> + but currently is actually GNU C, nor for lalr1.cc.
>
>
> * Release Procedure
> @@ -93,35 +97,83 @@ This covers PO files too. Sometimes a PO file contains
> problems that
> causes it to be rejected by recent Gettext releases; please report
> these to the Translation Project.
>
> +** Update README
> +Make sure the information in this file is current. Most notably, make sure
> it
> +recommends a version of GNU M4 that is compatible with the latest Bison
> +sources.
> +
> ** Update NEWS
> The version number, *and* the date of the release (including for
> betas).
>
> ** Update ChangeLog
> Should have an entry similar to `Version 1.49b.'.
> -Check all this in once `make distcheck' passes.
> +
> +** Update configure.ac
> +Be sure PACKAGE_COPYRIGHT_YEAR is up-to-date.
> +
> +** Tag the release
> +Before Bison will build with the right version number, you must tag the
> release
> +in git. Do this after all other changes. The command is similar to:
> +
> + git tag -a v2.3b
> +
> +The log message can be simply:
> +
> + Bison 2.3b
> +
> +** Push
> +Once `make distcheck' passes, push your changes and the tag.
> +`git push' without arguments will not push the tag.
>
> ** make alpha
> +FIXME: `make alpha' is not maintained and is broken. These
> +instructions need to be replaced or removed.
> +
> Running `make alpha' is absolutely perfect for beta releases: it makes
> the tarballs, the xdeltas, and prepares (in /tmp/) a proto
> announcement. It is so neat, that that's what I use anyway for
> genuine releases, but adjusting things by hand (e.g., the urls in the
> announcement file, the ChangeLog which is not needed etc.).
> -FIXME: `make alpha' is not maintained and is broken. These
> -instructions need to be replaced or removed.
>
> If it fails, you're on your own...
>
> It requires GNU Make.
>
> ** Upload
> -Put the tarballs/xdeltas where they should be. Or put it somewhere,
> -and send the URL to address@hidden
> +The generic GNU upload procedure is at:
>
> -** Bump the version number
> -In configure.ac. Run `make', check this in.
> + http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
> +
> +After following the instructions there to register your information so you're
> +permitted to upload, here's a brief reminder of how to roll the tarballs and
> +upload them:
> +
> +*** make distcheck
> +*** gpg -b bison-2.3b.tar.gz
> +*** In a file named `bison-2.3b.tar.gz.directive', type:
> +
> + version: 1.1
> + directory: bison
> + filename: bison-2.3b.tar.gz
> +
> +*** gpg --clearsign bison-2.3b.tar.gz.directive
> +*** ftp ftp-upload.gnu.org # Log in as anonymous.
> +*** cd /incoming/alpha # cd /incoming/ftp for full release.
> +*** put bison-2.3b.tar.gz # This can take a while.
> +*** put bison-2.3b.tar.gz.sig
> +*** put bison-2.3b.tar.gz.directive.asc
> +*** Repeat all these steps for bison-2.3b.tar.bz2.
>
> ** Announce
> +To generate a template announcement file:
> +
> + make RELEASE_TYPE=alpha gpg_key_ID=F125BDF3 announcement
> +
> +where alpha can be replaced by beta or major and F125BDF3 should be replaced
> +with your key ID. For an example of how to fill out the template, search the
> +mailing list archives for the most recent release announcement.
> +
> Complete/fix the announcement file, and send it at least to
> address@hidden (if a real release, or a ``serious beta''),
> address@hidden, address@hidden, address@hidden,
> @@ -132,6 +184,14 @@ email to address@hidden Do not make any Cc as the
> moderator will
> throw away anything cross-posted or Cc'ed. It really needs to be a
> separate message.
>
> +** Bump the version number
> +In configure.ac. Run `make'. So that developers don't accidentally add new
> +items to the old NEWS entry, create a new empty NEWS entry something like:
> +
> + Changes in version ?.? (????-??-??):
> +
> +Push these changes.
> +
>
> -----
>
> diff --git a/Makefile.am b/Makefile.am
> index d987ee8..932c3bb 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -23,8 +23,7 @@ SUBDIRS = build-aux po runtime-po lib data src doc examples
> tests etc
> aclocaldir = @aclocaldir@
> aclocal_DATA = m4/bison-i18n.m4
>
> -EXTRA_DIST = .prev-version .version Makefile.cfg Makefile.maint \
> - cfg.mk maint.mk \
> +EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
> OChangeLog PACKAGING \
> djgpp/Makefile.maint djgpp/README.in djgpp/config.bat \
> djgpp/config.sed djgpp/config.site djgpp/config_h.sed \
> diff --git a/Makefile.cfg b/Makefile.cfg
> deleted file mode 100644
> index 8c52e91..0000000
> --- a/Makefile.cfg
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -# Customize Makefile.maint. -*- makefile -*-
> -# Copyright (C) 2003, 2005, 2006, 2007 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/>.
> -
> -# Use alpha.gnu.org for alpha and beta releases.
> -# Use ftp.gnu.org for major releases.
> -gnu_ftp_host-alpha = alpha.gnu.org
> -gnu_ftp_host-beta = alpha.gnu.org
> -gnu_ftp_host-major = ftp.gnu.org
> -gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
> -
> -url_dir_list = \
> - ftp://$(gnu_rel_host)/gnu/bison
> -
> -# Tests not to run as part of "make distcheck".
> -# Exclude changelog-check here so that there's less churn in ChangeLog
> -# files -- otherwise, you'd need to have the upcoming version number
> -# at the top of the file for each `make distcheck' run.
> -local-checks-to-skip = changelog-check
> -
> -# The local directory containing the checked-out copy of gnulib used in
> -# this release. Used solely to get a date for the "announcement" target.
> -gnulib_dir = /gnulib
> diff --git a/Makefile.maint b/Makefile.maint
> deleted file mode 100644
> index f20e2dd..0000000
> --- a/Makefile.maint
> +++ /dev/null
> @@ -1,637 +0,0 @@
> -# -*-Makefile-*-
> -# This Makefile fragment is shared between the coreutils,
> -# CPPI, Bison, and Autoconf.
> -
> -## Copyright (C) 2001-2006 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 is reported not to work with make-3.79.1
> -# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
> -ME := Makefile.maint
> -
> -# Do not save the original name or timestamp in the .tar.gz file.
> -# Use --rsyncable if available.
> -gzip_rsyncable = \
> - (gzip --help|grep rsyncable) >/dev/null 2>&1 && echo --rsyncable
> -GZIP_ENV = "--no-name --best `$(gzip_rsyncable)`"
> -
> -CVS = cvs
> -
> -# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/
> -CVS_LIST = sh -c ' \
> - if test -x $(srcdir)/build-aux/cvsu; then \
> - $(srcdir)/build-aux/cvsu --find --types=AFGM $$*; \
> - else \
> - awk -F/ '\''{ \
> - if (!$$1 && $$3 !~ /^-/) { \
> - f=FILENAME; \
> - sub(/CVS\/Entries/, "", f); \
> - print f $$2; \
> - }}'\'' \
> - $$(find $${*-*} -name Entries -print) /dev/null; \
> - fi \
> - ' dummy
> -
> -CVS_LIST_EXCEPT = \
> - $(CVS_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v
> ChangeLog; fi
> -
> -ifeq ($(origin prev_version_file), undefined)
> - prev_version_file = .prev-version
> -endif
> -
> -PREV_VERSION := $(shell cat $(prev_version_file))
> -VERSION_REGEXP = $(subst .,\.,$(VERSION))
> -
> -tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
> -tag-this-version = $(subst .,_,$(VERSION))
> -this-cvs-tag = $(tag-package)-$(tag-this-version)
> -my_distdir = $(PACKAGE)-$(VERSION)
> -
> -# Old releases are stored here.
> -# Used for diffs and xdeltas.
> -release_archive_dir ?= ../release
> -
> -# Prevent programs like 'sort' from considering distinct strings to be equal.
> -# Doing it here saves us from having to set LC_ALL elsewhere in this file.
> -export LC_ALL = C
> -
> -
> -
> -## --------------- ##
> -## Sanity checks. ##
> -## --------------- ##
> -
> -# FIXME: add a check to prohibit definition in src/*.c of symbols defined
> -# in system.h. E.g. today I removed from tail.c a useless definition of
> -# ENOSYS. It was useless because system.h ensures it's defined.
> -
> -# Checks that don't require cvs.
> -# Run `changelog-check' last, as previous test may reveal problems requiring
> -# new ChangeLog entries.
> -local-checks-available = \
> - po-check copyright-check writable-files m4-check author_mark_check \
> - changelog-check strftime-check $(syntax-check-rules) \
> - makefile_path_separator_check \
> - makefile-check
> -.PHONY: $(local-checks-available)
> -
> -local-check = $(filter-out $(local-checks-to-skip),
> $(local-checks-available))
> -
> -.PHONY: $(syntax-check-rules)
> -syntax-check-rules = \
> - sc_cast_of_argument_to_free \
> - sc_cast_of_x_alloc_return_value \
> - sc_cast_of_alloca_return_value \
> - sc_changelog \
> - sc_dd_max_sym_length \
> - sc_error_exit_success \
> - sc_file_system \
> - sc_no_if_have_config_h \
> - sc_obsolete_symbols \
> - sc_prohibit_atoi_atof \
> - sc_prohibit_jm_in_m4 \
> - sc_prohibit_assert_without_use \
> - sc_require_config_h \
> - sc_root_tests \
> - sc_space_tab \
> - sc_sun_os_names \
> - sc_system_h_headers \
> - sc_tight_scope \
> - sc_trailing_blank \
> - sc_two_space_separator_in_usage \
> - sc_unmarked_diagnostics \
> - sc_useless_cpp_parens
> -
> -syntax-check: $(syntax-check-rules)
> -# @grep -nE '# *include <(limits|std(def|arg|bool))\.h>' \
> -# $$(find -type f -name '*.[chly]') && \
> -# { echo '$(ME): found conditional include' 1>&2; \
> -# exit 1; } || :
> -
> -# grep -nE '^# *include <(string|stdlib)\.h>' \
> -# $(srcdir)/{lib,src}/*.[chy] && \
> -# { echo '$(ME): FIXME' 1>&2; \
> -# exit 1; } || :
> -# FIXME: don't allow `#include .strings\.h' anywhere
> -
> -sc_cast_of_argument_to_free:
> - @grep -nE '\<free \(\(' $(srcdir)/{lib,src}/*.[chly] && \
> - { echo '$(ME): don'\''t cast free argument' 1>&2; \
> - exit 1; } || :
> -
> -sc_cast_of_x_alloc_return_value:
> - @grep -nE --exclude=$(srcdir)/lib/regex.c \
> - '\*\) *x(m|c|re)alloc\>' \
> - $(srcdir)/{lib,src}/*.[chy] && \
> - { echo '$(ME): don'\''t cast x*alloc return value' 1>&2; \
> - exit 1; } || :
> -
> -sc_cast_of_alloca_return_value:
> - @grep -nE '\*\) *alloca\>' \
> - $(srcdir)/src/*.[chy] && \
> - { echo '$(ME): don'\''t cast alloca return value' 1>&2; \
> - exit 1; } || :
> -
> -sc_space_tab:
> - @grep -n '[ ] ' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found SPACE-TAB sequence; remove the SPACE' \
> - 1>&2; exit 1; } || :
> -
> -# Don't use the old ato* functions in `real' code.
> -# They provide no error checking mechanism.
> -# Instead, use strto* functions.
> -sc_prohibit_atoi_atof:
> - @grep -nE '\<ato([filq]|ll)\>' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): do not use ato''f, ato''i, ato''l, ato''ll, or ato''q'
> \
> - 1>&2; exit 1; } || :
> -
> -# Using EXIT_SUCCESS as the first argument to error is misleading,
> -# since when that parameter is 0, error does not exit. Use `0' instead.
> -sc_error_exit_success:
> - @grep -nF 'error (EXIT_SUCCESS,'
> \
> - $$(find -type f -name '*.[chly]') && \
> - { echo '$(ME): found error (EXIT_SUCCESS' 1>&2; \
> - exit 1; } || :
> -
> -sc_file_system:
> - @grep -ni 'file''system' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found use of "file''system";' \
> - 'rewrite to use "file system"' 1>&2; \
> - exit 1; } || :
> -
> -sc_no_if_have_config_h:
> - @grep -n '^# *if HAVE_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found use of #if HAVE_CONFIG_H; use #ifdef' \
> - 1>&2; exit 1; } || :
> -
> -# Nearly all .c files must include <config.h>.
> -sc_require_config_h:
> - @grep -L '^# *include <config\.h>' \
> - $$($(CVS_LIST_EXCEPT) | grep '\.c$$') \
> - | grep . && \
> - { echo '$(ME): the above files do not include <config.h>' \
> - 1>&2; exit 1; } || :
> -
> -# Prohibit the inclusion of assert.h without an actual use of assert.
> -sc_prohibit_assert_without_use:
> - @files=$$(grep -l '# *include <assert\.h>' \
> - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \
> - grep -L '\<assert (' $$files \
> - | grep . && \
> - { echo "$(ME): the above files include <assert.h> but don't use it" \
> - 1>&2; exit 1; } || :
> -
> -sc_obsolete_symbols:
> - @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \
> - $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY' \
> - 1>&2; exit 1; } || :
> -
> -# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
> -
> -# Each nonempty line must start with a year number, or a TAB.
> -sc_changelog:
> - @grep -n '^[^12 ]' $$(find . -maxdepth 2 -name ChangeLog) && \
> - { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2; \
> - exit 1; } || :
> -
> -# Ensure that dd's definition of LONGEST_SYMBOL stays in sync
> -# with the strings from the two affected variables.
> -dd_c = $(srcdir)/src/dd.c
> -sc_dd_max_sym_length:
> -ifneq ($(wildcard $(dd_c)),)
> - @len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c);\
> - sed -n '/flags\[\] =$$/,/^};/p' $(dd_c) ) \
> - |sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p' \
> - | wc --max-line-length); \
> - max=$$(sed -n '/^#define LONGEST_SYMBOL /s///p' $(dd_c) \
> - |tr -d '"' | wc --max-line-length); \
> - if test "$$len" = "$$max"; then :; else \
> - echo 'dd.c: LONGEST_SYMBOL is not longest' 1>&2; \
> - exit 1; \
> - fi
> -endif
> -
> -# Many m4 macros names once began with `jm_'.
> -# On 2004-04-13, they were all changed to start with gl_ instead.
> -# Make sure that none are inadvertently reintroduced.
> -sc_prohibit_jm_in_m4:
> - @grep -nE 'jm_[A-Z]' \
> - $$($(CVS_LIST) $(srcdir)/m4 |grep '\.m4$$') && \
> - { echo '$(ME): do not use jm_ in m4 macro names' \
> - 1>&2; exit 1; } || :
> -
> -sc_root_tests:
> - @t1=sc-root.expected; t2=sc-root.actual; \
> - grep -nl '^PRIV_CHECK_ARG=require-root' \
> - $$($(CVS_LIST) tests) |sed s,tests,., |sort > $$t1; \
> - sed -n 's, cd \([^ ]*\) .*MAKE..check TESTS=\(.*\),./\1/\2,p' \
> - $(srcdir)/tests/Makefile.am |sort > $$t2; \
> - diff -u $$t1 $$t2 || diff=1; \
> - rm -f $$t1 $$t2; \
> - test "$$diff" \
> - && { echo 'tests/Makefile.am: missing check-root action'>&2; \
> - exit 1; } || :
> -
> -# Create a list of regular expressions matching the names
> -# of files included from system.h. Exclude a couple.
> -.re-list:
> - @sed -n '/^# *include /s///p' $(srcdir)/src/system.h \
> - | grep -Ev 'sys/(param|file)\.h' \
> - | sed 's/ .*//;;s/^["<]/^# *include [<"]/;s/\.h[">]$$/\\.h[">]/' \
> - > address@hidden
> - @mv address@hidden $@
> -
> -# Files in src/ should not include directly any of
> -# the headers already included via system.h.
> -sc_system_h_headers: .re-list
> - @if test -f $(srcdir)/src/system.h; then \
> - trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \
> - grep -nE -f .re-list \
> - $$($(CVS_LIST) src | \
> - grep -Ev '((copy|system)\.h|parse-gram\.c)$$') \
> - && { echo '$(ME): the above are already included via system.h'\
> - 1>&2; exit 1; } || :; \
> - fi
> -
> -sc_sun_os_names:
> - @grep -nEi \
> - 'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \
> - $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found misuse of Sun OS version numbers' 1>&2; \
> - exit 1; } || :
> -
> -sc_tight_scope:
> - $(MAKE) -C src $@
> -
> -sc_trailing_blank:
> - @grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found trailing blank(s)' \
> - 1>&2; exit 1; } || :
> -
> -sc_two_space_separator_in_usage:
> - @grep -n '^ *--[a-z][0-9A-Za-z-]* [^ ].*\\$$' \
> - $$($(CVS_LIST_EXCEPT)) && \
> - { echo "$(ME): help2man requires at least two spaces between"; \
> - echo "$(ME): an option and its description"; \
> - 1>&2; exit 1; } || :
> -
> -# Look for diagnostics that aren't marked for translation.
> -# This won't find any for which error's format string is on a separate line.
> -sc_unmarked_diagnostics:
> - @grep -nE \
> - '\<error \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \
> - | grep -v '_''(' && \
> - { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \
> - exit 1; } || :
> -
> -# Avoid useless parentheses like those in this example:
> -# #if defined (SYMBOL) || defined (SYM2)
> -sc_useless_cpp_parens:
> - @grep -n '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \
> - { echo '$(ME): found useless parentheses in cpp directive' \
> - 1>&2; exit 1; } || :
> -
> -# 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) > address@hidden;
> \
> - { echo N; \
> - info libc date calendar format | grep '^ `%.'\' \
> - | $(extract_char); } | sort > address@hidden;
> \
> - diff -u address@hidden address@hidden || exit 1;
> \
> - rm -f address@hidden address@hidden;
> \
> - fi
> -
> -# Ensure that we use only the standard $(VAR) notation,
> -# not @...@ in Makefile.am, now that we can rely on automake
> -# to emit a definition for each substituted variable.
> -makefile-check:
> - grep -nE '@[A-Z_0-9]+@' `find . -name Makefile.am` \
> - && { echo 'Makefile.maint: use $$(...), not @...@' 1>&2; exit 1; } ||
> :
> -
> -news-date-check: NEWS
> - today=`date +%Y-%m-%d`; \
> - if head NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')' \
> - >/dev/null; then \
> - :; \
> - else \
> - echo "version or today's date is not in NEWS" 1>&2; \
> - exit 1; \
> - fi
> -
> -changelog-check:
> - if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$' \
> - >/dev/null; then \
> - :; \
> - else \
> - echo "$(VERSION) not in ChangeLog" 1>&2; \
> - exit 1; \
> - fi
> -
> -m4-check:
> - @grep -n '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.
> -# FIXME: don't hard-code file names below; use a more general mechanism.
> -po-check:
> - if test -f po/POTFILES.in; then \
> - grep -E -v '^(#|$$)' po/POTFILES.in \
> - | grep -v '^src/false\.c$$' | sort > address@hidden;
> \
> - files=; \
> - for file in $$($(CVS_LIST_EXCEPT)) lib/*.[ch]; do \
> - case $$file in \
> - djgpp/* | man/*) continue;; \
> - esac; \
> - 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 -u > address@hidden;
> \
> - diff -u address@hidden address@hidden || exit 1;
> \
> - rm -f address@hidden address@hidden;
> \
> - 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 -n '^# *define AUTHORS "[^"]* and ' src/*.c |grep -v ' N_ (' && \
> - { echo 'Makefile.maint: enclose the above strings in N_ (...)' 1>&2; \
> - exit 1; } || :
> -
> -# Sometimes it is useful to change the PATH environment variable
> -# in Makefiles. When doing so, it's better not to use the Unix-centric
> -# path separator of `:', but rather the automake-provided address@hidden@'.
> -# It'd be better to use `find -print0 ...|xargs -0 ...', but less portable,
> -# and there probably aren't many projects with so many Makefile.am files
> -# that we'd have to worry about limits on command line length.
> -msg = 'Makefile.maint: Do not use `:'\'' above; use @PATH_SEPARATOR@ instead'
> -makefile_path_separator_check:
> - @grep -n 'PATH=.*:' `find $(srcdir) -name Makefile.am` \
> - && { echo $(msg) 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 \
> - mkdir $(release_archive_dir); \
> - fi
> - for file in $(distdir).tar.gz $(xd-delta) \
> - $(release_archive_dir)/$(distdir).tar.gz \
> - $(release_archive_dir)/$(xd-delta); do \
> - test -e $$file || continue; \
> - test -w $$file \
> - || { echo ERROR: $$file is not writable; fail=1; }; \
> - done; \
> - test "$$fail" && exit 1 || :
> -
> -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 $(v_etc_file); then \
> - grep 'enum { COPYRIGHT_YEAR = '$$(date +%Y)' };' $(v_etc_file) \
> - >/dev/null \
> - || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \
> - exit 1; }; \
> - fi
> -
> -
> -# 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 \
> - 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 \
> - rm cvs-diffs; \
> - else \
> - echo "Some files are locally modified:" 1>&2; \
> - cat cvs-diffs; \
> - exit 1; \
> - fi
> -
> -cvs-check: cvs-diff-check cvs-tag-check
> -
> -maintainer-distcheck: changelog-check
> - $(MAKE) distcheck
> - $(MAKE) my-distcheck
> -
> -
> -# 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) update po
> - $(CVS) tag -c $(this-cvs-tag)
> - $(MAKE) dist
> -
> -# Use this to make sure we don't run these programs when building
> -# from a virgin tgz file, below.
> -null_AM_MAKEFLAGS = \
> - ACLOCAL=false \
> - AUTOCONF=false \
> - AUTOMAKE=false \
> - AUTOHEADER=false \
> - MAKEINFO=false
> -
> -# Detect format-string/arg-list mismatches that would normally be obscured
> -# by the use of _(). The --disable-nls effectively defines away that macro,
> -# and building with CFLAGS='-Wformat -Werror' causes any format warning to be
> -# treated as a failure. Also, check for shadowing problems with -Wshadow.
> -# These CFLAGS are pretty strict. If you build this target, you probably
> -# have to have a recent version of gcc and glibc headers.
> -TMPDIR ?= /tmp
> -t=$(TMPDIR)/$(PACKAGE)/test
> -my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz)
> - -rm -rf $(t)
> - mkdir -p $(t)
> - GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
> - cd $(t)/$(distdir) \
> - && ./configure --disable-nls \
> - && $(MAKE) CFLAGS='-Werror -Wall -Wformat -Wshadow' \
> - AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
> - && $(MAKE) dvi \
> - && $(MAKE) check \
> - && $(MAKE) distclean
> - (cd $(t) && mv $(distdir) $(distdir).old \
> - && $(AMTAR) -zxf - ) < $(distdir).tar.gz
> - diff -ur $(t)/$(distdir).old $(t)/$(distdir)
> - -rm -rf $(t)
> - @echo "========================"; \
> - echo "$(distdir).tar.gz is ready for distribution"; \
> - echo "========================"
> -
> -WGET = wget
> -WGETFLAGS = -C off
> -
> -rel-check:
> - tarz=/tmp/rel-check-tarz-$$$$; \
> - md5_tmp=/tmp/rel-check-md5-$$$$; \
> - set -e; \
> - trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
> - $(WGET) $(WGETFLAGS) -q --output-document=$$tarz $(url); \
> - echo "$(md5) -" > $$md5_tmp; \
> - md5sum -c $$md5_tmp < $$tarz
> -
> -prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
> -xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
> -
> -rel-files = $(xd-delta) $(DIST_ARCHIVES)
> -announcement: NEWS ChangeLog $(rel-files)
> - @./announce-gen \
> - --release-type=$(RELEASE_TYPE) \
> - --package=$(PACKAGE) \
> - --prev=$(PREV_VERSION) \
> - --curr=$(VERSION) \
> - --release-archive-directory=$(release_archive_dir) \
> - --gpg-key-id=$(gpg_key_ID) \
> - --news=NEWS \
> - $(addprefix --url-dir=, $(url_dir_list)) \
> -
> -
> -## ---------------- ##
> -## Updating files. ##
> -## ---------------- ##
> -
> -ftp-gnu = ftp://ftp.gnu.org/gnu
> -www-gnu = http://www.gnu.org
> -
> -# 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) $(WGETFLAGS) -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)/build-aux/config.guess \
> - $(srcdir)/build-aux/config.sub \
> - $(srcdir)/build-aux/texinfo.tex \
> - $(srcdir)/src/ansi2knr.c
> -
> -get-targets = $(patsubst %, get-%, $(wget_files))
> -
> -config.guess-url_prefix = $(ftp-gnu)/build-aux/
> -config.sub-url_prefix = $(ftp-gnu)/build-aux/
> -
> -ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
> -
> -texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
> -
> -standards.texi-url_prefix = $(www-gnu)/prep/
> -make-stds.texi-url_prefix = $(standards.texi-url_prefix)
> -
> -target = $(patsubst get-%, %, $@)
> -url = $($(notdir $(target))-url_prefix)$(notdir $(target))
> -
> -.PHONY: $(get-targets)
> -$(get-targets):
> - $(WGET) $(WGETFLAGS) $(url) -O $(target).t \
> - && $(move_if_change) $(target).t $(target)
> -
> -cvs_files ?= \
> - $(srcdir)/build-aux/depcomp \
> - $(srcdir)/build-aux/install-sh \
> - $(srcdir)/build-aux/missing \
> - $(srcdir)/build-aux/mkinstalldirs \
> - $(srcdir)/src/ansi2knr.c
> -automake_repo=:pserver:anoncvs:address@hidden:/cvs/automake
> -.PHONY: wget-update
> -wget-update: $(get-targets)
> -
> -.PHONY: cvs-update
> -cvs-update:
> - fail=; \
> - for f in $(cvs_files); do \
> - test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \
> - cvs diff $$f > /dev/null \
> - || { echo "*** $$f is locally modified; skipping it" 1>&2; \
> - fail=yes; 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; \
> - test "$$fail" && exit 1
> -
> -emit_upload_commands:
> - @echo =====================================
> - @echo =====================================
> - @echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\"
> - @echo " --to $(gnu_rel_host):coreutils \\"
> - @echo " $(rel-files)"
> - @echo '# send the /tmp/announcement e-mail'
> - @echo =====================================
> - @echo =====================================
> -
> -$(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
> - xdelta delta -9 $^ $@ || :
> -
> -.PHONY: alpha beta major
> -alpha beta major: news-date-check $(local-check)
> - $(MAKE) cvs-dist
> - $(MAKE) $(xd-delta)
> - $(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
> - ln $(rel-files) $(release_archive_dir)
> - chmod a-w $(rel-files)
> - $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
> - echo $(VERSION) > $(prev_version_file)
> - $(CVS) ci -m. $(prev_version_file)
> diff --git a/README b/README
> index a6bfe73..11e9c6f 100644
> --- a/README
> +++ b/README
> @@ -1,4 +1,4 @@
> -This package contains the Bison parser generator.
> +This package contains the GNU Bison parser generator.
>
> See the file INSTALL for generic compilation and installation instructions.
>
> diff --git a/bootstrap.conf b/bootstrap.conf
> index 251e2ef..89d7db5 100644
> --- a/bootstrap.conf
> +++ b/bootstrap.conf
> @@ -17,7 +17,7 @@
>
> # gnulib modules used by this package.
> gnulib_modules='
> - argmatch config-h c-strcase configmake
> + announce-gen argmatch config-h c-strcase configmake
> dirname error extensions fopen-safer getopt gettext git-version-gen
> gnumakefile hash inttypes javacomp-script javaexec-script malloc
> mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
> diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
> index a8ef188..2edd4b1 100644
> --- a/build-aux/.cvsignore
> +++ b/build-aux/.cvsignore
> @@ -1,5 +1,6 @@
> Makefile
> Makefile.in
> +announce-gen
> compile
> config.guess
> config.rpath
> diff --git a/build-aux/.gitignore b/build-aux/.gitignore
> index f12882c..db9bb9f 100644
> --- a/build-aux/.gitignore
> +++ b/build-aux/.gitignore
> @@ -1,5 +1,6 @@
> /Makefile
> /Makefile.in
> +/announce-gen
> /compile
> /config.guess
> /config.rpath
> diff --git a/cfg.mk b/cfg.mk
> index b945f22..913ecb8 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -20,3 +20,23 @@
> # targets are filtered out.
> _is-dist-target = $(filter-out %clean maintainer-check%, \
> $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
> +
> +# Use alpha.gnu.org for alpha and beta releases.
> +# Use ftp.gnu.org for major releases.
> +gnu_ftp_host-alpha = alpha.gnu.org
> +gnu_ftp_host-beta = alpha.gnu.org
> +gnu_ftp_host-major = ftp.gnu.org
> +gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
> +
> +url_dir_list = \
> + ftp://$(gnu_rel_host)/gnu/bison
> +
> +# Tests not to run as part of "make distcheck".
> +# Exclude changelog-check here so that there's less churn in ChangeLog
> +# files -- otherwise, you'd need to have the upcoming version number
> +# at the top of the file for each `make distcheck' run.
> +local-checks-to-skip = changelog-check
> +
> +# The local directory containing the checked-out copy of gnulib used in
> +# this release. Used solely to get a date for the "announcement" target.
> +gnulib_dir = $(srcdir)/../../gnulib
> diff --git a/lib/.cvsignore b/lib/.cvsignore
> index c7a817b..7b8ba6b 100644
> --- a/lib/.cvsignore
> +++ b/lib/.cvsignore
> @@ -17,6 +17,7 @@ configmake.h
> dirname.c
> dirname.h
> dup-safer.c
> +errno.in.h
> error.c
> error.h
> exitfail.c
> diff --git a/lib/.gitignore b/lib/.gitignore
> index fc74edb..c9cc650 100644
> --- a/lib/.gitignore
> +++ b/lib/.gitignore
> @@ -20,6 +20,7 @@
> /dirname.c
> /dirname.h
> /dup-safer.c
> +/errno.in.h
> /error.c
> /error.h
> /exitfail.c
> diff --git a/m4/.cvsignore b/m4/.cvsignore
> index 77a9629..3dfb921 100644
> --- a/m4/.cvsignore
> +++ b/m4/.cvsignore
> @@ -5,6 +5,7 @@ dirname.m4
> dos.m4
> double-slash-root.m4
> environ.m4
> +errno_h.m4
> error.m4
> exitfail.m4
> extensions.m4
> diff --git a/m4/.gitignore b/m4/.gitignore
> index b6d422c..12a51b1 100644
> --- a/m4/.gitignore
> +++ b/m4/.gitignore
> @@ -5,6 +5,7 @@
> /dos.m4
> /double-slash-root.m4
> /environ.m4
> +/errno_h.m4
> /error.m4
> /exitfail.m4
> /extensions.m4
> diff --git a/maint.mk b/maint.mk
> index 19b7f12..7b43154 100644
> --- a/maint.mk
> +++ b/maint.mk
> @@ -805,7 +805,7 @@ announcement: NEWS ChangeLog $(rel-files)
> --curr=$(VERSION) \
> --gpg-key-id=$(gpg_key_ID) \
> --news=NEWS \
> - --bootstrap-tools=autoconf,automake,bison,gnulib \
> + --bootstrap-tools=autoconf,automake,flex,gnulib \
> --gnulib-version=$(gnulib-version) \
> $(addprefix --url-dir=, $(url_dir_list))
>
> --
> 1.5.4.3
>
>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH] Update several administrative files mainly to facilitate releasing.,
Joel E. Denny <=