Changeset 1182


Ignore:
Timestamp:
Aug 25, 2010, 3:02:41 AM (9 years ago)
Author:
Peter Johansson
Message:

Merge release 0.8 into trunk

Location:
trunk
Files:
23 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/.svndigest/config

    r1038 r1182  
    8484bootstrap = "#":"\n"
    8585Makefile = "#":"\n"
     86Portfile = "#":"\n"
  • trunk/Makefile.am

    r1119 r1182  
    7171  { echo incorrect svn revision - expected single unmodified revision 1>&2; \
    7272    exit 1; }
     73
     74# run in end of release target
     75RELEASE_HOOK = build_support/Portfile
     76
     77edit = $(SED) \
     78  -e 's|@PACKAGE_URL[@]|$(PACKAGE_URL)|g' \
     79  -e 's|@VERSION[@]|$(VERSION)|g'
     80
     81build_support/Portfile: Makefile build_support/Portfile.in $(distdir).tar.gz.MD5
     82  @rm -f $@ $@.t
     83  @md5sum=`cut -f 1 -d ' ' $(distdir).tar.gz.MD5`;\
     84  $(edit) -e "s|@MD5SUM[@]|$$md5sum|g" '$(srcdir)/$@.in' > $@.t
     85  @chmod a-w $@.t
     86  @mv $@.t $@
     87  @echo "creating $@"
  • trunk/NEWS

    r1156 r1182  
    1616    http://dev.thep.lu.se/svndigest/svn/branches/0.8-stable
    1717
    18 Version 0.8 (released NOT YET)
     18Version 0.8 (released 25 August 2010)
    1919  - cache file now contains config information (ticket #433)
    2020  - Gnuplot replaced with plplot (ticket:97)
    2121  - option --copyright deprecated; use new program snvcopyright (ticket #307)
     22  - new program svndigest-copy-cache (ticket #380)
    2223  - new option --format (ticket:438)
    2324  - new option --anchor-format (ticket:279)
     
    2728  - new default codon for `*.R` in config file (ticket:432)
    2829  - image format is configurable, refer to Manual (ticket:405)
     30  - color of different author is configurable (ticket #75 #413)
    2931
    3032  A complete list of closed tickets can be found here [[br]]
     
    3537
    3638Version 0.7.5 (released 3 July 2010)
     39  - now handles the case when parts of repository is not readable (bug #458)
    3740
    3841  A complete list of closed tickets can be found here [[br]]
    3942  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.7.5
    40   - now handles the case when parts of repository is not readable (bug #458)
    4143
    4244Version 0.7.4 (released 8 June 2010)
  • trunk/README

    r978 r1182  
    2525svndigest can be obtained from
    2626
    27   http://dev.thep.lu.se/svndigest/wiki/DownloadPage
     27   https://sourceforge.net/projects/svndigest/files/
    2828
    2929
     
    4343   consequence, the dependency is inherited by svndigest.
    4444
    45  * PLplot, http://plplot.sourceforge.net, is used to generate graphics
    46    in the output. You can build svndigest without PLplot if you run
    47    configure with `--without-plplot`.
     45 * PLplot, http://plplot.sourceforge.net, version 5.9.6 (or newer) is
     46   required to generate graphics in the output. You can build
     47   svndigest without PLplot if you run configure with
     48   `--without-plplot`. If you output plots in PNG format, it is
     49   recommended to install plplot with pngcairo or pngqt devices.
    4850
    4951 * pkg-config utility, http://pkg-config.freedesktop.org, is used to
     
    103105  http://dev.thep.lu.se/svndigest/newticket
    104106
    105 Use user `svndigest` and password `svndigest`.
     107Use user `svndigest` and password `svndigest`. For more details please
     108refer to section 'Reporting failures' in file `test/README`.
    106109
    107110
     
    123126Copyright (C) 2005, 2006 Jari Häkkinen
    124127Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
     128Copyright (C) 2010 Peter Johansson
    125129
    126130This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/bin/Makefile.am

    r1173 r1182  
    3434LDADD = $(top_builddir)/lib/libsvndigest.a \
    3535  $(top_builddir)/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    36 AM_LDFLAGS = $(PLPLOT_LDFLAGS) $(APR_LDFLAGS) $(SVN_LDFLAGS)
     36AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    3737
    38 AM_CPPFLAGS  = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \
    39   $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
    40 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
     38AM_CPPFLAGS  = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
     39AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    4140
    4241##svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)
  • trunk/bin/svndigest.cc

    r1157 r1182  
    22
    33/*
    4   Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    5   Copyright (C) 2010 Peter Johansson
     4  Copyright (C) 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
    65
    76  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    6261int main( int argc, char* argv[])
    6362{
     63  // Need to create an instance of Graph (plstream) since there is a
     64  // bug in plplot with dynamic loading of runtime libraries. The
     65  // issue is reported in the plplot issue tracking system
     66  // https://sf.net/tracker/?func=detail&aid=3009045&group_id=2915&atid=102915
     67  // and as http://dev.thep.lu.se/svndigest/ticket/472. Simply remove
     68  // this comment and the next line of code when plplot developers
     69  // fixes their bug.
     70  //
     71  // Omitting the dummy instance will cause segmentation fault.
     72  Graph dummy_never_used("/dev/null", "png");
    6473
    6574  // Reading commandline options
  • trunk/configure.ac

    r1172 r1182  
    1212# Copyright (C) 2005 Jari Häkkinen, Peter Johansson
    1313# Copyright (C) 2006 Jari Häkkinen
    14 # Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    15 # Copyright (C) 2010 Peter Johansson
     14# Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
    1615#
    1716# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3332
    3433m4_include([m4/version.m4])
    35 AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),[jari@thep.lu.se],,
     34AC_INIT([svndigest], m4_defn([SVNDIGEST_VERSION]),
     35        [svndigest-users@lists.sourceforge.net],,
    3636        [http://dev.thep.lu.se/svndigest])
    3737AC_CONFIG_SRCDIR([lib/File.h])
     
    107107AC_PROG_RANLIB
    108108AC_PROG_SED
    109 AC_PATH_PROG([HELP2MAN], [help2man], [no])
     109AM_MISSING_PROG([HELP2MAN], [help2man])
    110110# look for pkg-config
    111111PKG_PROG_PKG_CONFIG([0.23])
     
    142142    for i in $apr_link_ld; do
    143143      AS_IF([test ${i:0:2} = "-l"],[APR_LIBS="$i $APR_LIBS"],
    144             [YAT_LD_ADD_FLAG([APR_LDFLAGS], [$i])])
     144            [YAT_LD_ADD_FLAG([LDFLAGS], [$i])])
    145145    done
    146     YAT_CPP_ADD_FLAG([APR_CPPFLAGS],[`$apr_config --includes --cppflags`])
    147     save_CPPFLAGS=$CPPFLAGS
    148     CPPFLAGS="$APR_CPPFLAGS $CPPFLAGS"
     146    YAT_CPP_ADD_FLAG([CPPFLAGS],[`$apr_config --includes --cppflags`])
    149147    AC_CHECK_HEADER([apr_allocator.h],,[apr_found="no"])
    150     CPPFLAGS=$save_CPPFLAGS
    151 fi
    152 AC_SUBST([APR_CPPFLAGS])
    153 AC_SUBST([APR_LDFLAGS])
     148fi
    154149AC_SUBST([APR_LIBS])
    155150
     
    165160    with_svn=`cd $with_svn && pwd`
    166161    DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn"
    167     YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$with_svn/lib])
    168     YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$with_svn/include])
     162    YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_svn/lib])
     163    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_svn/include])
    169164  ])
    170165# svn needs needs apr headers
    171 save_CPPFLAGS=$CPPFLAGS
    172 CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS $CPPFLAGS"
    173166AC_CHECK_HEADER([subversion-1/svn_types.h],,[svn_found="no"])
    174 CPPFLAGS=$save_CPPFLAGS
    175 
    176 save_LDFLAGS=$LDFLAGS
     167
    177168save_LIBS=$LIBS
    178169tmp_LIBS="$APR_LIBS $save_LIBS"
    179170LIBS=""
    180 LDFLAGS="$SVN_LDFLAGS $APR_LDFLAGS"
    181171AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
    182172               [], [svn_found="no"], [$tmp_LIBS])
     
    188178SVN_LIBS=$LIBS
    189179LIBS=$save_LIBS
    190 LDFLAGS=$save_LDFLAGS
    191 AC_SUBST([SVN_CPPFLAGS])
    192 AC_SUBST([SVN_LDFLAGS])
    193180AC_SUBST([SVN_LIBS])
    194181
     
    201188# error is detected.
    202189plplot_found="yes"
    203 plplot_version=5.9
     190plplot_version=5.9.6
    204191save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
    205192AC_ARG_WITH([plplot],
     
    235222  # copy flags if we have found pc file
    236223  AS_IF([test "$use_plplot_pc" = "yes"], [
    237     YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     224    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
    238225    PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
    239226  ],[
     
    241228    PLPLOT_LIBS="-lplplotcxxd -lplplotd";
    242229    AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    243       YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [-L$with_plplot/lib])
     230      YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
    244231    ])
    245232  ])
     
    247234  # `PREFIX/include/plplot' rather than `PREFIX/include'
    248235  AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    249     YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [-I$with_plplot/include])
     236    YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_plplot/include])
    250237  ])
    251238])
    252239                 
    253240AS_IF([test "x$plplot_found" = "xyes"], [
    254   save_CPPFLAGS=$CPPFLAGS
    255   CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
    256241  AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
    257   CPPFLAGS=$save_CPPFLAGS
    258242])
    259243
     
    264248    AC_MSG_RESULT([yes])
    265249  ],[
    266     AC_MSG_RESULT([`$PKG_CONFIG --modversion= plplotd-c++`])
     250    have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
     251    AC_MSG_RESULT([$have_plplot_version])
    267252    plplot_found="old"
    268253  ])
     
    270255
    271256AS_IF([test "x$plplot_found" = "xyes"], [
    272   save_CPPFLAGS=$CPPFLAGS
    273   CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
    274   save_LDFLAGS=$LDFLAGS
    275   LDFLAGS="$PLPLOT_LDFLAGS $LDFLAGS"
    276257  save_LIBS=$LIBS
    277258  LIBS="$PLPLOT_LIBS $LIBS"
     
    286267                 [AC_MSG_RESULT([no])
    287268                  plplot_found=nolib;])
    288   CPPFLAGS=$save_CPPFLAGS
    289   LDFLAGS=$save_LDFLAGS
    290269  LIBS=$save_LIBS
    291270])
    292271# restore variable
    293272export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
    294 AC_SUBST(PLPLOT_CPPFLAGS)
    295 AC_SUBST(PLPLOT_LDFLAGS)
    296273AC_SUBST(PLPLOT_LIBS)
    297274
     
    319296
    320297# Restore FLAGS
    321 APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [DEFAULT_])
    322 APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [DEFAULT_])
     298APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [SVNDIGEST_])
     299APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [SVNDIGEST_])
     300APR_RESTORE_THE_ENVIRONMENT([LDFLAGS], [SVNDIGEST_])
    323301
    324302AC_CONFIG_FILES([Makefile
     
    340318
    341319if (test "$wc_found" = "yes"); then
    342    if test x$HELP2MAN = xno; then
     320   AC_MSG_CHECKING([help2man])
     321   # redirecting potential error msg to log file
     322   AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
     323         [AC_MSG_RESULT([yes])],
     324         [AC_MSG_RESULT([no])
    343325     AC_MSG_WARN(m4_text_wrap(m4_normalize([
    344326       `help2man' is missing on your system.  You will not be
     
    348330       ]),[                   ],
    349331          [                             ], 79))
    350    fi
     332   ])
    351333   # svnversion is required when building from svn wc
    352    if (test "$svnversion" = "no"); then
     334   if (test "x$SVNVERSION" = "xno"); then
    353335      all_reqs_ok="false";
    354336      AC_MSG_WARN([dnl
     
    427409+++++++++++++++++++++++++++++++++++++++++++++++
    428410  Compiler:           $CXX
    429   Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS
    430     CPPFLAGS:         $CPPFLAGS
    431     DEFAULT_CPPFLAGS: $DEFAULT_CPPFLAGS
    432     APR_CPPFLAGS:     $APR_CPPFLAGS
    433     SVN_CPPFLAGS:     $SVN_CPPFLAGS
    434     PLPLOT_CPPFLAGS:  $PLPLOT_CPPFLAGS
     411  Preprocessor flags:
     412    CPPFLAGS:           $CPPFLAGS
     413    SVNDIGEST_CPPFLAGS: $SVNDIGEST_CPPFLAGS
    435414  C++ flags:
    436     CXXFLAGS:         $CXXFLAGS
    437     DEFAULT_CXXFLAGS: $DEFAULT_CXXFLAGS
     415    CXXFLAGS:           $CXXFLAGS
     416    SVNDIGEST_CXXFLAGS: $SVNDIGEST_CXXFLAGS
    438417  Linker flags:
    439     LDFLAGS:          $LDFLAGS
    440     APR_LDFLAGS:      $APR_LDFLAGS
    441     SVN_LDFLAGS:      $SVN_LDFLAGS
    442     PLPLOT_LDFLAGS:   $PLPLOT_LDFLAGS
     418    LDFLAGS:            $LDFLAGS
     419    SVNDIGEST_LDFLAGS:  $SVNDIGEST_LDFLAGS
    443420  Libraries:         
    444     LIBS              $LIBS
    445     APR_LIBS          $APR_LIBS
    446     SVN_LIBS          $SVN_LIBS
    447     PLPLOT_LIBS       $PLPLOT_LIBS
     421    LIBS                $LIBS
     422    APR_LIBS            $APR_LIBS
     423    SVN_LIBS            $SVN_LIBS
     424    PLPLOT_LIBS         $PLPLOT_LIBS
    448425+++++++++++++++++++++++++++++++++++++++++++++++]dnl
    449426)
  • trunk/lib/Graph.cc

    r1126 r1182  
    4343    legend_.reserve(10);
    4444    // we use color map 0 position 0 for background color
    45     if (format=="png")
    46       pls_.scolbg(255,255,255);
    47     else
    48       pls_.scolbga(255,255,255,0);
     45    pls_.scolbga(255,255,255,0);
    4946    pls_.setopt("geometry", "600x500");
    5047    pls_.init();
  • trunk/lib/Makefile.am

    r1168 r1182  
    2525SVN_REVISION = `$(SVNVERSION) $(top_srcdir)`
    2626
    27 AM_CPPFLAGS = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \
    28   $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
    29 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
     27AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
     28AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    3029
    3130noinst_LIBRARIES = libsvndigest.a
  • trunk/lib/css.cc

    r1090 r1182  
    3838      << "Copyright (C) 2006 Peter Johansson\n"
    3939      << "Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson\n"
    40       << "Copyright (C) 2009 Peter Johansson\n"
     40      << "Copyright (C) 2009, 2010 Peter Johansson\n"
    4141      << "\nThis file is part of svndigest, "
    4242      << "http://dev.thep.lu.se/svndigest\n\n"
  • trunk/m4/apache_LICENSE-2.0.txt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxx_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxxcpp_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_ld_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/find_apr.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/pkg.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/yat_add_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/yat_svn_release.m4

    r874 r1182  
    1 ## $Id: yat_svn_release.m4 2116 2009-11-22 04:33:23Z peter $
     1## $Id: yat_svn_release.m4 2301 2010-07-24 01:12:27Z peter $
    22
    3 # serial
     3# serial 3 (yat 0.7)
    44
    55# SYNOPSIS
     
    1818m4_define([yat_svn_release_copyright], [
    1919#
    20 #   Copyright (C) 2009 Peter Johansson
     20#   Copyright (C) 2009, 2010 Peter Johansson
    2121#
    2222#   This file is part of the yat library, http://dev.thep.lu.se/yat
     
    4242  AC_REQUIRE([AC_PROG_EGREP])       
    4343  AC_CHECK_PROGS([MD5], [md5sum gmd5sum md5 md5deep], [no])
    44   m4_pushdef([YAT_OUTPUTFILE], [maintainer.am])
     44  m4_pushdef([YAT_OUTPUTFILE], [m4_default([$1], [maintainer.am])])
    4545
    46   AX_AC_PRINT_TO_FILE([maintainer.am],
     46  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE,
    4747[#  ]YAT_OUTPUTFILE[ generated by autoconf from $0
    4848]yat_svn_release_copyright[
     
    7373  *\"\$\$today\"*);; \\
    7474  *) \\
    75     echo \"NEWS: release date incorrect; expected '\$\$date'\" 1>&2;\\
     75    echo \"NEWS: release date incorrect; expected '\$\$today'\" 1>&2;\\
    7676    exit 1;; \\
    7777  esac
     
    113113    \$(MD5) \$\$a > \$\$a.MD5; \\
    114114  done;
     115  @test -z \"\$(RELEASE_HOOK)\" || \$(MAKE) \$(AM_MAKEFLAGS) \$(RELEASE_HOOK)
    115116])
    116117  m4_popdef([YAT_OUTPUTFILE])
  • trunk/test/Makefile.am

    r1173 r1182  
    2828EXTRA_PROGRAMS = cache_partial.test color.test \
    2929  config.test copyright.test date.test \
    30   htmlstream.test \
     30  graph_test htmlstream.test \
    3131  parser.test stats.test svn_diff.test trac.test utility.test
    3232
     
    6060  $(top_builddir)/yat/libyat.a \
    6161  $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    62 AM_LDFLAGS = $(PLPLOT_LDFLAGS) $(APR_LDFLAGS) $(SVN_LDFLAGS)
     62AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    6363
    64 AM_CPPFLAGS = -I$(top_srcdir) $(APR_CPPFLAGS) $(SVN_CPPFLAGS) \
    65   $(DEFAULT_CPPFLAGS) $(PLPLOT_CPPFLAGS)
    66 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
     64AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
     65AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    6766
    6867libsvndigesttest_a_SOURCES = Suite.cc
  • trunk/test/Suite.cc

    r1162 r1182  
    5656      if (!have_test_repo) {
    5757        out() << "Skipping test because test repository is not available\n";
    58         ::exit (77);
     58        exit (EXIT_SKIP);
    5959      }
    6060      update_test_wc();
  • trunk/test/Suite.h

    r1162 r1182  
    66/*
    77  Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    8   Copyright (C) 2009 Peter Johansson
     8  Copyright (C) 2009, 2010 Peter Johansson
    99
    1010  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    2323  along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2424*/
     25
     26// used to tell automake that test should be skipped
     27#define EXIT_SKIP 77
    2528
    2629#include "environment.h"
  • trunk/test/repo/db/current

    r1117 r1182  
    1 69 2v 4
     170 2z 4
Note: See TracChangeset for help on using the changeset viewer.