mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-12 13:53:03 +00:00
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.
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
Makefile
|
||||
Makefile.in
|
||||
bison
|
||||
revision.c
|
||||
scan-code.c
|
||||
scan-gram.c
|
||||
scan-skel.c
|
||||
|
||||
1
src/.gitignore
vendored
1
src/.gitignore
vendored
@@ -7,7 +7,6 @@
|
||||
/Makefile.in
|
||||
/bison
|
||||
/bison.exe
|
||||
/revision.c
|
||||
/scan-code.c
|
||||
/scan-gram.c
|
||||
/scan-skel.c
|
||||
|
||||
@@ -53,7 +53,6 @@ bison_SOURCES = \
|
||||
print-xml.c print-xml.h \
|
||||
reader.c reader.h \
|
||||
reduce.c reduce.h \
|
||||
revision.c revision.h \
|
||||
relation.c relation.h \
|
||||
scan-code.h scan-code-c.c \
|
||||
scan-gram.h scan-gram-c.c \
|
||||
@@ -70,7 +69,6 @@ EXTRA_bison_SOURCES = scan-code.l scan-skel.l scan-gram.l
|
||||
|
||||
BUILT_SOURCES = \
|
||||
parse-gram.c parse-gram.h \
|
||||
revision.c \
|
||||
scan-code.c \
|
||||
scan-skel.c \
|
||||
scan-gram.c
|
||||
@@ -85,16 +83,6 @@ yacc:
|
||||
echo:
|
||||
echo $(bison_SOURCES) $(noinst_HEADERS)
|
||||
|
||||
revision.c: $(top_srcdir)/configure $(top_srcdir)/ChangeLog
|
||||
case "$(VERSION)" in \
|
||||
*+*) sed -n \
|
||||
's/^\$$\(Id.*\)\$$$$/const char *revision = "\1\\n";/p' \
|
||||
$(top_srcdir)/ChangeLog \
|
||||
;; \
|
||||
*) echo 'const char *revision = "";' \
|
||||
;; \
|
||||
esac >$@
|
||||
|
||||
# The following rule is not designed to be portable,
|
||||
# and relies on tools that not everyone has.
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
|
||||
#include <config.h>
|
||||
#include "system.h"
|
||||
#include "revision.h"
|
||||
#include "output.h"
|
||||
|
||||
#include <argmatch.h>
|
||||
@@ -338,7 +337,6 @@ version (void)
|
||||
continue. */
|
||||
printf (_("bison (GNU Bison) %s"), VERSION);
|
||||
putc ('\n', stdout);
|
||||
printf ("%s", revision);
|
||||
fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
|
||||
putc ('\n', stdout);
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
/* Between Bison releases, define a precise revision string.
|
||||
|
||||
Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of Bison, the GNU Compiler Compiler.
|
||||
|
||||
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/>. */
|
||||
|
||||
#ifndef REVISION_H_
|
||||
# define REVISION_H_
|
||||
|
||||
extern const char *revision;
|
||||
|
||||
#endif /* !REVISION_H_ */
|
||||
Reference in New Issue
Block a user