[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-472-g5b7e329

[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=5b7e329e406e7b53a555af3fc4b34ec0c3dd42bc

The branch, master has been updated
       via  5b7e329e406e7b53a555af3fc4b34ec0c3dd42bc (commit)
       via  b32c26f29b7c18814714370b516d6e49cf9f41e9 (commit)
       via  f4e313b305f1975976a608c46bff2e2b07d8c361 (commit)
       via  72e0d8f3b65b2071937e35ba4571684c204f7660 (commit)
      from  3f2d21795e8f70399ea27649ca54cc9080f2825a (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 5b7e329e406e7b53a555af3fc4b34ec0c3dd42bc
Merge: b32c26f 72e0d8f
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 20 12:09:51 2010 +0100

    Merge branch 'fix-release-stats-for-generated-tests'

commit b32c26f29b7c18814714370b516d6e49cf9f41e9
Author: Stefano Lattarini <address@hidden>
Date:   Thu Nov 18 18:09:14 2010 +0100

    Code cleanup after removal of option `--output-directory'.
    
    * automake.in ($output_directory): Remove, it's unconditionally
    defined to `.' and used only ...
    (generate_makefile): ... in this subroutine, which now has been
    edited and simplified accordingly.

commit f4e313b305f1975976a608c46bff2e2b07d8c361
Author: Stefano Lattarini <address@hidden>
Date:   Thu Nov 18 17:59:14 2010 +0100

    Remove obsolete automake option `--output-directory'.
    
    This option has been deprecated since version 1.7 (2002/2003).
    
    * automake.in ($output_directory): Define to `.' unconditionally.
    (parse_arguments): Remove handling of equivalent options `-o' and
    `--output-directory'.
    * tests/outdir.test: Removed.
    * tests/no-outdir-option.test: New test.
    * tests/Makefile.am (TESTS): Updated.
    * NEWS: Updated.

commit 72e0d8f3b65b2071937e35ba4571684c204f7660
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 21:16:03 2010 +0100

    release-stats: account for more generated tests.
    
    * Makefile.am (release-stats): Be sure to take into account all
    the generated tests, by grepping the test scripts to decide which
    ones of them are automatically generated.

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

Summary of changes:
 ChangeLog                                          |   25 ++++++++++++
 Makefile.am                                        |    2 +-
 Makefile.in                                        |    2 +-
 NEWS                                               |    1 +
 automake.in                                        |   40 +++++---------------
 tests/Makefile.am                                  |    2 +-
 tests/Makefile.in                                  |    2 +-
 .../{regex-obsolete.test => no-outdir-option.test} |   13 ++----
 tests/outdir.test                                  |   32 ----------------
 9 files changed, 45 insertions(+), 74 deletions(-)
 copy tests/{regex-obsolete.test => no-outdir-option.test} (73%)
 delete mode 100755 tests/outdir.test

diff --git a/ChangeLog b/ChangeLog
index 92b6ffa..266b1de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2010-11-20  Stefano Lattarini  <address@hidden>
+
+       release-stats: account for more generated tests.
+       * Makefile.am (release-stats): Be sure to take into account all
+       the generated tests, by grepping the test scripts to decide which
+       ones of them are automatically generated.
+
+2010-11-20  Stefano Lattarini  <address@hidden>
+
+       Code cleanup after removal of option `--output-directory'.
+       * automake.in ($output_directory): Remove, it's unconditionally
+       defined to `.' and used only ...
+       (generate_makefile): ... in this subroutine, which now has been
+       edited and simplified accordingly.
+
+       Remove obsolete automake option `--output-directory'.
+       This option has been deprecated since version 1.7 (2002/2003).
+       * automake.in ($output_directory): Define to `.' unconditionally.
+       (parse_arguments): Remove handling of equivalent options `-o' and
+       `--output-directory'.
+       * tests/outdir.test: Removed.
+       * tests/no-outdir-option.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+       * NEWS: Updated.
+
 2010-11-19  Stefano Lattarini  <address@hidden>
 
        Automake::Config: remove extra trailing semicolon.
diff --git a/Makefile.am b/Makefile.am
index a5df109..1dec51e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -658,7 +658,7 @@ release-stats: ps
        if test . != '$(srcdir)'; then tests="$$tests $(srcdir)/tests/*.test"; \
        else :; fi && \
        t=`ls -1 $$tests | wc -l` && \
-       tgen=`ls -1 $$tests | grep '.-p\.test' | wc -l` && \
+       tgen=`grep 'GENERATED AUTOMATICALLY' $$tests | wc -l` && \
        today=`date +%Y-%m-%d` && \
        echo "add this to the table in doc/automake.texi after verification:" 
&& \
        printf '@item %s @tab %-6s @tab %4d @tab %4d @tab %4d @tab %4d %-4s 
@tab %4d %-4s @tab %3d @tab %d %-4s\n' \
diff --git a/Makefile.in b/Makefile.in
index 1f897c9..02f12b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1339,7 +1339,7 @@ release-stats: ps
        if test . != '$(srcdir)'; then tests="$$tests $(srcdir)/tests/*.test"; \
        else :; fi && \
        t=`ls -1 $$tests | wc -l` && \
-       tgen=`ls -1 $$tests | grep '.-p\.test' | wc -l` && \
+       tgen=`grep 'GENERATED AUTOMATICALLY' $$tests | wc -l` && \
        today=`date +%Y-%m-%d` && \
        echo "add this to the table in doc/automake.texi after verification:" 
&& \
        printf '@item %s @tab %-6s @tab %4d @tab %4d @tab %4d @tab %4d %-4s 
@tab %4d %-4s @tab %3d @tab %d %-4s\n' \
diff --git a/NEWS b/NEWS
index 0a824dd..649bee9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ New in 1.11a:
 * Changes to automake:
 
   - automake now generates silenced rules for texinfo outputs.
+  - The deprecated option `--output-dir' has been removed.
 
 * New targets:
 
diff --git a/automake.in b/automake.in
index db45e52..5c44767 100644
--- a/automake.in
+++ b/automake.in
@@ -330,10 +330,6 @@ my @config_headers = ();
 # Names used in AC_CONFIG_LINKS call.
 my @config_links = ();
 
-# Directory where output files go.  Actually, output files are
-# relative to this directory.
-my $output_directory;
-
 # List of Makefile.am's to process, and their corresponding outputs.
 my @input_files = ();
 my %output_files = ();
@@ -8280,18 +8276,13 @@ sub generate_makefile ($$)
 
   check_typos;
 
-  my ($out_file) = $output_directory . '/' . $makefile_in;
-
   if ($exit_code != 0)
     {
-      verb "not writing $out_file because of earlier errors";
+      verb "not writing $makefile_in because of earlier errors";
       return;
     }
 
-  if (! -d ($output_directory . '/' . $am_relative_dir))
-    {
-      mkdir ($output_directory . '/' . $am_relative_dir, 0755);
-    }
+  mkdir ($am_relative_dir, 0755) if ! -d $am_relative_dir;
 
   # We make sure that `all:' is the first target.
   my $output =
@@ -8310,25 +8301,25 @@ sub generate_makefile ($$)
   #  * other dependencies, specific to the Makefile.am being processed
   #    (such as the Makefile.am itself, or any Makefile fragment
   #    it includes).
-  my $timestamp = mtime $out_file;
+  my $timestamp = mtime $makefile_in;
   if (! $force_generation
       && $configure_deps_greatest_timestamp < $timestamp
       && $output_deps_greatest_timestamp < $timestamp
-      && $output eq contents ($out_file))
+      && $output eq contents ($makefile_in))
     {
-      verb "$out_file unchanged";
+      verb "$makefile_in unchanged";
       # No need to update.
       return;
     }
 
-  if (-e $out_file)
+  if (-e $makefile_in)
     {
-      unlink ($out_file)
-       or fatal "cannot remove $out_file: $!";
+      unlink ($makefile_in)
+       or fatal "cannot remove $makefile_in: $!";
     }
 
-  my $gm_file = new Automake::XFile "> $out_file";
-  verb "creating $out_file";
+  my $gm_file = new Automake::XFile "> $makefile_in";
+  verb "creating $makefile_in";
   print $gm_file $output;
 }
 
@@ -8469,7 +8460,6 @@ sub parse_arguments ()
                                                    $cli_where); },
      'no-force'        => sub { $force_generation = 0; },
      'f|force-missing'  => \$force_missing,
-     'o|output-dir=s'  => \$output_directory,
      'a|add-missing'   => \$add_missing,
      'c|copy'          => \$copy_missing,
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
@@ -8506,16 +8496,6 @@ sub parse_arguments ()
   Getopt::Long::GetOptions %cli_options, 'version' => sub {}, 'help' => sub {}
     or exit 1;
 
-  if (defined $output_directory)
-    {
-      msg 'obsolete', "`--output-dir' is deprecated";
-    }
-  else
-    {
-      # In the next release we'll remove this entirely.
-      $output_directory = '.';
-    }
-
   return unless @ARGV;
 
   if ($ARGV[0] =~ /^-./)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 21134bf..9ee1577 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -583,6 +583,7 @@ mkinst3.test \
 mmode.test \
 mmodely.test \
 multlib.test \
+no-outdir-option.test \
 nobase.test \
 nobase-libtool.test \
 nobase-python.test \
@@ -607,7 +608,6 @@ objc2.test \
 obsolete.test \
 oldvars.test \
 order.test \
-outdir.test \
 output.test \
 output2.test \
 output3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 69cab0d..0990f2f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -845,6 +845,7 @@ mkinst3.test \
 mmode.test \
 mmodely.test \
 multlib.test \
+no-outdir-option.test \
 nobase.test \
 nobase-libtool.test \
 nobase-python.test \
@@ -869,7 +870,6 @@ objc2.test \
 obsolete.test \
 oldvars.test \
 order.test \
-outdir.test \
 output.test \
 output2.test \
 output3.test \
diff --git a/tests/regex-obsolete.test b/tests/no-outdir-option.test
similarity index 73%
copy from tests/regex-obsolete.test
copy to tests/no-outdir-option.test
index c283025..827e318 100755
--- a/tests/regex-obsolete.test
+++ b/tests/no-outdir-option.test
@@ -14,19 +14,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check tha the AM_WITH_REGEX macro is reported as obsolete.
+# Check that the `-o' aka `--output-dir' option is not recognized anymore.
 
 . ./defs || Exit 1
 
 set -e
 
-cat >> configure.in << 'END'
-AM_WITH_REGEX
-END
+AUTOMAKE_fails -Wno-error --output-dir=foo
+$EGREP '(invalid|unrecognized) option.*--output-dir' stderr
 
-$ACLOCAL
-$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr
+AUTOMAKE_fails -Wno-error -o foo
+$EGREP '(invalid|unrecognized) option.*-o' stderr
 
 :
diff --git a/tests/outdir.test b/tests/outdir.test
deleted file mode 100755
index 4bafb4e..0000000
--- a/tests/outdir.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  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 ensure that --output-dir works.  Bug report from Joshua
-# Cowan.
-
-. ./defs || Exit 1
-
-cat > Makefile.am <<'END'
-pkgdata_DATA =
-END
-
-mkdir zardir
-
-$ACLOCAL || Exit 1
-$AUTOMAKE -Wno-obsolete --output-dir=zardir || Exit 1
-
-test -f Makefile.in && Exit 1
-test -f zardir/Makefile.in


hooks/post-receive
-- 
GNU Automake