Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 26 Sep 2010 14:39:45 +0000 (16:39 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 26 Sep 2010 14:39:45 +0000 (16:39 +0200)
Conflicts:
Makefile.am
Makefile.in
lib/Automake/Configure_ac.pm

1  2 
ChangeLog
Makefile.am
Makefile.in
doc/automake.texi
lib/Automake/Channels.pm
lib/Automake/Configure_ac.pm
lib/Automake/XFile.pm
tests/Makefile.am
tests/Makefile.in
tests/README
tests/defs.in

diff --cc ChangeLog
+++ b/ChangeLog
+ 2010-09-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Extend tests on `--help' and `--version' options.
+       * tests/help.test: Create a new empty directory and chdir into
+       it, rather than removing already present files.  Run the aclocal
+       and automake wrapper scripts directly, instead of relying on
+       $AUTOMAKE and $ACLOCAL.  Be sure to correctly match literal dots
+       in aclocal's and automake's stderr.  Add a trailing `:' command.
+       * tests/help2.test: New test, checking that options `--help' and
+       `--version' works in directories with broken `configure.in'.
+       * tests/help3.test: New test, checking that options `--help' and
+       `--version' take precedence on the other options.
+       * tests/help4.test: New test, checking that the first among the
+       `--help' and `--version' options to be specified on the command
+       line wins.
+       * tests/Makefile.am (TESTS): Updated.
+ 2010-09-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Testsuite: Use `$PATH_SEPARATOR', not `:', when extending PATH.
+       * tests/compile2.test: Do no uselessly (implicitly) repeat the
+       computation of PATH_SEPARATOR again.
+       * tests/instmany-mans.test: Use `$PATH_SEPARATOR', not `:', when
+       extending/redefining PATH.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/man4.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/mmodely.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/txinfo30.test: Likewise.
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Updated.
+       * Makefile.am (sc_tests_PATH_SEPARATOR): New maintainer check.
+       (syntax_check_rules): Updated.
+       Testsuite: new variables `$PATH_SEPARATOR' and `$APIVERSION'.
+       * tests/defs.in ($APIVERSION):  New AC_SUBST'd variable.
+       ($ACLOCAL, $AUTOMAKE): Use it.
+       ($PATH_SEPARATOR):  New AC_SUBST'd variables.
+       ($PATH): Use it.
+ 2010-09-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Manual: be more agnostic w.r.t. version control system used.
+       * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
+       directories as a type of probably-unwanted files that are copied
+       regardless when adding directories to EXTRA_DIST.
+       (The dist Hook): Show a dist-hook example which removes Subversion
+       `.svn' private directories from distdir, rather than CVS private
+       directories.
+       (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
+       the version control system used.
+       Manual: index refer to target "git-dist", not "cvs-dist".
+       * doc/automake.texi (General Operation): Index the non-standard
+       example about "git-dist" under the "git-dist" label, not under
+       the "cvs-dist" one.
+       Perl modules: remove references to "Automake CVS repository".
+       * lib/Automake/Channels.pm: Update comments to refer to "Automke's
+       git repository" rather than to "Automake's CVS repository".
+       * lib/Automake/Configure_ac.pm: Likewise.
+       * lib/Automake/FileUtils.pm: Likewise.
+       * lib/Automake/Struct.pm: Likewise.
+       * lib/Automake/XFile.pm: Likewise.
+       * lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git
+       branches" rather than "CVS branches".
+       Remove obsolete .cvsignore files.
+       * .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore,
+       lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore,
+       m4/.cvsignore, tests/.cvsignore: Files deleted.  Even when using
+       savannah's CVS readonly mirror there's no way to commit back to
+       the real repository, so this files are not worth maintaining or
+       keeping around.
+ 2010-09-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       * m4/dmalloc.m4: Bump serial number and copyright years.
+ 2010-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Fix broken link in `AM_WITH_DMALLOC' help screen.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Refer only to the dmalloc site
+       `http://www.dmalloc.com', not to the dmalloc tarball there (which
+       seems to have been removed, substituted by multiple release
+       tarballs now).
 +2010-09-21  Peter Rosin  <peda@lysator.liu.se>
 +
 +      compile: implement library search to support MSVC static linking
 +      * lib/compile (func_cl_wrapper): Implement library search and
 +      -static option so that the user can select whether to prefer
 +      dll import libraries or static libraries.  This enables MSVC to
 +      link against dlls generated by libtool without requiring libtool
 +      or workarounds such as -lfoo.dll etc.  Makes the tests/static.at
 +      test case in libtool pass.
 +      * tests/compile3.test: Don't trip up if there happens to exist
 +      a "foo" library in the library search path.
 +      * tests/compile6.test: New test, verifying the library search.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2010-09-17  Eric Blake  <eblake@redhat.com>
  
        Avoid triple-space after period.
diff --cc Makefile.am
@@@ -193,7 -140,7 +193,8 @@@ sc_tests_required_after_defs 
  sc_tests_overriding_macros_on_cmdline \
  sc_tests_plain_sleep \
  sc_tests_plain_egrep_fgrep \
+ sc_tests_PATH_SEPARATOR \
 +sc_tests_logs_duplicate_prefixes \
  sc_mkdir_p \
  sc_perl_at_substs \
  sc_unquoted_DESTDIR \
@@@ -463,24 -410,13 +464,31 @@@ sc_tests_plain_egrep_fgrep
          exit 1; \
        fi
  
 +## Rule to ensure that the testsuite has been run before.  We don't depend on `check'
 +## here, because that would be very wasteful in the common case.  We could run
 +## `make check RECHECK_LOGS=' and avoid toplevel races with AM_RECURSIVE_TARGETS.
 +sc_ensure_testsuite_has_run:
 +      @if test ! -f tests/test-suite.log; then \
 +        echo "Run \`make check' before \`maintainer-check'" >&2; \
 +        exit 1; \
 +      fi
 +.PHONY: sc_ensure_testsuite_has_run
 +
 +## Ensure our warning and error messages do not contain duplicate 'warning:' prefixes.
 +## This test actually depends on the testsuite having been run before.
 +sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
 +      @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \
 +        echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \
 +        exit 1; \
 +      fi
 +
+ ## Using `:' as a PATH separator is not portable.
+ sc_tests_PATH_SEPARATOR:
+       @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
+         echo "Use \`$$PATH_SEPARATOR', not \`:', in PATH definitions above." 1>&2; \
+         exit 1; \
+       fi
  sc_mkdir_p:
        @if grep 'mkdir_p' $(srcdir)/automake.in \
              $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
diff --cc Makefile.in
@@@ -314,7 -298,7 +314,8 @@@ sc_tests_required_after_defs 
  sc_tests_overriding_macros_on_cmdline \
  sc_tests_plain_sleep \
  sc_tests_plain_egrep_fgrep \
+ sc_tests_PATH_SEPARATOR \
 +sc_tests_logs_duplicate_prefixes \
  sc_mkdir_p \
  sc_perl_at_substs \
  sc_unquoted_DESTDIR \
@@@ -1185,19 -1091,12 +1186,25 @@@ sc_tests_plain_egrep_fgrep
          exit 1; \
        fi
  
 +sc_ensure_testsuite_has_run:
 +      @if test ! -f tests/test-suite.log; then \
 +        echo "Run \`make check' before \`maintainer-check'" >&2; \
 +        exit 1; \
 +      fi
 +.PHONY: sc_ensure_testsuite_has_run
 +
 +sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
 +      @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \
 +        echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \
 +        exit 1; \
 +      fi
 +
+ sc_tests_PATH_SEPARATOR:
+       @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
+         echo "Use \`$$PATH_SEPARATOR', not \`:', in PATH definitions above." 1>&2; \
+         exit 1; \
+       fi
  sc_mkdir_p:
        @if grep 'mkdir_p' $(srcdir)/automake.in \
              $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/README
Simple merge
diff --cc tests/defs.in
Simple merge