diff options
| author | Joel E. Denny <jdenny@ces.clemson.edu> | 2008-07-18 11:26:15 -0400 |
|---|---|---|
| committer | Joel E. Denny <jdenny@ces.clemson.edu> | 2008-07-18 12:55:39 -0400 |
| commit | 8fa369111fcc3d06a0c9fc278f063b8033dac094 (patch) | |
| tree | 3ecbce5b7857dd60705e0f06c193679589f8480e /bootstrap | |
| parent | bcf07cb7070fab57727b274486dc7a331ff8ac2d (diff) | |
| download | bison-8fa369111fcc3d06a0c9fc278f063b8033dac094.tar.gz | |
Use git-version-gen for version names between releases.
* .cvsignore (.tarball-version, GNUmakefile, *~): Add.
* .gitignore (/.tarball-version, /GNUmakefile, /*~): Add.
* .prev-version: New.
* .version.in: Remove.
* ChangeLog: Remove the $Id$ previously used for capturing the CVS
revision.
* GNUmakefile: Remove, now copied from Gnulib.
* Makefile.am: Add code suggested by comments in
build-aux/git-version-gen.
(EXTRA_DIST): Remove GNUmakefile, handled by Gnulib. Add maint.mk,
.prev-version, and .version.
* NEWS (2.3b+): Rename to...
(?.?): ... this because we're dropping the "+" version naming scheme,
but, in general, we still can't be sure of our next release name.
* bootstrap: Add a quick hack to remove from .gitignore the
GNUmakefile entry that gnulib adds. We already have a /GNUmakefile
entry. This should really be fixed in gnulib instead.
* bootstrap.conf (gnulib_modules): Add gnumakefile.
* configure.ac (AC_INIT): Set version name by invoking
build-aux/git-version-gen.
(AC_CONFIG_FILES): Remove .version, now generated by
build-aux/git-version-gen.
* maint.mk: New, copied from coreutils.
* doc/.cvsignore (bison.1): Add.
* doc/.gitignore (/bison.1): Add.
* doc/bison.1: Remove, generated.
* src/.cvsignore (revision.c): Remove.
* src/.gitignore (/revision.c): Remove.
* src/Makefile.am (bison_SOURCES): Remove revision.c and revision.h.
(BUILT_SOURCES): Remove revision.c.
(revision.c): Remove.
* src/getargs.c (version): Don't print revision after the VERSION.
* src/revision.h: Remove.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -600,6 +600,12 @@ if test -f $mam_template; then done fi +# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries +# instead. Anyway, this hack must be done before invoking autoconf so that +# build-aux/git-version-gen doesn't think the version is dirty because +# .gitignore isn't committed. +grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore + # Reconfigure, getting other files. for command in \ |