Changeset 1182

Timestamp:

Aug 25, 2010, 3:02:41 AM (13 years ago)

Author:

Peter Johansson

Message:

Merge release 0.8 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• .svndigest/config (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• NEWS (modified) (3 diffs)
• README (modified) (4 diffs)
• bin/Makefile.am (modified) (1 diff)
• bin/svndigest.cc (modified) (2 diffs)
• build_support/Portfile.in (copied) (copied from branches/0.8-stable/build_support/Portfile.in)
• configure.ac (modified) (17 diffs)
• lib/Graph.cc (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/css.cc (modified) (1 diff)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• m4/ax_cxx_check_flag.m4 (modified) (1 prop)
• m4/ax_cxxcpp_check_flag.m4 (modified) (1 prop)
• m4/ax_ld_check_flag.m4 (modified) (1 prop)
• m4/find_apr.m4 (modified) (1 prop)
• m4/pkg.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• m4/yat_svn_release.m4 (modified) (5 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/Suite.cc (modified) (1 diff)
• test/Suite.h (modified) (2 diffs)
• test/graph_test.cc (copied) (copied from branches/0.8-stable/test/graph_test.cc)
• test/repo/db/current (modified) (1 diff)
• test/repo/db/revprops/70 (copied) (copied from branches/0.8-stable/test/repo/db/revprops/70)
• test/repo/db/revs/70 (copied) (copied from branches/0.8-stable/test/repo/db/revs/70)

trunk/.svndigest/config

@@ -84 +84 @@
 bootstrap = "#":"\n"
 Makefile = "#":"\n"
+Portfile = "#":"\n"

trunk/Makefile.am

@@ -71 +71 @@
   { echo incorrect svn revision - expected single unmodified revision 1>&2; \
     exit 1; }
+
+# run in end of release target
+RELEASE_HOOK = build_support/Portfile
+
+edit = $(SED) \
+  -e 's|@PACKAGE_URL[@]|$(PACKAGE_URL)|g' \
+  -e 's|@VERSION[@]|$(VERSION)|g'
+
+build_support/Portfile: Makefile build_support/Portfile.in $(distdir).tar.gz.MD5
+  @rm -f $@ $@.t
+  @md5sum=`cut -f 1 -d ' ' $(distdir).tar.gz.MD5`;\
+  $(edit) -e "s|@MD5SUM[@]|$$md5sum|g" '$(srcdir)/$@.in' > $@.t
+  @chmod a-w $@.t
+  @mv $@.t $@
+  @echo "creating $@"

trunk/NEWS

@@ -16 +16 @@
     http://dev.thep.lu.se/svndigest/svn/branches/0.8-stable
 
-Version 0.8 (released NOT YET)
+Version 0.8 (released 25 August 2010)
   - cache file now contains config information (ticket #433)
   - Gnuplot replaced with plplot (ticket:97)
   - option --copyright deprecated; use new program snvcopyright (ticket #307)
+  - new program svndigest-copy-cache (ticket #380)
   - new option --format (ticket:438)
   - new option --anchor-format (ticket:279)
@@ -27 +28 @@
   - new default codon for `*.R` in config file (ticket:432)
   - image format is configurable, refer to Manual (ticket:405)
+  - color of different author is configurable (ticket #75 #413)
 
   A complete list of closed tickets can be found here [[br]]
@@ -35 +37 @@
 
 Version 0.7.5 (released 3 July 2010)
+  - now handles the case when parts of repository is not readable (bug #458)
 
   A complete list of closed tickets can be found here [[br]]
   http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.7.5
-  - now handles the case when parts of repository is not readable (bug #458)
 
 Version 0.7.4 (released 8 June 2010)

trunk/README

@@ -25 +25 @@
 svndigest can be obtained from 
 
-  http://dev.thep.lu.se/svndigest/wiki/DownloadPage
+   https://sourceforge.net/projects/svndigest/files/
 
 
@@ -43 +43 @@
    consequence, the dependency is inherited by svndigest.
 
- * PLplot, http://plplot.sourceforge.net, is used to generate graphics
-   in the output. You can build svndigest without PLplot if you run
-   configure with `--without-plplot`.
+ * PLplot, http://plplot.sourceforge.net, version 5.9.6 (or newer) is
+   required to generate graphics in the output. You can build
+   svndigest without PLplot if you run configure with
+   `--without-plplot`. If you output plots in PNG format, it is
+   recommended to install plplot with pngcairo or pngqt devices.
 
  * pkg-config utility, http://pkg-config.freedesktop.org, is used to
@@ -103 +105 @@
   http://dev.thep.lu.se/svndigest/newticket
 
-Use user `svndigest` and password `svndigest`.
+Use user `svndigest` and password `svndigest`. For more details please
+refer to section 'Reporting failures' in file `test/README`.
 
 
@@ -123 +126 @@
 Copyright (C) 2005, 2006 Jari Häkkinen
 Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
+Copyright (C) 2010 Peter Johansson
 
 This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/bin/Makefile.am

@@ -34 +34 @@
 LDADD = $(top_builddir)/lib/libsvndigest.a \
   $(top_builddir)/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
-AM_LDFLAGS = $(PLPLOT_LDFLAGS) $(APR_LDFLAGS) $(SVN_LDFLAGS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS  = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \
-  $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
-AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
+AM_CPPFLAGS  = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
 ##svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)

trunk/bin/svndigest.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -62 +61 @@
 int main( int argc, char* argv[])
 {
+  // Need to create an instance of Graph (plstream) since there is a
+  // bug in plplot with dynamic loading of runtime libraries. The
+  // issue is reported in the plplot issue tracking system
+  // https://sf.net/tracker/?func=detail&aid=3009045&group_id=2915&atid=102915
+  // and as http://dev.thep.lu.se/svndigest/ticket/472. Simply remove
+  // this comment and the next line of code when plplot developers
+  // fixes their bug.
+  //
+  // Omitting the dummy instance will cause segmentation fault.
+  Graph dummy_never_used("/dev/null", "png");
 
   // Reading commandline options

trunk/configure.ac

@@ -12 +12 @@
 # Copyright (C) 2005 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2006 Jari Häkkinen
-# Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2010 Peter Johansson
+# Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -33 +32 @@
 
 m4_include([m4/version.m4])
-AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),[jari@thep.lu.se],,
+AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),
+        [svndigest-users@lists.sourceforge.net],,
         [http://dev.thep.lu.se/svndigest])
 AC_CONFIG_SRCDIR([lib/File.h])
@@ -107 +107 @@
 AC_PROG_RANLIB
 AC_PROG_SED
-AC_PATH_PROG([HELP2MAN], [help2man], [no])
+AM_MISSING_PROG([HELP2MAN], [help2man])
 # look for pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
@@ -142 +142 @@
     for i in $apr_link_ld; do
       AS_IF([test ${i:0:2} = "-l"],[APR_LIBS="$i $APR_LIBS"],
-            [YAT_LD_ADD_FLAG([APR_LDFLAGS], [$i])])
+            [YAT_LD_ADD_FLAG([LDFLAGS], [$i])])
     done
-    YAT_CPP_ADD_FLAG([APR_CPPFLAGS],[`$apr_config --includes --cppflags`])
-    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$APR_CPPFLAGS $CPPFLAGS"
+    YAT_CPP_ADD_FLAG([CPPFLAGS],[`$apr_config --includes --cppflags`])
     AC_CHECK_HEADER([apr_allocator.h],,[apr_found="no"])
-    CPPFLAGS=$save_CPPFLAGS
-fi
-AC_SUBST([APR_CPPFLAGS])
-AC_SUBST([APR_LDFLAGS])
+fi
 AC_SUBST([APR_LIBS])
 
@@ -165 +160 @@
     with_svn=`cd $with_svn && pwd`
     DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn"
-    YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$with_svn/lib])
-    YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$with_svn/include])
+    YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_svn/lib])
+    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_svn/include])
   ])
 # svn needs needs apr headers
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS $CPPFLAGS"
 AC_CHECK_HEADER([subversion-1/svn_types.h],,[svn_found="no"])
-CPPFLAGS=$save_CPPFLAGS
-
-save_LDFLAGS=$LDFLAGS
+
 save_LIBS=$LIBS
 tmp_LIBS="$APR_LIBS $save_LIBS"
 LIBS=""
-LDFLAGS="$SVN_LDFLAGS $APR_LDFLAGS"
 AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
                [], [svn_found="no"], [$tmp_LIBS])
@@ -188 +178 @@
 SVN_LIBS=$LIBS
 LIBS=$save_LIBS
-LDFLAGS=$save_LDFLAGS
-AC_SUBST([SVN_CPPFLAGS])
-AC_SUBST([SVN_LDFLAGS])
 AC_SUBST([SVN_LIBS])
 
@@ -201 +188 @@
 # error is detected.
 plplot_found="yes"
-plplot_version=5.9
+plplot_version=5.9.6
 save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
 AC_ARG_WITH([plplot],
@@ -235 +222 @@
   # copy flags if we have found pc file
   AS_IF([test "$use_plplot_pc" = "yes"], [
-    YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
+    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
   ],[
@@ -241 +228 @@
     PLPLOT_LIBS="-lplplotcxxd -lplplotd";
     AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
-      YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [-L$with_plplot/lib])
+      YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
     ])
   ])
@@ -247 +234 @@
   # `PREFIX/include/plplot' rather than `PREFIX/include'
   AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
-    YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [-I$with_plplot/include])
+    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_plplot/include])
   ])
 ])
                   
 AS_IF([test "x$plplot_found" = "xyes"], [
-  save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
   AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
-  CPPFLAGS=$save_CPPFLAGS
 ])
 
@@ -264 +248 @@
     AC_MSG_RESULT([yes])
   ],[
-    AC_MSG_RESULT([`$PKG_CONFIG --modversion= plplotd-c++`])
+    have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
+    AC_MSG_RESULT([$have_plplot_version])
     plplot_found="old"
   ])
@@ -270 +255 @@
 
 AS_IF([test "x$plplot_found" = "xyes"], [
-  save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
-  save_LDFLAGS=$LDFLAGS
-  LDFLAGS="$PLPLOT_LDFLAGS $LDFLAGS"
   save_LIBS=$LIBS
   LIBS="$PLPLOT_LIBS $LIBS"
@@ -286 +267 @@
                  [AC_MSG_RESULT([no])
                   plplot_found=nolib;])
-  CPPFLAGS=$save_CPPFLAGS
-  LDFLAGS=$save_LDFLAGS
   LIBS=$save_LIBS
 ])
 # restore variable
 export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
-AC_SUBST(PLPLOT_CPPFLAGS)
-AC_SUBST(PLPLOT_LDFLAGS)
 AC_SUBST(PLPLOT_LIBS)
 
@@ -319 +296 @@
 
 # Restore FLAGS
-APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [DEFAULT_])
-APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [DEFAULT_])
+APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [SVNDIGEST_])
+APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [SVNDIGEST_])
+APR_RESTORE_THE_ENVIRONMENT([LDFLAGS], [SVNDIGEST_])
 
 AC_CONFIG_FILES([Makefile
@@ -340 +318 @@
 
 if (test "$wc_found" = "yes"); then 
-   if test x$HELP2MAN = xno; then
+   AC_MSG_CHECKING([help2man])
+   # redirecting potential error msg to log file
+   AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD], 
+         [AC_MSG_RESULT([yes])], 
+         [AC_MSG_RESULT([no])
      AC_MSG_WARN(m4_text_wrap(m4_normalize([
        `help2man' is missing on your system.  You will not be
@@ -348 +330 @@
        ]),[                   ],
           [                             ], 79))
-   fi 
+   ]) 
    # svnversion is required when building from svn wc
-   if (test "$svnversion" = "no"); then
+   if (test "x$SVNVERSION" = "xno"); then
       all_reqs_ok="false";
       AC_MSG_WARN([dnl
@@ -427 +409 @@
 +++++++++++++++++++++++++++++++++++++++++++++++
   Compiler:           $CXX
-  Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS
-    CPPFLAGS:         $CPPFLAGS
-    DEFAULT_CPPFLAGS: $DEFAULT_CPPFLAGS
-    APR_CPPFLAGS:     $APR_CPPFLAGS
-    SVN_CPPFLAGS:     $SVN_CPPFLAGS
-    PLPLOT_CPPFLAGS:  $PLPLOT_CPPFLAGS
+  Preprocessor flags:
+    CPPFLAGS:           $CPPFLAGS
+    SVNDIGEST_CPPFLAGS: $SVNDIGEST_CPPFLAGS
   C++ flags:
-    CXXFLAGS:         $CXXFLAGS
-    DEFAULT_CXXFLAGS: $DEFAULT_CXXFLAGS
+    CXXFLAGS:           $CXXFLAGS
+    SVNDIGEST_CXXFLAGS: $SVNDIGEST_CXXFLAGS
   Linker flags:
-    LDFLAGS:          $LDFLAGS
-    APR_LDFLAGS:      $APR_LDFLAGS
-    SVN_LDFLAGS:      $SVN_LDFLAGS
-    PLPLOT_LDFLAGS:   $PLPLOT_LDFLAGS
+    LDFLAGS:            $LDFLAGS
+    SVNDIGEST_LDFLAGS:  $SVNDIGEST_LDFLAGS
   Libraries:          
-    LIBS              $LIBS
-    APR_LIBS          $APR_LIBS
-    SVN_LIBS          $SVN_LIBS
-    PLPLOT_LIBS       $PLPLOT_LIBS
+    LIBS                $LIBS
+    APR_LIBS            $APR_LIBS
+    SVN_LIBS            $SVN_LIBS
+    PLPLOT_LIBS         $PLPLOT_LIBS
 +++++++++++++++++++++++++++++++++++++++++++++++]dnl
 )

trunk/lib/Graph.cc

@@ -43 +43 @@
     legend_.reserve(10);
     // we use color map 0 position 0 for background color
-    if (format=="png")
-      pls_.scolbg(255,255,255);
-    else
-      pls_.scolbga(255,255,255,0);
+    pls_.scolbga(255,255,255,0);
     pls_.setopt("geometry", "600x500");
     pls_.init();

trunk/lib/Makefile.am

@@ -25 +25 @@
 SVN_REVISION = `$(SVNVERSION) $(top_srcdir)`
 
-AM_CPPFLAGS = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \
-  $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
-AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
 noinst_LIBRARIES = libsvndigest.a

trunk/lib/css.cc

@@ -38 +38 @@
       << "Copyright (C) 2006 Peter Johansson\n"
       << "Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson\n"
-      << "Copyright (C) 2009 Peter Johansson\n"
+      << "Copyright (C) 2009, 2010 Peter Johansson\n"
       << "\nThis file is part of svndigest, " 
       << "http://dev.thep.lu.se/svndigest\n\n"

trunk/m4/yat_svn_release.m4

@@ -1 @@
-## $Id: yat_svn_release.m4 2116 2009-11-22 04:33:23Z peter $
+## $Id: yat_svn_release.m4 2301 2010-07-24 01:12:27Z peter $
 
-# serial 1  
+# serial 3 (yat 0.7)
 
 # SYNOPSIS
@@ -18 +18 @@
 m4_define([yat_svn_release_copyright], [
 #
-#   Copyright (C) 2009 Peter Johansson
+#   Copyright (C) 2009, 2010 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -42 +42 @@
   AC_REQUIRE([AC_PROG_EGREP])       
   AC_CHECK_PROGS([MD5], [md5sum gmd5sum md5 md5deep], [no])
-  m4_pushdef([YAT_OUTPUTFILE], [maintainer.am])
+  m4_pushdef([YAT_OUTPUTFILE], [m4_default([$1], [maintainer.am])])
 
-  AX_AC_PRINT_TO_FILE([maintainer.am], 
+  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE, 
 [#  ]YAT_OUTPUTFILE[ generated by autoconf from $0
 ]yat_svn_release_copyright[
@@ -73 +73 @@
   *\"\$\$today\"*);; \\
   *) \\
-    echo \"NEWS: release date incorrect; expected '\$\$date'\" 1>&2;\\
+    echo \"NEWS: release date incorrect; expected '\$\$today'\" 1>&2;\\
     exit 1;; \\
   esac
@@ -113 +113 @@
     \$(MD5) \$\$a > \$\$a.MD5; \\
   done;
+  @test -z \"\$(RELEASE_HOOK)\" || \$(MAKE) \$(AM_MAKEFLAGS) \$(RELEASE_HOOK)
 ])
   m4_popdef([YAT_OUTPUTFILE])

trunk/test/Makefile.am

@@ -28 +28 @@
 EXTRA_PROGRAMS = cache_partial.test color.test \
   config.test copyright.test date.test \
-  htmlstream.test \
+  graph_test htmlstream.test \
   parser.test stats.test svn_diff.test trac.test utility.test
 
@@ -60 +60 @@
   $(top_builddir)/yat/libyat.a \
   $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
-AM_LDFLAGS = $(PLPLOT_LDFLAGS) $(APR_LDFLAGS) $(SVN_LDFLAGS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir) $(APR_CPPFLAGS) $(SVN_CPPFLAGS) \
-  $(DEFAULT_CPPFLAGS) $(PLPLOT_CPPFLAGS)
-AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
 libsvndigesttest_a_SOURCES = Suite.cc

trunk/test/Suite.cc

@@ -56 +56 @@
       if (!have_test_repo) {
         out() << "Skipping test because test repository is not available\n";
-        ::exit (77);
+        exit (EXIT_SKIP);
       }
       update_test_wc();

trunk/test/Suite.h

@@ -6 +6 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -23 +23 @@
   along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 */
+
+// used to tell automake that test should be skipped
+#define EXIT_SKIP 77
 
 #include "environment.h"

trunk/test/repo/db/current

@@ -1 @@
-69 2v 4
+70 2z 4