Changeset 1598

Timestamp:

Aug 26, 2015, 5:11:38 PM (8 years ago)

Author:

Jari Häkkinen

Message:

Merged release 0.10.3 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (1 diff)
• bin/svndigest.cc (modified) (1 diff)
• configure.ac (modified) (5 diffs)
• m4/version.m4 (modified) (1 prop)
• man/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/repo_test.sh (modified) (2 diffs)

trunk/NEWS

@@ -14 +14 @@
 svndigest 0.10.x series from
   http://dev.thep.lu.se/svndigest/svn/branches/0.10-stable
+
+Version 0.10.3 (released 25 August 2015)
+  - Fixed build system to work with the changes introduced in plplot
+    5.11.x releases (ticket #532).
+  - Improved help2man utility detection (ticket #530).
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.10.3
 
 Version 0.10.2 (released 23 February 2015)

trunk/bin/svndigest.cc

@@ -4 +4 @@
   Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
   Copyright (C) 2010, 2011, 2012 Peter Johansson
+  Copyright (C) 2015 Jari Häkkinen
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest

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, 2012, 2015 Peter Johansson
-# Copyright (C) 2015 Jari Häkkinen
+# Copyright (C) 2011, 2012 Peter Johansson
+# Copyright (C) 2015 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -232 +232 @@
   ])
 
+# PLPLOT_USE_D is set to character 'd' for plplot versions prior to
+# 5.11 since library names changed in plplot 5.11, i.e., the 'd' to
+# indicate double floating number precision was removed from library
+# names.
+PLPLOT_USE_D=
 use_plplot_pc="no"
 AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
-  AC_MSG_CHECKING([for plplotd-c++.pc])
-  AS_IF([$PKG_CONFIG --exists plplotd-c++], [
+  # check for plplot 5.11 or later first
+  AC_MSG_CHECKING([for plplot-c++.pc])
+  AS_IF([$PKG_CONFIG --exists plplot-c++], [
     AC_MSG_RESULT([yes])
     use_plplot_pc="yes"
   ],[
-    AC_MSG_RESULT([no])
-    AC_MSG_WARN([cannot find plplotd-c++;
-      please use --with-plplot with appropriate argument to get more accurate
-      configuration.])
+    # fall back to check for plplot prior to version 5.11
+    AC_MSG_CHECKING([for plplotd-c++.pc])
+    AS_IF([$PKG_CONFIG --exists plplotd-c++], [
+      AC_MSG_RESULT([yes])
+      use_plplot_pc="yes"
+      # plplot prior to 5.11 found, use 'd'
+      PLPLOT_USE_D=d
+    ],[
+      AC_MSG_RESULT([no])
+      AC_MSG_WARN([cannot find plplotd-c++ nor plplot-c++;
+        please use --with-plplot with appropriate argument to get more accurate
+        configuration.])
+    ])
   ])
 ])
@@ -255 +270 @@
     # substituting potential '/plplot' in PREFIX.
     YAT_CPP_ADD_FLAG([CPPFLAGS],
-             [`$PKG_CONFIG plplotd-c++ --cflags-only-I | sed 's|/plplot | |g'`])
-    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
-    PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
+             [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --cflags-only-I | sed 's|/plplot | |g'`])
+    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-L`])
+    PLPLOT_LIBS="`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-l --libs-only-other`"
   ],[
     # otherwise guess
-    PLPLOT_LIBS="-lplplotcxxd -lplplotd";
+    PLPLOT_LIBS="-lplplotcxx -lplplot";
     AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
       YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
@@ -274 +289 @@
 AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
   AC_MSG_CHECKING([plplot version >= $plplot_version])
-  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [
+  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplot$PLPLOT_USE_D-c++], [
     AC_MSG_RESULT([yes])
   ],[
-    have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
+    have_plplot_version=`$PKG_CONFIG --modversion plplot$PLPLOT_USE_D-c++`
     AC_MSG_RESULT([$have_plplot_version])
     plplot_found="old"
@@ -348 +363 @@
 all_reqs_ok="true"
 
+# checking for help2man, missing help2man is non-fatal but subsequent
+# use of `make dist` and `make distcheck` is constructed to fail.
+AC_MSG_CHECKING([help2man])
+# redirecting potential error msg to log file
+AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
+      [have_help2man=yes], [have_help2man=no])
+AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$have_help2man" = "xyes"])
+AC_SUBST([have_help2man])
+AC_MSG_RESULT([$have_help2man])
+
+# if we work in an svn wc we should have a test repository and warn if
+# help2man missing
 AS_VAR_IF([have_svn_wc], [yes], [
-   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
-       able to create the man page. A sound man page should be
-       included in a distribution, and since you will not able
-       to create a complete distribution `make dist' will fail.
-       ]),[                   ],
-          [                             ], 79))
-   ])
    if (test "$test_repo_found" = "no"); then
       all_reqs_ok="false";
-      AC_MSG_WARN([dnl
-Cannot find test repository (test_repo_filename), which should be
-available when building from a subversion working copy. Try svn
-update in top directory.]);
+      AC_MSG_WARN(m4_text_wrap(m4_normalize([
+         Cannot find test repository (test/repo), which should be
+   available when building from a subversion working copy.
+   Try svn update in top directory.
+   ]),
+   [                   ],[                             ],79))
+   fi
+   if (test "$have_help2man" = "no"); then
+       # non-fatal, only issue warning
+       AC_MSG_WARN(m4_text_wrap(m4_normalize([
+          `help2man' is missing on your system. You will not be
+    able to create the man page. A sound man page should be
+    included in a distribution, and since you will not able
+    to create a complete distribution `make dist' will fail.
+    ]),
+    [                   ],[                             ],79))
    fi
 ])

trunk/man/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2008, 2009, 2010, 2011, 2012 Peter Johansson
+# Copyright (C) 2015 Jari Häkkinen
 #
 # This file is part of svndigest, http://dev.thep.lu.se/trac/svndigest
@@ -53 +54 @@
 endif
 
+if !HAVE_HELP2MAN
+dist-hook:
+  @echo "    help2man not found, cannot generate/update man pages."
+  exit 1
+endif
+
 $(srcdir)/man/svndigest.1: $(svndigest_man_deps)
+if HAVE_HELP2MAN
   $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
   --include $(srcdir)/man/svndigest.x \
   --version-option="--no-verbose --version" \
   $(top_builddir)/bin/svndigest$(EXEEXT)
+else
+  @echo "    help2man not found, no $@ man page created"
+  @echo "        'make dist' and 'make distcheck' will fail"
+endif
 
 $(srcdir)/man/svncopyright.1: $(svncopyright_man_deps)
+if HAVE_HELP2MAN
   $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
   --include $(srcdir)/man/svndigest.x \
   --version-option="--no-verbose --version" \
   $(top_builddir)/bin/svncopyright$(EXEEXT)
+else
+  @echo "    help2man not found, no $@ man page created"
+  @echo "        'make dist' and 'make distcheck' will fail"
+endif
 
 $(srcdir)/man/svndigest-copy-cache.1: $(svndigest_copy_cache_man_deps)
+if HAVE_HELP2MAN
   $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
   --include $(srcdir)/man/svndigest.x \
   --version-option="--no-verbose --version" \
   $(top_builddir)/bin/svndigest-copy-cache$(EXEEXT)
-
+else
+  @echo "    help2man not found, no $@ man page created"
+  @echo "        'make dist' and 'make distcheck' will fail"
+endif

trunk/test/Makefile.am

@@ -36 +36 @@
 CLEANFILES += $(EXTRA_PROGRAMS)
 
-test_option_test_SOURCES = test/option.cc bin/Parameter.cc \
-  bin/AbstractParameter.cc bin/svndigestParameter.cc
+test_option_test_SOURCES = test/option.cc
 
 distributed_TESTS =
@@ -87 +86 @@
 test_libsvndigesttest_a_SOURCES = test/Suite.cc
 
+## we need to link in some object files from bin/
+test_option_test_LDADD = bin/Parameter.$(OBJEXT) \
+  bin/AbstractParameter.$(OBJEXT) \
+  bin/svndigestParameter.$(OBJEXT) $(LDADD)
+
 .PHONY: lazycheck
 

trunk/test/repo_test.sh

@@ -5 +5 @@
 # Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2009, 2010, 2012 Peter Johansson
+# Copyright (C) 2015 Jari Häkkinen
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -32 +33 @@
 
 SVNDIGEST_run 0 -r $rootdir -t $targetdir --force
+# the below test typically fails with plplot 5.11.0
 test -e stderr || exit_fail
 test -s stderr && exit_fail