Changeset 1598


Ignore:
Timestamp:
Aug 26, 2015, 5:11:38 PM (2 years ago)
Author:
jari
Message:

Merged release 0.10.3 to the trunk.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/NEWS

    r1579 r1598  
    1414svndigest 0.10.x series from
    1515  http://dev.thep.lu.se/svndigest/svn/branches/0.10-stable
     16
     17Version 0.10.3 (released 25 August 2015)
     18  - Fixed build system to work with the changes introduced in plplot
     19    5.11.x releases (ticket #532).
     20  - Improved help2man utility detection (ticket #530).
     21
     22  A complete list of closed tickets can be found here [[br]]
     23  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.10.3
    1624
    1725Version 0.10.2 (released 23 February 2015)
  • trunk/bin/svndigest.cc

    r1573 r1598  
    44        Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    55        Copyright (C) 2010, 2011, 2012 Peter Johansson
     6        Copyright (C) 2015 Jari Häkkinen
    67
    78        This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/configure.ac

    r1579 r1598  
    1313# Copyright (C) 2006 Jari Häkkinen
    1414# Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
    15 # Copyright (C) 2011, 2012, 2015 Peter Johansson
    16 # Copyright (C) 2015 Jari Häkkinen
     15# Copyright (C) 2011, 2012 Peter Johansson
     16# Copyright (C) 2015 Jari Häkkinen, Peter Johansson
    1717#
    1818# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    232232  ])
    233233
     234# PLPLOT_USE_D is set to character 'd' for plplot versions prior to
     235# 5.11 since library names changed in plplot 5.11, i.e., the 'd' to
     236# indicate double floating number precision was removed from library
     237# names.
     238PLPLOT_USE_D=
    234239use_plplot_pc="no"
    235240AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
    236   AC_MSG_CHECKING([for plplotd-c++.pc])
    237   AS_IF([$PKG_CONFIG --exists plplotd-c++], [
     241  # check for plplot 5.11 or later first
     242  AC_MSG_CHECKING([for plplot-c++.pc])
     243  AS_IF([$PKG_CONFIG --exists plplot-c++], [
    238244    AC_MSG_RESULT([yes])
    239245    use_plplot_pc="yes"
    240246  ],[
    241     AC_MSG_RESULT([no])
    242     AC_MSG_WARN([cannot find plplotd-c++;
    243       please use --with-plplot with appropriate argument to get more accurate
    244       configuration.])
     247                # fall back to check for plplot prior to version 5.11
     248    AC_MSG_CHECKING([for plplotd-c++.pc])
     249          AS_IF([$PKG_CONFIG --exists plplotd-c++], [
     250      AC_MSG_RESULT([yes])
     251      use_plplot_pc="yes"
     252                  # plplot prior to 5.11 found, use 'd'
     253                  PLPLOT_USE_D=d
     254                ],[
     255      AC_MSG_RESULT([no])
     256      AC_MSG_WARN([cannot find plplotd-c++ nor plplot-c++;
     257        please use --with-plplot with appropriate argument to get more accurate
     258        configuration.])
     259                ])
    245260  ])
    246261])
     
    255270    # substituting potential '/plplot' in PREFIX.
    256271    YAT_CPP_ADD_FLAG([CPPFLAGS],
    257              [`$PKG_CONFIG plplotd-c++ --cflags-only-I | sed 's|/plplot | |g'`])
    258     YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
    259     PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
     272             [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --cflags-only-I | sed 's|/plplot | |g'`])
     273    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-L`])
     274    PLPLOT_LIBS="`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-l --libs-only-other`"
    260275  ],[
    261276    # otherwise guess
    262     PLPLOT_LIBS="-lplplotcxxd -lplplotd";
     277    PLPLOT_LIBS="-lplplotcxx -lplplot";
    263278    AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    264279      YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
     
    274289AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
    275290  AC_MSG_CHECKING([plplot version >= $plplot_version])
    276   AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [
     291  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplot$PLPLOT_USE_D-c++], [
    277292    AC_MSG_RESULT([yes])
    278293  ],[
    279     have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
     294    have_plplot_version=`$PKG_CONFIG --modversion plplot$PLPLOT_USE_D-c++`
    280295    AC_MSG_RESULT([$have_plplot_version])
    281296    plplot_found="old"
     
    348363all_reqs_ok="true"
    349364
     365# checking for help2man, missing help2man is non-fatal but subsequent
     366# use of `make dist` and `make distcheck` is constructed to fail.
     367AC_MSG_CHECKING([help2man])
     368# redirecting potential error msg to log file
     369AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
     370      [have_help2man=yes], [have_help2man=no])
     371AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$have_help2man" = "xyes"])
     372AC_SUBST([have_help2man])
     373AC_MSG_RESULT([$have_help2man])
     374
     375# if we work in an svn wc we should have a test repository and warn if
     376# help2man missing
    350377AS_VAR_IF([have_svn_wc], [yes], [
    351    AC_MSG_CHECKING([help2man])
    352    # redirecting potential error msg to log file
    353    AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
    354          [AC_MSG_RESULT([yes])],
    355          [AC_MSG_RESULT([no])
    356            AC_MSG_WARN(m4_text_wrap(m4_normalize([
    357              `help2man' is missing on your system.  You will not be
    358              able to create the man page. A sound man page should be
    359              included in a distribution, and since you will not able
    360              to create a complete distribution `make dist' will fail.
    361              ]),[                   ],
    362                 [                             ], 79))
    363          ])
    364378   if (test "$test_repo_found" = "no"); then
    365379      all_reqs_ok="false";
    366       AC_MSG_WARN([dnl
    367 Cannot find test repository (test_repo_filename), which should be
    368 available when building from a subversion working copy. Try svn
    369 update in top directory.]);
     380      AC_MSG_WARN(m4_text_wrap(m4_normalize([
     381         Cannot find test repository (test/repo), which should be
     382         available when building from a subversion working copy.
     383         Try svn update in top directory.
     384         ]),
     385         [                   ],[                             ],79))
     386   fi
     387   if (test "$have_help2man" = "no"); then
     388       # non-fatal, only issue warning
     389       AC_MSG_WARN(m4_text_wrap(m4_normalize([
     390          `help2man' is missing on your system. You will not be
     391          able to create the man page. A sound man page should be
     392          included in a distribution, and since you will not able
     393          to create a complete distribution `make dist' will fail.
     394          ]),
     395          [                   ],[                             ],79))
    370396   fi
    371397])
  • trunk/m4/version.m4

  • trunk/man/Makefile.am

    r1532 r1598  
    44
    55# Copyright (C) 2008, 2009, 2010, 2011, 2012 Peter Johansson
     6# Copyright (C) 2015 Jari Häkkinen
    67#
    78# This file is part of svndigest, http://dev.thep.lu.se/trac/svndigest
     
    5354endif
    5455
     56if !HAVE_HELP2MAN
     57dist-hook:
     58        @echo "    help2man not found, cannot generate/update man pages."
     59        exit 1
     60endif
     61
    5562$(srcdir)/man/svndigest.1: $(svndigest_man_deps)
     63if HAVE_HELP2MAN
    5664        $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    5765        --include $(srcdir)/man/svndigest.x \
    5866        --version-option="--no-verbose --version" \
    5967        $(top_builddir)/bin/svndigest$(EXEEXT)
     68else
     69        @echo "    help2man not found, no $@ man page created"
     70        @echo "        'make dist' and 'make distcheck' will fail"
     71endif
    6072
    6173$(srcdir)/man/svncopyright.1: $(svncopyright_man_deps)
     74if HAVE_HELP2MAN
    6275        $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    6376        --include $(srcdir)/man/svndigest.x \
    6477        --version-option="--no-verbose --version" \
    6578        $(top_builddir)/bin/svncopyright$(EXEEXT)
     79else
     80        @echo "    help2man not found, no $@ man page created"
     81        @echo "        'make dist' and 'make distcheck' will fail"
     82endif
    6683
    6784$(srcdir)/man/svndigest-copy-cache.1: $(svndigest_copy_cache_man_deps)
     85if HAVE_HELP2MAN
    6886        $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    6987        --include $(srcdir)/man/svndigest.x \
    7088        --version-option="--no-verbose --version" \
    7189        $(top_builddir)/bin/svndigest-copy-cache$(EXEEXT)
    72 
     90else
     91        @echo "    help2man not found, no $@ man page created"
     92        @echo "        'make dist' and 'make distcheck' will fail"
     93endif
  • trunk/test/Makefile.am

    r1571 r1598  
    3636CLEANFILES += $(EXTRA_PROGRAMS)
    3737
    38 test_option_test_SOURCES = test/option.cc bin/Parameter.cc \
    39         bin/AbstractParameter.cc bin/svndigestParameter.cc
     38test_option_test_SOURCES = test/option.cc
    4039
    4140distributed_TESTS =
     
    8786test_libsvndigesttest_a_SOURCES = test/Suite.cc
    8887
     88## we need to link in some object files from bin/
     89test_option_test_LDADD = bin/Parameter.$(OBJEXT) \
     90        bin/AbstractParameter.$(OBJEXT) \
     91        bin/svndigestParameter.$(OBJEXT) $(LDADD)
     92
    8993.PHONY: lazycheck
    9094
  • trunk/test/repo_test.sh

    r1532 r1598  
    55# Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    66# Copyright (C) 2009, 2010, 2012 Peter Johansson
     7# Copyright (C) 2015 Jari Häkkinen
    78#
    89# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3233
    3334SVNDIGEST_run 0 -r $rootdir -t $targetdir --force
     35# the below test typically fails with plplot 5.11.0
    3436test -e stderr || exit_fail
    3537test -s stderr && exit_fail
Note: See TracChangeset for help on using the changeset viewer.