Changeset 909

Timestamp:

Nov 29, 2009, 11:43:01 PM (14 years ago)

Author:

Peter Johansson

Message:

Set the copyright year automatically in svndigest-copy-cache. The year
is stored in a file .release_year and AC_DEFINEd and AC_SUBSTed, so it
can be used in both svndigest-copy-cache and svndigest (via
config.h). No need files lib/copyright_year anymore. The file
.release_year is updated same fashion as copyright_year.cc was
previously. A difference is that a change in .release will cause
configure to be rerun, which is expensive but I think we can live with
the cost since it only happens once a year.

Location:

trunk

Files:

• .release_year (added)
• Makefile.am (modified) (1 diff)
• bin/svndigest-copy-cache.as (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lib/Makefile.am (modified) (3 diffs)
• lib/OptionVersion.cc (modified) (2 diffs)
• lib/copyright_year.cc (deleted)
• lib/copyright_year.h (deleted)

trunk/Makefile.am

@@ -27 +27 @@
 SUBDIRS = lib bin man test
 
-EXTRA_dist = build_support/move-if-change
+EXTRA_dist = build_support/move-if-change .release_year
+MOVE_IF_CHANGE = $(SHELL) $(top_srcdir)/build_support/move-if-change
 
 clean-local: 
   rm -rf svndigest *~
+
+.PHONY: .release_year.tmp
+if HAVE_SVN_WC
+# update copyright year automatically (if we build from svn wc)
+$(srcdir)/.release_year: .release_year.tmp
+  @$(MOVE_IF_CHANGE) $@.tmp $@
+
+.release_year.tmp:
+  @if ($(SVNVERSION) $(top_srcdir) | $(GREP) M > /dev/null); then \
+     date -u "+%Y" > .release_year.tmp; \
+  else \
+     cp $(srcdir)/.release_year $@; \
+  fi
+endif
+
 
 # This is a workaround to avoid a broken make when .m4 files are

trunk/bin/svndigest-copy-cache.as

@@ -4 +4 @@
 # $Id$
 
-# Copyright (C) 2009 Peter Johansson
+# Copyright (C) @RELEASE_YEAR@ Peter Johansson
 
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/configure.ac

@@ -45 +45 @@
                      [Define to home page for this package])
            AC_SUBST([PACKAGE_URL], ["http://dev.thep.lu.se/svndigest"])])
+
+# propagate RELEASE_YEAR from file .release_year
+RELEASE_YEAR=`cat $srcdir/.release_year`
+AC_SUBST([RELEASE_YEAR])
+AC_DEFINE_UNQUOTED([RELEASE_YEAR], ["$RELEASE_YEAR"], 
+                   [Define year package was last modified])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/.release_year'])
 
 AC_SUBST([SVNDIGEST_MAJOR_VERSION], [MAJOR_VERSION])

trunk/lib/Makefile.am

@@ -33 +33 @@
 
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h \
-  Commitment.h Configuration.h copyright_year.h css.h\
+  Commitment.h Configuration.h css.h \
   Date.h Directory.h File.h first_page.h Functor.h \
   Graph.h \
@@ -44 +44 @@
 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   ClassicStats.cc \
-  Commitment.cc Configuration.cc copyright_year.cc \
+  Commitment.cc Configuration.cc \
   css.cc Date.cc Directory.cc File.cc first_page.cc\
   Functor.cc Graph.cc HtmlBuf.cc HtmlStream.cc \
@@ -70 +70 @@
   $(srcdir)/subversion_info.cc.in >> $@ ;
 
-# update copyright year automatically (if we build from svn wc)
-$(srcdir)/copyright_year.cc: copyright_year.cc.tmp
-  @$(MOVE_IF_CHANGE) copyright_year.cc.tmp $@
-
-copyright_year.cc.tmp: FORCE
-  @if (echo $(SVN_REVISION) | $(GREP) M); then \
-    $(SED) -e 's/"20[0-9][0-9]"/'\"`date -u "+%Y"`\"'/g' \
-      $(srcdir)/copyright_year.cc > $@ ; \
-  else \
-    cp $(srcdir)/copyright_year.cc $@; \
-  fi
-
 else
 # this is needed in 'svn export' build

trunk/lib/OptionVersion.cc

@@ -22 +22 @@
 #include <config.h>
 
-#include "copyright_year.h"
 #include "OptionVersion.h"
 #include "subversion_info.h"
@@ -65 +64 @@
          << ")";
     } 
-    cs << "\n\nCopyright (C) " << svn_year() 
+    cs << "\n\nCopyright (C) " << RELEASE_YEAR 
        << " Jari H\u00E4kkinen and Peter Johansson.\n"
        << "This is free software. You may redistribute copies of it under "