Changeset 1337

Timestamp:

Feb 13, 2011, 12:57:58 AM (12 years ago)

Author:

Peter Johansson

Message:

using macros from yat to create files .release and .release_year

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (8 diffs)
• lib/Makefile.am (modified) (4 diffs)
• lib/OptionVersion.cc (modified) (1 diff)
• lib/html_utility.cc (modified) (1 diff)
• lib/subversion_revision.cc (moved) (moved from trunk/lib/subversion_info.cc.in) (2 diffs)
• lib/subversion_revision.h (moved) (moved from trunk/lib/subversion_info.h)
• m4/yat_add_flag.m4 (modified) (2 diffs)
• m4/yat_am_macros.m4 (added)
• m4/yat_svn_release.m4 (modified) (2 diffs)
• man/Makefile.am (modified) (1 diff)
• test/init.sh.in (modified) (2 diffs)

trunk/Makefile.am

@@ -27 +27 @@
 SUBDIRS = yat lib bin man test
 
-EXTRA_DIST = build_support/move-if-change .release_year
-MOVE_IF_CHANGE = $(SHELL) $(top_srcdir)/build_support/move-if-change
 
 lazycheck recheck: all
@@ -36 +34 @@
   rm -rf svndigest *~
 
-.PHONY: .release_year.tmp recheck
-if HAVE_SVN_WC
-# update copyright year automatically (if we build from svn wc)
-$(srcdir)/.release_year: $(builddir)/.release_year.tmp
-  @$(MOVE_IF_CHANGE) $(builddir)/.release_year.tmp $@
+.PHONY: recheck
 
-$(builddir)/.release_year.tmp:
-  @if ($(SVNVERSION) $(top_srcdir) | $(GREP) M > /dev/null); then \
-     date -u "+%Y" > $@; \
-  else \
-     cp $(srcdir)/.release_year $@; \
-  fi
-endif
+## need to declare these variables here so they can be appended below
+BUILT_SOURCES = 
+CLEANFILES = 
+CONFIG_STATUS_DEPENDENCIES = 
+DISTCLEANFILES =
+EXTRA_DIST = 
 
+include $(top_srcdir)/svn_revision.am
+include $(top_srcdir)/svn_revision_header.am
+
+include $(top_srcdir)/svn_release_year.am
 
 ##############################################################

trunk/configure.ac

@@ -13 +13 @@
 # Copyright (C) 2006 Jari Häkkinen
 # Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -47 +48 @@
            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])
 AC_SUBST([SVNDIGEST_MINOR_VERSION], [MINOR_VERSION])
@@ -173 +167 @@
 LIBS=$save_LIBS
 AC_SUBST([SVN_LIBS])
-
-
-# check if svnversion is installed
-AC_PATH_PROG([SVNVERSION], [svnversion], [no])
 
 # PLplot API checks
@@ -267 +257 @@
 AC_SUBST(PLPLOT_LIBS)
 
-# checking if we build in a subversion WC
-AS_IF([test -d $srcdir/.svn], [wc_found="yes"], [wc_found="no"])
-AM_CONDITIONAL([HAVE_SVN_WC], [test "$wc_found" = "yes"])
-AC_SUBST([wc_found])
-
 # checking if we have test repo
 test_repo_filename=$srcdir/test/repo;
@@ -286 +271 @@
 AC_CONFIG_FILES([test/svn_update.sh], [chmod +x test/svn_update.sh])
 
-dnl maintainer make rukes from yat project
+dnl maintainer make rules from yat project
 YAT_SVN_RELEASE
+YAT_SVN_REVISION
+YAT_REVISION_HEADER
+YAT_SVN_RELEASE_YEAR
+
 
 # Restore FLAGS
@@ -311 +300 @@
 all_reqs_ok="true"
 
-if (test "$wc_found" = "yes"); then 
+AS_VAR_IF([have_svn_wc], [yes], [
    AC_MSG_CHECKING([help2man])
    # redirecting potential error msg to log file
@@ -325 +314 @@
           [                             ], 79))
    ]) 
-   # svnversion is required when building from svn wc
-   if (test "x$SVNVERSION" = "xno"); then
-      all_reqs_ok="false";
-      AC_MSG_WARN([dnl
-Cannot find svnversion, which is required when building from a
-subversion working copy. Please install svnversion and make sure it is
-in your search path.]);
-   fi
    if (test "$test_repo_found" = "no"); then
       all_reqs_ok="false";
@@ -340 +321 @@
 update in top directory.]);
    fi
-fi
+])
 
 # Non-existing APR is fatal -- sub-sequent compilation will fail.

trunk/lib/Makefile.am

@@ -22 +22 @@
 # along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 
-MOVE_IF_CHANGE = $(SHELL) $(top_srcdir)/build_support/move-if-change
-SVN_REVISION = `$(SVNVERSION) $(top_srcdir)`
-
 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
@@ -39 +36 @@
   main_utility.h Node.h NodeCounter.h NodePrinter.h NodeVisitor.h \
   OptionVersion.h rmdirhier.h \
-  Stats.h StatsCollection.h StatsPlotter.h subversion_info.h \
+  Stats.h StatsCollection.h StatsPlotter.h subversion_revision.h \
   SvndigestVisitor.h SVN.h SVNblame.h \
   SVNdiff.h SVNinfo.h SVNlog.h SVNproperty.h TinyStats.h \
@@ -60 +57 @@
   html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
   NodeCounter.cc OptionVersion.cc \
-  rmdirhier.cc Stats.cc StatsCollection.cc SVN.cc \
+  rmdirhier.cc Stats.cc StatsCollection.cc subversion_revision.cc SVN.cc \
   SVNblame.cc SVNdiff.cc SVNinfo.cc \
   SVNlog.cc SVNproperty.cc TinyStats.cc \
   Trac.cc utility.cc Vector.cc
-
-nodist_libsvndigest_core_a_SOURCES = subversion_info.cc
-
-
 
 clean-local: 
@@ -74 +67 @@
 all-local:
 
-EXTRA_DIST = subversion_info.cc.in .revision
-CLEANFILES = subversion_info.cc
 
-if HAVE_SVN_WC
-$(srcdir)/.revision: FORCE
-  @$(SVNVERSION) $(top_srcdir) > $@-t && $(MOVE_IF_CHANGE) $@-t $@
-else
-## this is needed in 'svn export' build
-$(srcdir)/.revision:
-  echo "" > $@
-endif
-
-subversion_info.cc: $(srcdir)/subversion_info.cc.in $(srcdir)/.revision 
-  @rm -f $@-t $@ && \
-  { revision=`cat $(srcdir)/.revision`; \
-    echo '// DO NOT EDIT! GENERATED AUTOMATICALLY!' && \
-    $(SED) -e 's/sub_2_svn_revision/r'$$revision'/g' \
-    < $(srcdir)/subversion_info.cc.in; \
-  } > $@-t && mv $@-t $@ 
-
-FORCE:

trunk/lib/OptionVersion.cc

@@ -23 +23 @@
 
 #include "OptionVersion.h"
-#include "subversion_info.h"
+#include "subversion_revision.h"
 #include "utility.h"
 

trunk/lib/html_utility.cc

@@ -29 +29 @@
 #include "Date.h"
 #include "HtmlStream.h"
-#include "subversion_info.h"
+#include "subversion_revision.h"
 
 #include <cassert>

trunk/lib/subversion_revision.cc

@@ -20 +20 @@
 */
 
-#include "subversion_info.h"
+#include "subversion_revision.h"
+#include "svn_revision.h"
 #include <string>
 
@@ -40 +41 @@
   std::string svn_revision(void)
   {
-    return "sub_2_svn_revision";
+    return SVN_REVISION;
   }
 

trunk/m4/yat_add_flag.m4

@@ -1 @@
-## $Id: yat_add_flag.m4 2107 2009-11-07 15:53:27Z peter $
+## $Id: yat_add_flag.m4 2202 2010-02-21 18:39:13Z peter $
 
 # SYNOPSIS
@@ -17 +17 @@
 # LAST MODIFICATION
 #
-#   $Date: 2009-11-07 10:53:27 -0500 (Sat, 07 Nov 2009) $
+#   $Date: 2010-02-21 13:39:13 -0500 (Sun, 21 Feb 2010) $
 #
 # COPYLEFT

trunk/m4/yat_svn_release.m4

@@ -1 @@
-## $Id: yat_svn_release.m4 2350 2010-11-21 15:35:23Z peter $
+## $Id: yat_svn_release.m4 2425 2011-02-12 23:54:53Z peter $
 
-# serial 4 (yat 0.7)
+# serial 5 (yat 0.8)
 
 # SYNOPSIS
@@ -13 +13 @@
 #     include $(srcdir)/maintainer.am
 #
-#   to your top Makefile.am.
+#   in your top Makefile.am. The main targets are `maintainer-check'
+#   and `release'. maintainer-check 'svn exports' from the local wc
+#   and try to build from this pristine directory via './boostrap;
+#   ./configure $(DISTCHECK_CONFIGURE_FLAGS); make'. You can add
+#   additional target that should be run within maintainer-check by
+#   defining variable `MAINTAINER_CHECK_LOCAL'. The target `release'
+#   runs `maintainer-check' in addition to some more sanity checks
+#   such as checking that wc is not modified compared with repository
+#   and finishes by running distcheck.
 #
 # COPYLEFT
 m4_define([yat_svn_release_copyright], [
 #
-#   Copyright (C) 2009, 2010 Peter Johansson
+#   Copyright (C) 2009, 2010, 2011 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat

trunk/man/Makefile.am

@@ -34 +34 @@
 # We depend on configure to catch VERSION changes, Makefile.in to
 # catch rules changes, svndigest.x is an obvious dependency, and
-# subversion_info.cc changes for every revsion.
+# lib/.revision changes for every revsion.
 man_deps=$(top_srcdir)/configure $(srcdir)/Makefile.in \
-  $(srcdir)/svndigest.x $(top_srcdir)/lib/subversion_info.cc
+  $(srcdir)/svndigest.x $(top_srcdir)/lib/.revision
 
 $(srcdir)/svndigest.1: $(man_deps)

trunk/test/init.sh.in

@@ -48 +48 @@
 shell=@SHELL@
 test_repo_found=@test_repo_found@
-wc_found="@wc_found@"
+have_svn_wc="@have_svn_wc@"
 
 test -z "$SVNDIGEST" && SVNDIGEST="${abs_top_builddir}/bin/svndigest";
@@ -81 +81 @@
       fi;;
     wc)
-      if test x$wc_found = xno; then
+      if test x$have_svn_wc = xno; then
         exit_skip "not subversion working copy";
       fi;;