Changeset 726 for trunk

Timestamp:

Dec 9, 2008, 11:14:16 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #362

lifting out copyright year to its own file. The source file
lib/copyright_year.cc is automatically updated when being in svn wc
(i.e. not dist or svn export).

Location:

trunk/lib

Files:

• Makefile.am (modified) (3 diffs)
• OptionVersion.cc (modified) (1 diff)
• copyright_year.cc (copied) (copied from trunk/lib/subversion_info.cc.in) (2 diffs)
• copyright_year.h (copied) (copied from trunk/lib/subversion_info.h) (2 diffs)
• subversion_info.cc.in (modified) (1 diff)
• subversion_info.h (modified) (1 diff)

trunk/lib/Makefile.am

@@ -29 +29 @@
 
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h ColumnStream.h \
-  CommandLine.h Commitment.h Configuration.h css.h\
+  CommandLine.h Commitment.h Configuration.h copyright_year.h css.h\
   Date.h Directory.h Exception.h File.h first_page.h Functor.h \
   Gnuplot.h GnuplotFE.h \
@@ -40 +40 @@
 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   ClassicStats.cc ColumnStream.cc \
-  CommandLine.cc Commitment.cc Configuration.cc \
+  CommandLine.cc Commitment.cc Configuration.cc copyright_year.cc \
   css.cc Date.cc Directory.cc File.cc first_page.cc\
   Functor.cc Gnuplot.cc GnuplotFE.cc  HtmlBuf.cc HtmlStream.cc \
@@ -64 +64 @@
   @echo '// subversion_info.cc generated from subversion_info.cc.in.' > $@ ;\
   revision=`$(SVNVERSION) $(top_srcdir)` ;\
-  year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
   $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
-  -e 's/sub_2_svn_year/'$$year'/g' $(srcdir)/subversion_info.cc.in >> $@ ;
+  $(srcdir)/subversion_info.cc.in >> $@ ;
+
+# update copyright year automatically (if we build from svn wc)
+$(srcdir)/copyright_year.cc: copyright_year.cc.tmp
+  @$(SHELL) $(top_srcdir)/build_support/move-if-change $< $@
+
+copyright_year.cc.tmp: FORCE
+  @year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
+  $(SED) -e 's/20[0-9][0-9]/'$$year'/g' $(srcdir)/copyright_year.cc > $@ ;
 endif
 

trunk/lib/OptionVersion.cc

@@ -22 +22 @@
 #include <config.h>
 
+#include "copyright_year.h"
 #include "OptionVersion.h"
 #include "ColumnStream.h"

trunk/lib/copyright_year.cc

@@ -20 +20 @@
 */
 
-#include "subversion_info.h"
+#include "copyright_year.h"
 #include <string>
 
@@ -26 +26 @@
 namespace svndigest{
 
-  std::string compilation_date(void)
-  {
-    return __DATE__;
-  }
-
-
-  std::string compilation_time(void)
-  {
-    return __TIME__;
-  }
-
-
-  std::string svn_revision(void)
-  {
-    return "sub_2_svn_revision";
-  }
-
-
   std::string svn_year(void)
   {
-    return "sub_2_svn_year";
+    return "2008";
   }
 

trunk/lib/copyright_year.h

@@ -1 @@
-#ifndef _theplu_svndigest_subversion_info_
-#define _theplu_svndigest_subversion_info_
+#ifndef _theplu_svndigest_copyright_year_
+#define _theplu_svndigest_copyright_year_
 
 // $Id$
@@ -28 +28 @@
 namespace svndigest{
 
-  // These functions are (mis)placed here to reflect compilation time
-  // of subversion_info.cc. Previously, __TIME__ macro was placed in
-  // `bin/Parameter.cc' and since the Parameter is almost independent
-  // of other parts of the package, that compilation time does not
-  // very accurately reflect the building time of the svndigest
-  // binary. subversion_info.cc is at least modified when updating
-  // against repository and therefore these functions will return a
-  // time no earlier than last `svn update'
-  std::string compilation_date(void);
-  std::string compilation_time(void);
-
-  std::string svn_revision(void);
-
+  /**
+     \return year svndigest was last changed
+   */
   std::string svn_year(void);
 

trunk/lib/subversion_info.cc.in

@@ -43 +43 @@
   }
 
-
-  std::string svn_year(void)
-  {
-    return "sub_2_svn_year";
-  }
-
 }} // end of namespace svndigest and namespace theplu

trunk/lib/subversion_info.h

@@ -41 +41 @@
   std::string svn_revision(void);
 
-  std::string svn_year(void);
-
 }} // end of namespace svndigest and namespace theplu