Changeset 569
- Timestamp:
- Mar 13, 2008, 10:55:15 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.am
r568 r569 4 4 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 # Copyright (C) 2007 Peter Johansson6 # Copyright (C) 2007 2008 Peter Johansson 7 7 # 8 8 # This file is part of svndigest, http://trac.thep.lu.se/svndigest … … 25 25 SUBDIRS = lib bin test 26 26 27 EXTRA_dist = build_support/move-if-change 28 27 29 clean-local: 28 30 rm -rf svndigest *~ 29 30 bajs.in: kiss31 cp kiss bajs.in -
trunk/THANKS
r542 r569 25 25 http://www.mhoenicka.de/system-cgi/blog/index.php?itemid=999 26 26 27 svndigest build system uses a shell script 28 (build_support/move-if-changed) that was copied from GCC. The script 29 is licensed under GNU GPL <http://www.gnu.org/licenses/>. 30 27 31 ----------------------------------------------------------------------- 28 32 {{{ 29 33 Copyright (C) 2005, 2006 Jari Häkkinen 30 34 Copyright (C) 2007 Jari Häkkinen, Peter Johansson 35 Copyright (C) 2008 Peter Johansson 31 36 32 37 This file is part of svndigest, http://trac.thep.lu.se/svndigest -
trunk/configure.ac
r568 r569 137 137 138 138 wc_found="no"; 139 if (test `$SVNVERSION -n '.'` != "exported"); then 139 if (test $have_svnversion != "no" && 140 test `$SVNVERSION -n $srcdir` != "exported"); 141 then 140 142 wc_found="yes"; 141 143 fi 142 AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no") 144 echo $wc_found 145 AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no") 143 146 144 147 # Checking that a release (non-dev) has no pre in VERSION … … 157 160 bin/Makefile 158 161 lib/Makefile 159 test/Makefile 160 test/test_repo.sh 161 test/check_repo_status.sh], 162 [chmod +x test/test_repo.sh; 163 chmod +x test/check_repo_status.sh]) 162 test/Makefile]) 164 163 165 164 # Print failure status information about selected items, and exit if … … 170 169 all_reqs_ok="true" 171 170 172 # 173 if (test "$info_found" = "no" && test "$wc_found" = "no") ; then174 AC_MSG_WARN([Cannot find sources (lib/subver ion_info.h).])171 if (test "$wc_found" != "yes") ; then 172 if (test "$info_found" = "no") ; then 173 AC_MSG_WARN([Cannot find sources (lib/subversion_info.cc).]) 175 174 if (test "$svnversion" = "no") ; then 176 175 AC_MSG_WARN([If you grabbed the source from the subversion repository, … … 185 184 fi 186 185 all_reqs_ok="false" 186 else 187 dnl test repo is not distributed 188 AC_CONFIG_FILES([test/test_repo.sh 189 test/check_repo_status.sh], 190 [chmod +x test/test_repo.sh; 191 chmod +x test/check_repo_status.sh]) 192 193 fi 187 194 fi 188 195 -
trunk/lib/Makefile.am
r564 r569 5 5 # Copyright (C) 2005 Jari Häkkinen 6 6 # Copyright (C) 2006 Jari Häkkinen, Peter Johansson 7 # Copyright (C) 2007 Peter Johansson7 # Copyright (C) 2007 2008 Peter Johansson 8 8 # 9 9 # This file is part of svndigest, http://trac.thep.lu.se/svndigest … … 31 31 HtmlStream.h html_utility.h LineTypeParser.h \ 32 32 LogIterator.h Node.h rmdirhier.h \ 33 Stats.h StatsCollection.h SVN.h SVNblame.h \33 Stats.h StatsCollection.h subversion_info.h SVN.h SVNblame.h \ 34 34 SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h 35 35 … … 40 40 Functor.cc Gnuplot.cc GnuplotFE.cc HtmlStream.cc \ 41 41 html_utility.cc LineTypeParser.cc LogIterator.cc Node.cc \ 42 rmdirhier.cc Stats.cc StatsCollection.cc SVN.cc \42 rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \ 43 43 SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc 44 44 45 BUILT_SOURCES=subversion_info.h46 45 47 EXTRA_DIST=subversion_info.h 46 48 47 49 48 clean-local: … … 53 52 54 53 if HAVE_SVN_WC 55 subversion_info.h: subversion_info.h.tmp 56 @if [ ! -f $@ ]; then touch $@; fi; \ 57 diff $@ subversion_info.h.tmp > subversion_info.h.diff; \ 58 if test -s "subversion_info.h.diff"; then \ 59 mv subversion_info.h.tmp subversion_info.h; \ 60 echo creating subversion_info.h; \ 61 fi; \ 62 rm -f subversion_info.h.tmp subversion_info.h.diff ; 54 subversion_info.cc: subversion_info.cc.tmp 55 @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \ 56 subversion_info.cc 63 57 64 65 subversion_info.h.tmp: FORCE 66 @echo '// subversion_info.h generated from subversion_info.h.in.' > $@ ;\ 58 subversion_info.cc.tmp: FORCE 59 @echo '// subversion_info.cc generated from subversion_info.cc.in.' > $@ ;\ 67 60 revision=`$(SVNVERSION) $(top_srcdir)` ;\ 68 61 year=`svn info $(top_srcdir)|$(SED) -n 's/.*Date: \(.*\)-..-.*/\1/p'`;\ 69 62 $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \ 70 -e 's/sub_2_svn_year/'$$year'/g' subversion_info. h.in >> $@ ;63 -e 's/sub_2_svn_year/'$$year'/g' subversion_info.cc.in >> $@ ; 71 64 endif 72 65 -
trunk/lib/subversion_info.h
r568 r569 1 // $Id$2 3 1 #ifndef _theplu_svndigest_subversion_info_ 4 2 #define _theplu_svndigest_subversion_info_ 3 4 // $Id$ 5 5 6 6 /* … … 30 30 namespace svndigest{ 31 31 32 inline std::string svn_revision(void) 33 { return "sub_2_svn_revision"; } 32 std::string svn_revision(void); 34 33 35 inline std::string svn_year(void) 36 { return "sub_2_svn_year"; } 34 std::string svn_year(void); 37 35 38 36 }} // end of namespace svndigest and namespace theplu
Note: See TracChangeset
for help on using the changeset viewer.