Changeset 1315

Timestamp:

Nov 18, 2010, 3:50:28 AM (10 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.9.1 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (3 diffs)
• NEWS (modified) (1 diff)
• lib/Configuration.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/version.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• test/Makefile.am (modified) (2 diffs)

trunk/Makefile.am

@@ -83 +83 @@
 
 # run in end of release target
-RELEASE_HOOK = build_support/Portfile
+RELEASE_HOOK = build_support/Portfile.v$(VERSION)
 
 edit = $(SED) \
@@ -89 +89 @@
   -e 's|@VERSION[@]|$(VERSION)|g'
 
-build_support/Portfile: Makefile build_support/Portfile.in
+build_support/Portfile.v$(VERSION): Makefile build_support/Portfile.in
   @rm -f $@ $@.t
   @openssl version > /dev/null || exit 1
@@ -97 +97 @@
   rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
   $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
-  '$(srcdir)/$@.in' > $@.t
+  '$(srcdir)/build_support/Portfile.in' > $@.t
   @chmod a-w $@.t
   @mv $@.t $@

trunk/NEWS

@@ -12 +12 @@
 svndigest 0.9.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
+
+Version 0.9.1 (released 18 November 2010)
+  - Corrected dependency is test suite when not having test repo (bug #487)
+  - Corrected generated config file (bug #486)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9.1
 
 Version 0.9 (released 6 November 2010)

trunk/lib/Configuration.cc

@@ -716 +716 @@
        << "### Right hand side may contain \"$i\", which will be replaced \n"
        << "### with the ith wild card in lhs string.\n";
-
-    if (!conf.dictionary_.empty()) {
-      os << "\n"
-         << "### Section for setting dictionary for file names.\n"
-         << "### Prior looking for file name pattern in section " 
-         << "[parsing-codons],\n"
-         << "### the file name may be translated according to the rules \n"
-         << "### in this section. In default setting there is, for example,\n"
-         << "### a rule to translate `<FILENAME>.in' to `<FILENAME>'.\n"
-         << "### The format of the entries is:\n"
-         << "###    file-name-pattern = new-name\n"
-         << "### Left hand side may contain wildcards (such as '*' and '?').\n"
-         << "### Right hand side may contain \"$i\", which will be replaced \n"
-         << "### with the ith wild card in lhs string.\n"
-         << "[file-name-dictionary]\n";
-      for (size_t i=0; i<conf.dictionary_.size(); ++i)
-        os << conf.dictionary_[i].first << " = " 
-           << conf.dictionary_[i].second << "\n"; 
-    }
+    os << "[file-name-dictionary]\n";
+    for (size_t i=0; i<conf.dictionary_.size(); ++i)
+      os << conf.dictionary_[i].first << " = " 
+         << conf.dictionary_[i].second << "\n"; 
+
     if (!conf.string2codons_.empty()) {
       os << "\n"

trunk/test/Makefile.am

@@ -86 +86 @@
 lazycheck:; $(MAKE) $(AM_MAKEFLAGS) check RECHECK_LOGS= 
 
+if HAVE_SVN_WC
 repo_stamp = $(srcdir)/repo/db/current
+else
+repo_stamp =
+endif
 
 # dependencies for lazycheck
@@ -98 +102 @@
 svndigest_copy_cache_test.log:init.sh $(top_builddir)/bin/svndigest-copy-cache $(repo_stamp)
 
-cache_partial.log: $(repo_stamp) $(srcdir)/data/AUTHORS.svndigest-cache-r61
+cache_partial.log: $(repo_stamp)
 copyright.log: $(repo_stamp)
 stats.log: $(repo_stamp)