[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2-121-g23a9b43

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=23a9b4365b641e02a61b95b1d84a5c5068c44830

The branch, branch-1.11 has been updated
       via  23a9b4365b641e02a61b95b1d84a5c5068c44830 (commit)
       via  a1e77caf20a62b14d549307a73131fedb9c0f696 (commit)
       via  fbeda3da9d12736b3dcc6d1e11e9f2f09cf4ce96 (commit)
       via  2a9862a89875f9060f95547b6fd4274c86738617 (commit)
       via  a6e60819ba512d6bf7376c543f8c40c9389eb4d7 (commit)
       via  443114bf1b15790e0349a087a5673e4de25981ff (commit)
       via  e29c49181fb4ffa2506ca690964b5e9e07c8fb49 (commit)
      from  693557ce7fcd728fa9e7b5d60713b4caefc39e78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23a9b4365b641e02a61b95b1d84a5c5068c44830
Merge: 693557c a1e77ca
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jan 18 13:44:56 2012 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      cosmetics: move CheckListOfTests.am into tests/
      tests: move all under the same hierarchy ('tests/' directory)
      gitlog-to-changelog: update from upstream
      changelog: don't cluster multiple entries under the same "date line"
      fixup: contrib: really integrate in automake build system
      contrib: new, a directory for non-mainstream functionalities

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |    4 +-
 Makefile.am                                        |   20 ++---------
 configure.ac                                       |    2 +-
 tests/nodepcomp.test => contrib/Makefile.am        |   26 +++++----------
 contrib/README                                     |   27 ++++++++++++++++
 lib/Automake/Makefile.am                           |    7 +---
 lib/Automake/tests/Makefile.am                     |   33 --------------------
 lib/gitlog-to-changelog                            |   24 +++++++++-----
 CheckListOfTests.am => tests/CheckListOfTests.am   |   15 ++++++---
 tests/Makefile.am                                  |    8 ++++-
 tests/list-of-tests.mk                             |    9 +++++
 {lib/Automake/tests => tests/pm}/Condition-t.pl    |    0
 {lib/Automake/tests => tests/pm}/Condition.pl      |    0
 .../tests => tests/pm}/DisjConditions-t.pl         |    0
 {lib/Automake/tests => tests/pm}/DisjConditions.pl |    0
 {lib/Automake/tests => tests/pm}/Version.pl        |    0
 {lib/Automake/tests => tests/pm}/Wrap.pl           |    0
 17 files changed, 87 insertions(+), 88 deletions(-)
 copy tests/nodepcomp.test => contrib/Makefile.am (74%)
 mode change 100755 => 100644
 create mode 100644 contrib/README
 delete mode 100644 lib/Automake/tests/Makefile.am
 rename CheckListOfTests.am => tests/CheckListOfTests.am (85%)
 rename {lib/Automake/tests => tests/pm}/Condition-t.pl (100%)
 rename {lib/Automake/tests => tests/pm}/Condition.pl (100%)
 rename {lib/Automake/tests => tests/pm}/DisjConditions-t.pl (100%)
 rename {lib/Automake/tests => tests/pm}/DisjConditions.pl (100%)
 rename {lib/Automake/tests => tests/pm}/Version.pl (100%)
 rename {lib/Automake/tests => tests/pm}/Wrap.pl (100%)

diff --git a/.gitignore b/.gitignore
index 33e3827..f219153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,10 +47,10 @@ Makefile
 /doc/amhello/install-sh
 /doc/amhello/missing
 /lib/Automake/Config.pm
-/lib/Automake/tests/*.log
-/lib/Automake/tests/*.log-t
 /tests/*.log
 /tests/*.log-t
+/tests/pm/*.log
+/tests/pm/*.log-t
 /tests/*.dir
 /tests/*-p.test
 /tests/aclocal-1.*
diff --git a/Makefile.am b/Makefile.am
index 735cb00..b9166db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,7 @@
 ## automake (run in doc, tests, and in the rebuild rules.)
 ## `.' goes before doc and tests, because the latter two directories
 ## run aclocal and automake.
-SUBDIRS = lib . doc m4 tests
-
-TEST_SUBDIRS = tests lib/Automake/tests
+SUBDIRS = lib . contrib doc m4 tests
 
 bin_SCRIPTS = automake aclocal
 
@@ -110,7 +108,8 @@ INSTALL: lib/INSTALL
 ##
 
 gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_options = --since='2011-12-28 00:00:00'
+gitlog_to_changelog_options = --since='2011-12-28 00:00:00' \
+                              --no-cluster --format '%s%n%n%b'
 
 # Automatic generation of the ChangeLog from git history.
 #
@@ -202,18 +201,7 @@ maintainer-check: $(syntax_check_rules)
 ## list of all test scripts in the Automake testsuite.
 .PHONY: maintainer-check-list-of-tests
 maintainer-check-list-of-tests:
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       for subdir in $(TEST_SUBDIRS); do \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \
-       done; \
-       test -z "$$fail"
-
+       $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
 maintainer-check: maintainer-check-list-of-tests
 
 ## Look for test whose names can cause spurious failures when used as
diff --git a/configure.ac b/configure.ac
index 0ae1a44..d6724e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,9 +206,9 @@ AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
 
 AC_CONFIG_FILES([
   Makefile
+  contrib/Makefile
   doc/Makefile
   lib/Automake/Makefile
-  lib/Automake/tests/Makefile
   lib/Makefile
   lib/am/Makefile
   m4/Makefile
diff --git a/tests/nodepcomp.test b/contrib/Makefile.am
old mode 100755
new mode 100644
similarity index 74%
copy from tests/nodepcomp.test
copy to contrib/Makefile.am
index 735c363..b491923
--- a/tests/nodepcomp.test
+++ b/contrib/Makefile.am
@@ -1,28 +1,20 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
+## Process this file with automake to create Makefile.in
+
+## Makefile for Automake contrib.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-#
+
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure depcomp isn't always required.
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f depcomp
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
+EXTRA_DIST = README
diff --git a/contrib/README b/contrib/README
new file mode 100644
index 0000000..bbef72f
--- /dev/null
+++ b/contrib/README
@@ -0,0 +1,27 @@
+This is the 'contrib' directory of the GNU Automake distribution.
+
+Here you'll find additions to the Automake base distribution, in form of
+makefile fragments, m4 macros, scripts, documentation, et cetera.  Such
+addition that might be useful for a significant percentage of its general
+audience, but (for one reason or another) are not deemed appropriate for
+inclusion into the Automake core.
+
+There are several reasons for which a feature can be kept in contrib:
+
+  1. The long-term usefulness of the feature is debatable and uncertain;
+     on-field and real-word testing are necessary to prove or disprove
+     its usefulness, before the feature can be committed into the Automake
+     core (as doing so too early would later force us to continue the
+     support for backward-compatibility, even if the features proves
+     flawed or fails to attract widespread use).
+  
+  2. The APIs or overall design of the feature are still unstable, and
+     need on-field testing to iron warts and usability bugs, or uncover
+     potential flaws.
+
+  3. The feature was an historical one, mostly obsoleted but still used
+     "here and there" in the wild; so we want to to deprecate it and
+     remove it from the Automake core, but cannot remove it altogether,
+     for the sake of those still-existing usage.  So it gets moved in
+     contrib.
+
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index cfc7272..9805024 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# `make clean check' should build Config.pm first.
-SUBDIRS = . tests
-
 perllibdir = $(pkgvdatadir)/Automake
 dist_perllib_DATA = \
   ChannelDefs.pm \
diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am
deleted file mode 100644
index a537fd1..0000000
--- a/lib/Automake/tests/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2002, 2003, 2008, 2009, 2012 Free Software Foundation,
-# Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -I ../.. -I $(top_srcdir)/lib -w
-TEST_EXTENSIONS = .pl
-
-TESTS = \
-Condition.pl \
-Condition-t.pl \
-DisjConditions.pl \
-DisjConditions-t.pl \
-Version.pl \
-Wrap.pl
-
-EXTRA_DIST = $(TESTS)
-
-include $(top_srcdir)/CheckListOfTests.am
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 0efedb0..38c6f3a 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2012-01-06 07:14'; # UTC
+my $VERSION = '2012-01-18 07:50'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -64,6 +64,10 @@ OPTIONS:
                   makes a change to SHA1's commit log text or metadata.
    --append-dot append a dot to the first line of each commit message if
                   there is no other punctuation or blank at the end.
+   --no-cluster never cluster commit messages under the same date/author
+                  header; the default is to cluster adjacent commit messages
+                  if their headers are the same and neither commit message
+                  contains multiple paragraphs.
    --since=DATE convert only the logs since DATE;
                   the default is to convert all log entries.
    --format=FMT set format string for commit subject and body;
@@ -190,6 +194,7 @@ sub parse_amend_file($)
   my $format_string = '%s%n%b%n';
   my $amend_file;
   my $append_dot = 0;
+  my $cluster = 1;
   GetOptions
     (
      help => sub { usage 0 },
@@ -198,6 +203,7 @@ sub parse_amend_file($)
      'format=s' => \$format_string,
      'amend=s' => \$amend_file,
      'append-dot' => \$append_dot,
+     'cluster!' => \$cluster,
     ) or usage 1;
 
 
@@ -302,13 +308,15 @@ sub parse_amend_file($)
               . substr ($_, 5) . "\n";
         }
 
-      # If this header would be different from the previous date/name/email/
-      # coauthors header, or if this or the previous entry consists of two
-      # or more paragraphs, then print the header.
-      if ($date_line ne $prev_date_line
-          or "@coauthors" ne "@prev_coauthors"
-          or $multi_paragraph
-          or $prev_multi_paragraph)
+      # If clustering of commit messages has been disabled, if this header
+      # would be different from the previous date/name/email/coauthors header,
+      # or if this or the previous entry consists of two or more paragraphs,
+      # then print the header.
+      if ( ! $cluster
+          || $date_line ne $prev_date_line
+          || "@coauthors" ne "@prev_coauthors"
+          || $multi_paragraph
+          || $prev_multi_paragraph)
         {
           $prev_date_line eq ''
             or print "\n";
diff --git a/CheckListOfTests.am b/tests/CheckListOfTests.am
similarity index 85%
rename from CheckListOfTests.am
rename to tests/CheckListOfTests.am
index 0a48447..c71c7fc 100644
--- a/CheckListOfTests.am
+++ b/tests/CheckListOfTests.am
@@ -37,13 +37,18 @@ maintainer-check-list-of-tests:
         for t in $$lst; do \
           echo "$$t"; \
         done | sort >$(am__tmk); \
+## List of subdirs where to look for tests.
+        dirs='$(test_subdirs)'; \
+        test -n "$$dirs" || dirs=.; \
 ## List of tests on filesystem.  Be careful to cater for VPATH builds too.
         for ext in $(TEST_EXTENSIONS); do \
-          ls *$$ext 2>/dev/null; \
-          if test $(srcdir) != $(builddir); then \
-            (cd $(srcdir) && ls *$$ext 2>/dev/null); \
-          fi; \
-        done | sort | uniq >$(am__tfs); \
+          for dir in $$dirs; do \
+            ls $$dir/*$$ext 2>/dev/null; \
+            if test $(srcdir) != $(builddir); then \
+              (cd $(srcdir) && ls $$dir/*$$ext 2>/dev/null); \
+            fi; \
+          done; \
+        done | sed 's,^\./,,' | sort | uniq >$(am__tfs); \
 ## Compare the two lists, complain if they differ.
         if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
            result=0; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 90b4085..d909942 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,6 +52,11 @@ TESTS_ENVIRONMENT = \
   test x"$$required" = x || unset required; \
   test x"$$parallel_tests" = x || unset parallel_tests;
 
+TEST_EXTENSIONS = .pl .test
+
+PL_LOG_COMPILER = $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
+
 include $(srcdir)/list-of-tests.mk
 
 TESTS = $(handwritten_TESTS) $(parallel_tests)
@@ -131,7 +136,8 @@ EXTRA_DIST += distcheck-hook-m4.am
 check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 
 ## Checking the list of tests.
-include $(top_srcdir)/CheckListOfTests.am
+test_subdirs = . pm
+include $(srcdir)/CheckListOfTests.am
 maintainer-check-list-of-tests: $(parallel_tests)
 
 clean-local: clean-local-check
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index ebaa46e..7ca3144 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -17,12 +17,21 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+perl_TESTS = \
+pm/Condition.pl \
+pm/Condition-t.pl \
+pm/DisjConditions.pl \
+pm/DisjConditions-t.pl \
+pm/Version.pl \
+pm/Wrap.pl
+
 # The order here is mostly alphabetical, with the deliberate exception
 # that tests having a high runtime (especially TAP tests that run various
 # checks sequentially) are listed early; this improves performance on
 # concurrent testsuite runs.
 handwritten_TESTS = \
 get-sysconf.test \
+$(perl_TESTS) \
 self-check-env-sanitize.test \
 self-check-report.test \
 aclibobj.test \
diff --git a/lib/Automake/tests/Condition-t.pl b/tests/pm/Condition-t.pl
similarity index 100%
rename from lib/Automake/tests/Condition-t.pl
rename to tests/pm/Condition-t.pl
diff --git a/lib/Automake/tests/Condition.pl b/tests/pm/Condition.pl
similarity index 100%
rename from lib/Automake/tests/Condition.pl
rename to tests/pm/Condition.pl
diff --git a/lib/Automake/tests/DisjConditions-t.pl 
b/tests/pm/DisjConditions-t.pl
similarity index 100%
rename from lib/Automake/tests/DisjConditions-t.pl
rename to tests/pm/DisjConditions-t.pl
diff --git a/lib/Automake/tests/DisjConditions.pl b/tests/pm/DisjConditions.pl
similarity index 100%
rename from lib/Automake/tests/DisjConditions.pl
rename to tests/pm/DisjConditions.pl
diff --git a/lib/Automake/tests/Version.pl b/tests/pm/Version.pl
similarity index 100%
rename from lib/Automake/tests/Version.pl
rename to tests/pm/Version.pl
diff --git a/lib/Automake/tests/Wrap.pl b/tests/pm/Wrap.pl
similarity index 100%
rename from lib/Automake/tests/Wrap.pl
rename to tests/pm/Wrap.pl


hooks/post-receive
-- 
GNU Automake