Re: use git-version-gen (was: Re: bison.1 in version control?)

[Joel E. Denny]

On Fri, 18 Jul 2008, Eric Blake wrote:

> Assuming that origin is your shorthand for savannah's repository:
> 
> git push origin refs/tags/v2.3b

Thanks.  I pushed it.

> > > The git-version-gen approach looks fairly robust.  However, I dislike 
> > > that 
> > > "make" leaves an incorrect version number.  Our current scheme merely 
> > > uses 
> > > imprecise version numbers instead.  Fortunately, "make dist" does correct 
> > > the version number.  Unfortunately, "make install" does not.
> 
> This has come up on the gnulib list before, and I suggest re-raising the 
> issue 
> there.

I see you've done so.  I'll follow that thread and comment if I feel I 
have anything to add.

> > > I had to hack bootstrap to remove the "GNUmakefile" entry that gnulib 
> > > adds 
> > > to .gitignore.  It would be better to patch gnulib to add "/GNUmakefile" 
> > > instead.
> 
> Personally, I don't bother with anchored .gitignore entries.  But if you 
> really 
> want all of bison's entries to be anchored, I'd raise the issue with Bruno; 
> he's pretty good about patching gnulib-tool to meet user demands.

I'll do that.

> m4 uses this additional trick, to turn on gnits mode for major releases but 
> use 
> the more relaxed gnu mode for development:
> 
> m4_define([M4_VERSION],
>           m4_esyscmd([build-aux/git-version-gen .tarball-version]))
> m4_bmatch(m4_defn([M4_VERSION]), [^[0-9]], [],
>           [m4_define([M4_VERSION], [1.9a])])
> AC_INIT([GNU M4], m4_defn([M4_VERSION]), address@hidden)
> 
> AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 dist-lzma]
> m4_bmatch(m4_defn([M4_VERSION]), [-], [gnu], [gnits]))
> 
> Maybe I should document that trick in git-version-gen?

Sure.  I've seen one place where this change might help with Bison.  
During development between releases, I don't like that "make dist" should 
force me to name the next release in NEWS by using the name of the current 
state of the code.  That is, I feel that it would be best if unofficial 
tarballs are not forced to have bogus NEWS entries.

> > >  AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2008],
> > >            [The copyright year for this package])
> 
> This could almost be considered redundant information with the gnulib module 
> version-etc.

I'll look into that.

I've pushed the patch I posted earlier in this thread plus the following.  
I'll return to the above issues when I have some more time.

Thanks.

>From 5523ac79a0e46820d9a947b8cf0f7149da0f0165 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 20 Jul 2008 18:33:17 -0400
Subject: [PATCH] Update copyright dates for recent changes.

* Makefile.am: Here.
* src/Makefile.am: Here.
* src/reduce.c: Here.
* tests/reduce.at: Here.
---
 ChangeLog       |    8 ++++++++
 Makefile.am     |    2 +-
 src/Makefile.am |    2 +-
 src/reduce.c    |    2 +-
 tests/reduce.at |    2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35a839c..251260d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-20  Joel E. Denny  <address@hidden>
+
+       Update copyright dates for recent changes.
+       * Makefile.am: Here.
+       * src/Makefile.am: Here.
+       * src/reduce.c: Here.
+       * tests/reduce.at: Here.
+
 2008-07-18  Joel E. Denny  <address@hidden>
 
        Use git-version-gen for version names between releases.
diff --git a/Makefile.am b/Makefile.am
index b1e2669..7113484 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
 ## Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b297ab..ef97445 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # Make bison/src.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/src/reduce.c b/src/reduce.c
index 1f8fc34..596a26b 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
    Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003, 2005, 2006,
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/tests/reduce.at b/tests/reduce.at
index 55220c8..5fe650a 100644
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,5 +1,5 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2007, 2008 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
-- 
1.5.4.3