Changeset 569 for trunk/lib

Timestamp:

Mar 13, 2008, 10:55:15 PM (16 years ago)

Author:

Peter Johansson

Message:

NOTE: may cause file name clash. Adding file
subversion_info.h'. Previously make' generated this file, and thus
you may experience a file name clash. Please remove subversion_info.h
prior updating.

Moved implementation of subversion_info to source file in order to
avoid re-compilations not needed. Using script move-if-change to
create source file.

Location:

trunk/lib

Files:

• Makefile.am (modified) (4 diffs)
• subversion_info.cc.in (added)
• subversion_info.h (moved) (moved from trunk/lib/subversion_info.h.in) (2 diffs)

trunk/lib/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005 Jari Häkkinen
 # Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2007 2008 Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -31 +31 @@
   HtmlStream.h html_utility.h LineTypeParser.h \
   LogIterator.h Node.h rmdirhier.h \
-  Stats.h StatsCollection.h SVN.h SVNblame.h  \
+  Stats.h StatsCollection.h subversion_info.h SVN.h SVNblame.h  \
   SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
 
@@ -40 +40 @@
   Functor.cc Gnuplot.cc GnuplotFE.cc  HtmlStream.cc \
   html_utility.cc LineTypeParser.cc LogIterator.cc Node.cc \
-  rmdirhier.cc Stats.cc StatsCollection.cc SVN.cc       \
+  rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc        \
   SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc
 
-BUILT_SOURCES=subversion_info.h
 
-EXTRA_DIST=subversion_info.h
+
 
 clean-local: 
@@ -53 +52 @@
 
 if HAVE_SVN_WC
-subversion_info.h: subversion_info.h.tmp
-  @if [ ! -f $@ ]; then touch $@; fi; \
-  diff $@ subversion_info.h.tmp > subversion_info.h.diff; \
-  if test -s "subversion_info.h.diff"; then \
-    mv subversion_info.h.tmp subversion_info.h; \
-    echo creating subversion_info.h; \
-  fi; \
-  rm -f subversion_info.h.tmp subversion_info.h.diff ;
+subversion_info.cc: subversion_info.cc.tmp
+  @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \
+  subversion_info.cc
 
-
-subversion_info.h.tmp: FORCE
-  @echo '// subversion_info.h generated from subversion_info.h.in.' > $@ ;\
+subversion_info.cc.tmp: FORCE
+  @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'  subversion_info.h.in >> $@ ;
+  -e 's/sub_2_svn_year/'$$year'/g'  subversion_info.cc.in >> $@ ;
 endif
 

trunk/lib/subversion_info.h

@@ -1 @@
-// $Id$
-
 #ifndef _theplu_svndigest_subversion_info_
 #define _theplu_svndigest_subversion_info_
+
+// $Id$
 
 /*
@@ -30 +30 @@
 namespace svndigest{
 
-  inline std::string svn_revision(void)
-  { return "sub_2_svn_revision"; }
+  std::string svn_revision(void);
 
-  inline std::string svn_year(void)
-  { return "sub_2_svn_year"; }
+  std::string svn_year(void);
 
 }} // end of namespace svndigest and namespace theplu