[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-169-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-169-g83d7976 |
|
Date: |
Sun, 25 Apr 2010 18:56:36 +0000 |
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=83d7976fb25025797ed1271c68e5c8c148c40f91
The branch, master has been updated
via 83d7976fb25025797ed1271c68e5c8c148c40f91 (commit)
via a700fa3337c039e8a6dbae44b08a5180713e697a (commit)
via 057d5e0ea41843dec97359ac8649ebf735804c56 (commit)
via d4c5a0072e2825d77f4dc228a2348051518a6692 (commit)
via bf38d9c52f1bb5606dcbe04e0c8405e4a698af64 (commit)
via c3d47d57a548aab53e7627ce8eb81205b35a2245 (commit)
via 6375de2be497bf31d5e33d1d03580be18e708446 (commit)
via 76b2ca952f073428010a294f98c9d47ee97eb907 (commit)
via 891c5b53311ca7b7f079baff3fb9ce52a5371ad7 (commit)
via 4da4ff7c1791c0113ced4c47cb8457a38f7c6a38 (commit)
via 20f6bb8f32131eb2da5a24b1f74adc5277143f5b (commit)
via c57885b0cf518bfd38f502d9c61b7688044804cc (commit)
from fcad1df725e0a143bd3e8e2f340961145d33b82a (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 83d7976fb25025797ed1271c68e5c8c148c40f91
Author: Ralf Wildenhues <address@hidden>
Date: Sun Apr 25 18:26:14 2010 +0200
Warning and error message formatting cleanups.
* aclocal.in (parse_arguments, main): Remove trailing period or
newline in error or warning messages, avoid capitalization of
the first word of a message.
* automake.in (check_user_variables, handle_languages)
(handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
(scan_autoconf_files, cond_stack_if, require_file_internal)
(usage, generate_makefile, parse_arguments): Likewise.
* lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
* lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
* lib/Automake/Options.pm (set_strictness): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define, variables_dump): Likewise.
* tests/ltinstloc.test, tests/suffix11.test: Adjust expected
error message.
* lib/Automake/Channels.pm (setup_channel): Reword error message
to be the same as in msg.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit a700fa3337c039e8a6dbae44b08a5180713e697a
Author: Ralf Wildenhues <address@hidden>
Date: Sun Apr 25 18:44:53 2010 +0200
Fix placing of ellipses in English text and synopses.
* Makefile.am: Be sure to add a space before `...' in natural
language text.
* automake.in (scan_autoconf_traces): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define): Likewise.
* lib/am/dejagnu.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/gnupload (dprint, upload): Likewise.
* tests/confdeps.test: Likewise.
* tests/location.test: Adjust expected output.
* automake.in (usage): In synopsis, use singular for OPTION,
* remove space before ellipsis.
* aclocal.in (usage): Likewise. Also, fix indentation.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 057d5e0ea41843dec97359ac8649ebf735804c56
Author: Ralf Wildenhues <address@hidden>
Date: Sun Apr 25 18:44:41 2010 +0200
Fix more duplicate message prefixes.
* lib/Automake/XFile.pm (seek): Do not prepend $me.
($me): Remove now-unused package-global.
* aclocal.in (check_acinclude): Remove duplicate 'warning: '
prefix.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit d4c5a0072e2825d77f4dc228a2348051518a6692
Merge: fcad1df725e0a143bd3e8e2f340961145d33b82a
bf38d9c52f1bb5606dcbe04e0c8405e4a698af64
Author: Ralf Wildenhues <address@hidden>
Date: Sun Apr 25 18:49:18 2010 +0200
Merge branch 'maint' into foo
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 82 +++++++++++++++++++++++++++++++++++++++++-
Makefile.am | 2 +-
Makefile.in | 2 +-
aclocal.in | 17 ++++-----
automake.in | 44 +++++++++++-----------
doc/automake.texi | 2 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/Automake/Channels.pm | 2 +-
lib/Automake/Configure_ac.pm | 5 ++-
lib/Automake/Options.pm | 2 +-
lib/Automake/Rule.pm | 13 +++----
lib/Automake/Variable.pm | 8 ++--
lib/Automake/XFile.pm | 5 +--
lib/am/dejagnu.am | 4 +-
lib/am/progs.am | 4 +-
lib/gnupload | 8 ++--
tests/acloca14.test | 3 +-
tests/acloca18.test | 3 +-
tests/aclocal.test | 6 +++-
tests/badopt.test | 8 ++--
tests/confdeps.test | 6 ++--
tests/configure.test | 7 ++++
tests/confsub.test | 8 ++--
tests/fort2.test | 3 +-
tests/help.test | 3 +-
tests/location.test | 4 +-
tests/ltinstloc.test | 2 +-
tests/missing3.test | 9 ++++-
tests/missing6.test | 3 +-
tests/silent3.test | 2 +-
tests/suffix11.test | 4 +-
31 files changed, 186 insertions(+), 87 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a026c84..71b0d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2010-04-25 Ralf Wildenhues <address@hidden>
+
+ Warning and error message formatting cleanups.
+ * aclocal.in (parse_arguments, main): Remove trailing period or
+ newline in error or warning messages, avoid capitalization of
+ the first word of a message.
+ * automake.in (check_user_variables, handle_languages)
+ (handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
+ (scan_autoconf_files, cond_stack_if, require_file_internal)
+ (usage, generate_makefile, parse_arguments): Likewise.
+ * lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
+ * lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
+ * lib/Automake/Options.pm (set_strictness): Likewise.
+ * lib/Automake/Rule.pm (define): Likewise.
+ * lib/Automake/Variable.pm (define, variables_dump): Likewise.
+ * tests/ltinstloc.test, tests/suffix11.test: Adjust expected
+ error message.
+ * lib/Automake/Channels.pm (setup_channel): Reword error message
+ to be the same as in msg.
+
+ Fix placing of ellipses in English text and synopses.
+ * Makefile.am: Be sure to add a space before `...' in natural
+ language text.
+ * automake.in (scan_autoconf_traces): Likewise.
+ * lib/Automake/Rule.pm (define): Likewise.
+ * lib/Automake/Variable.pm (define): Likewise.
+ * lib/am/dejagnu.am: Likewise.
+ * lib/am/progs.am: Likewise.
+ * lib/gnupload (dprint, upload): Likewise.
+ * tests/confdeps.test: Likewise.
+ * tests/location.test: Adjust expected output.
+ * automake.in (usage): In synopsis, use singular for OPTION,
+ * remove space before ellipsis.
+ * aclocal.in (usage): Likewise. Also, fix indentation.
+
+ Fix more duplicate message prefixes.
+ * lib/Automake/XFile.pm (seek): Do not prepend $me.
+ ($me): Remove now-unused package-global.
+ * aclocal.in (check_acinclude): Remove duplicate 'warning: '
+ prefix.
+
+ Fix typo in manual.
+ * doc/automake.texi (Simple Tests using parallel-tests): Add
+ missing closing parenthesis.
+
+ Fix leftover call to removed function macros_dump.
+ * automake.in (read_main_am_file): Call variables_dump, not
+ macros_dump. Print actual error before list of variables.
+
+2010-04-22 Stefano Lattarini <address@hidden>
+
+ Minor improvements in comments of test `silent3.test'.
+ * tests/silent3.test: Tell to keep it in sync with `silent9.test'
+ too.
+
+2010-04-25 Ralf Wildenhues <address@hidden>
+
+ testsuite: ensure verbose printing of captured output.
+ * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
+ tests/fort2.test, tests/help.test, tests/missing3.test,
+ tests/missing6.test: Print captured stdout or stderr before
+ grepping it.
+
+2010-04-20 Stefano Lattarini <address@hidden>
+
+ Make test badopt.test stricter (by enabling `set -e').
+ * tests/badopt.test: Add call to `set -e'. Due to this change,
+ an unexpected failure in the call to `$ACLOCAL' (whose outcome
+ was previously unchecked) would cause the whole test to fail.
+ Also, bumped the copyright years.
+
+ Make test for configure.in vs. configure.ac stricter.
+ * tests/configure.test: Use a configure.in file that provokes
+ an automake error, to ensure configure.ac is preferred.
+
+ Use `set -e' in confsub.test (avoids possible false negatives).
+ * tests/confsub.test: Enable shell `errexit' flag, and related
+ changes (this helps avoiding some possible minor false negatives).
+ Also, bumped copyright years.
+
2010-04-20 Ralf Wildenhues <address@hidden>
Fix -Werror handling for presence of configure.in and configure.ac.
@@ -111,7 +191,7 @@
* tests/confh5.test: In the generated Makefile.am: do not use
`test ! -e FILE' to check for the non-existence of a file, since
- that is not supported by Solarish/Heirloom Sh.
+ that is not supported by Solaris/Heirloom Sh.
Make test `aclocal3.test' stricter.
* tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL
diff --git a/Makefile.am b/Makefile.am
index f5ab44f..829418b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -595,7 +595,7 @@ fetch:
>>Fetchdir/update.patch 2>/dev/null; then :; \
else \
stat=1; \
- echo "Updating $(srcdir)/lib/$$file..."; \
+ echo "Updating $(srcdir)/lib/$$file ..."; \
cp Fetchdir/$$file $(srcdir)/lib/$$file; \
fi; \
done; \
diff --git a/Makefile.in b/Makefile.in
index 15d81ba..f1c07ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1279,7 +1279,7 @@ fetch:
>>Fetchdir/update.patch 2>/dev/null; then :; \
else \
stat=1; \
- echo "Updating $(srcdir)/lib/$$file..."; \
+ echo "Updating $(srcdir)/lib/$$file ..."; \
cp Fetchdir/$$file $(srcdir)/lib/$$file; \
fi; \
done; \
diff --git a/aclocal.in b/aclocal.in
index 9622711..06d69ed 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -183,8 +183,7 @@ sub check_acinclude ()
foreach my $key (keys %map)
{
# FIXME: should print line number of acinclude.m4.
- msg ('syntax', "warning: macro `$key' defined in "
- . "acinclude.m4 but never used")
+ msg ('syntax', "macro `$key' defined in acinclude.m4 but never used")
if $map{$key} eq 'acinclude.m4' && ! exists $macro_seen{$key};
}
}
@@ -870,14 +869,14 @@ sub usage ($)
{
my ($status) = @_;
- print "Usage: aclocal [OPTIONS] ...
+ print "Usage: aclocal [OPTION]...
Generate `aclocal.m4' by scanning `configure.ac' or `configure.in'
Options:
--acdir=DIR directory holding config files (for debugging)
--diff[=COMMAND] run COMMAND [diff -u] on M4 files that would be
- changed (implies --install and --dry-run)
+ changed (implies --install and --dry-run)
--dry-run pretend to, but do not actually update any file
--force always update output file
--help print this help, then exit
@@ -982,13 +981,13 @@ sub parse_arguments ()
}
if (exists $argopts{$ARGV[0]})
{
- fatal ("option `$ARGV[0]' requires an argument\n"
- . "Try `$0 --help' for more information.");
+ fatal ("option `$ARGV[0]' requires an argument.\n"
+ . "Try `$0 --help' for more information");
}
else
{
fatal ("unrecognized option `$ARGV[0]'\n"
- . "Try `$0 --help' for more information.");
+ . "Try `$0 --help' for more information");
}
}
@@ -1009,7 +1008,7 @@ sub parse_arguments ()
if ($install && address@hidden)
{
fatal ("--install should copy macros in the directory indicated by the"
- . "\nfirst -I option, but no -I was supplied.");
+ . "\nfirst -I option, but no -I was supplied");
}
if (! -d $system_includes[0])
@@ -1060,7 +1059,7 @@ my $loop = 0;
while (1)
{
++$loop;
- prog_error "Too many loops." if $loop > 2;
+ prog_error "too many loops" if $loop > 2;
reset_maps;
scan_m4_files;
diff --git a/automake.in b/automake.in
index 4a753db..05b8711 100644
--- a/automake.in
+++ b/automake.in
@@ -1327,7 +1327,7 @@ sub check_user_variables (@)
msg_cond_var ('gnu', $cond, $flag,
"`$flag' is a user variable, "
. "you should not override it;\n"
- . "use `AM_$flag' instead.");
+ . "use `AM_$flag' instead");
}
}
}
@@ -1587,7 +1587,7 @@ sub handle_languages
my $srcdir = dirname ($source);
if ($lang->ansi && $obj =~ /\$U/)
{
- prog_error "`$obj' contains \$U, but `$source' doesn't."
+ prog_error "`$obj' contains \$U, but `$source' doesn't"
if $source !~ /\$U/;
(my $source_ = $source) =~ s/\$U/_/g;
@@ -2894,7 +2894,7 @@ sub handle_ltlibraries
my $onlyone = ($dir ne $adir) ?
("\nLibtool libraries can be built for only one "
- . "destination.") : "";
+ . "destination") : "";
error ($liblocations{$val}{$acond},
"... and should also be $adirtxt$adircond.$onlyone");
@@ -4133,7 +4133,7 @@ sub scan_aclocal_m4 ()
push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
"`ACLOCAL_M4_SOURCES' is obsolete.\n"
- . "It should be safe to simply remove it.");
+ . "It should be safe to simply remove it");
}
# Note that it might be possible that aclocal.m4 doesn't exist but
@@ -5225,8 +5225,8 @@ sub scan_autoconf_config_files ($$)
my ($local, @rest) = split (/:/);
@rest = ("$local.in",) unless @rest;
msg ('portability', $where,
- "Omit leading `./' from config file names such as `$local',"
- . "\nas not all make implementations treat `file' and `./file'
equally.")
+ "omit leading `./' from config file names such as `$local',"
+ . "\nas not all make implementations treat `file' and `./file'
equally")
if ($local =~ /^\.\//);
my $input = locate_am @rest;
if ($input)
@@ -5350,7 +5350,7 @@ sub scan_autoconf_traces ($)
if ($seen_init_automake)
{
error ($where, "AC_CONFIG_AUX_DIR must be called before "
- . "AM_INIT_AUTOMAKE...", partial => 1);
+ . "AM_INIT_AUTOMAKE ...", partial => 1);
error ($seen_init_automake, "... AM_INIT_AUTOMAKE called here");
}
$config_aux_dir = $args[1];
@@ -5586,7 +5586,7 @@ sub scan_autoconf_files ()
. "should verify that $configure_ac invokes AM_INIT_AUTOMAKE,"
. "\nthat aclocal.m4 is present in the top-level directory,\n"
. "and that aclocal.m4 was recently regenerated "
- . "(using aclocal).");
+ . "(using aclocal)");
}
else
{
@@ -5597,7 +5597,7 @@ sub scan_autoconf_files ()
error ($seen_init_automake,
"your implementation of AM_INIT_AUTOMAKE comes from " .
"an\nold Automake version. You should recreate " .
- "aclocal.m4\nwith aclocal and run automake again.\n",
+ "aclocal.m4\nwith aclocal and run automake again",
# $? = 63 is used to indicate version mismatch to missing.
exit_code => 63);
}
@@ -5605,9 +5605,9 @@ sub scan_autoconf_files ()
{
error ($seen_init_automake,
"no proper implementation of AM_INIT_AUTOMAKE was " .
- "found,\nprobably because aclocal.m4 is missing...\n" .
+ "found,\nprobably because aclocal.m4 is missing.\n" .
"You should run aclocal to create this file, then\n" .
- "run automake again.\n");
+ "run automake again");
}
}
}
@@ -6402,7 +6402,7 @@ sub cond_stack_if ($$$)
my $mac = $_am_macro_for_cond{$cond};
$text .= "\n The usual way to define `$cond' is to add ";
$text .= ($mac =~ / /) ? $mac : "`$mac'";
- $text .= "\n to `$configure_ac' and run `aclocal' and `autoconf'
again.";
+ $text .= "\n to `$configure_ac' and run `aclocal' and `autoconf'
again";
# These warnings appear in Automake files (depend2.am),
# so there is no need to display them more than once:
$scope = US_GLOBAL;
@@ -6986,7 +6986,7 @@ sub read_main_am_file
my ($amfile) = @_;
# This supports the strange variable tricks we are about to play.
- prog_error (macros_dump () . "variable defined before read_main_am_file")
+ prog_error ("variable defined before read_main_am_file\n" . variables_dump
())
if (scalar (variables) > 0);
# Generate copyright header for generated Makefile.in.
@@ -7880,7 +7880,7 @@ sub require_file_internal ($$$@)
$trailer2 = "\n Consider adding the COPYING file"
. " to the version control system"
. "\n for your code, to avoid questions"
- . " about which license your project uses.";
+ . " about which license your project uses";
}
# Windows Perl will hang if we try to delete a
@@ -7916,7 +7916,7 @@ sub require_file_internal ($$$@)
# that distributes the aux dir files.
error ($where, 'please rerun automake without '
. "Makefile arguments\n"
- . "so $fullfile gets distributed.");
+ . "so $fullfile gets distributed");
}
}
}
@@ -8323,7 +8323,7 @@ sub generate_makefile ($$)
if (-e $out_file)
{
unlink ($out_file)
- or fatal "cannot remove $out_file: $!\n";
+ or fatal "cannot remove $out_file: $!";
}
my $gm_file = new Automake::XFile "> $out_file";
@@ -8341,7 +8341,7 @@ sub generate_makefile ($$)
# Print usage information.
sub usage ()
{
- print "Usage: $0 [OPTION] ... [Makefile]...
+ print "Usage: $0 [OPTION]... [Makefile]...
Generate Makefile.in for configure from Makefile.am.
@@ -8503,7 +8503,7 @@ sub parse_arguments ()
if (defined $output_directory)
{
- msg 'obsolete', "`--output-dir' is deprecated\n";
+ msg 'obsolete', "`--output-dir' is deprecated";
}
else
{
@@ -8530,20 +8530,20 @@ sub parse_arguments ()
}
elsif (exists $argopts{$ARGV[0]})
{
- fatal ("option `$ARGV[0]' requires an argument\n"
- . "Try `$0 --help' for more information.");
+ fatal ("option `$ARGV[0]' requires an argument.\n"
+ . "Try `$0 --help' for more information");
}
else
{
fatal ("unrecognized option `$ARGV[0]'.\n"
- . "Try `$0 --help' for more information.");
+ . "Try `$0 --help' for more information");
}
}
my $errspec = 0;
foreach my $arg (@ARGV)
{
- fatal ("empty argument\nTry `$0 --help' for more information.")
+ fatal ("empty argument\nTry `$0 --help' for more information")
if ($arg eq '');
# Handle $local:$input syntax.
diff --git a/doc/automake.texi b/doc/automake.texi
index 9bfcf65..48bf33a 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8669,7 +8669,7 @@ set of converted log files. The log and HTML files are
removed upon
@vindex DISABLE_HARD_ERRORS
@cindex Exit status 99, special interpretation
@cindex hard error
-Even in the presence of expected failures (see @code{XFAIL_TESTS}, there
+Even in the presence of expected failures (see @code{XFAIL_TESTS}), there
may be conditions under which a test outcome needs attention. For
example, with test-driven development, you may write tests for features
that you have not implemented yet, and thus mark these tests as expected
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 26ef575..acb3ae8 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -369,7 +369,7 @@ sub set_strictness ($)
}
else
{
- prog_error "level `$name' not recognized\n";
+ prog_error "level `$name' not recognized";
}
}
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 1fb2f53..aeed4db 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -680,7 +680,7 @@ Override the options of C<$channel> with those specified by
C<%options>.
sub setup_channel ($%)
{
my ($name, %opts) = @_;
- confess "channel $name doesn't exist" unless exists $channels{$name};
+ confess "unknown channel $name" unless exists $channels{$name};
_merge_options %{$channels{$name}}, %opts;
}
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index d5ad977..4f0e445 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006, 2009, 2010 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
@@ -80,7 +81,7 @@ sub find_configure_ac (;@)
{
msg ('unsupported',
"`$configure_ac' and `$configure_in' both present.\n"
- . "proceeding with `$configure_ac'.");
+ . "proceeding with `$configure_ac'");
}
return $configure_ac
}
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 0c38838..a6d65a8 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -369,7 +369,7 @@ sub set_strictness ($)
}
else
{
- prog_error "level `$strictness_name' not recognized\n";
+ prog_error "level `$strictness_name' not recognized";
}
}
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index d7e7105..d9d9ae0 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2006, 2007, 2010 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
@@ -659,7 +658,7 @@ sub define ($$$$$)
## is legitimate. (This is phony.test.)
# msg ('syntax', $where,
- # "redefinition of `$target'$condmsg...", partial => 1);
+ # "redefinition of `$target'$condmsg ...", partial => 1);
# msg_cond_rule ('syntax', $cond, $target,
# "... `$target' previously defined here");
}
@@ -695,7 +694,7 @@ sub define ($$$$$)
msg_cond_rule ('override', $cond, $target,
"user target `$target' defined here"
- . "$condmsg...", partial => 1);
+ . "$condmsg ...", partial => 1);
msg ('override', $where,
"... overrides Automake target `$oldname' defined here",
partial => $hint);
@@ -719,7 +718,7 @@ sub define ($$$$$)
my $oldsource = $tdef->source;
return () if $source eq $oldsource && $target eq $oldname;
- msg ('syntax', $where, "redefinition of `$target'$condmsg...",
+ msg ('syntax', $where, "redefinition of `$target'$condmsg ...",
partial => 1);
msg_cond_rule ('syntax', $cond, $target,
"... `$oldname' previously defined here");
@@ -727,7 +726,7 @@ sub define ($$$$$)
}
}
# Never reached.
- prog_error ("Unreachable place reached.");
+ prog_error ("unreachable place reached");
}
# Conditions for which the rule should be defined.
@@ -819,7 +818,7 @@ sub define ($$$$$)
# definitions of multiple inference rules. It's also
# disallowed to mix plain targets with inference rules.
msg ('portability', $where,
- "Inference rules can have only one target before the colon (POSIX).")
+ "inference rules can have only one target before the colon (POSIX)")
if $inference_rule_count > 0 && $target_count > 1;
return @conds;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 5d7c1d5..f75ec10 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -881,10 +881,10 @@ sub define ($$$$$$$$)
{
error ($def->location,
"Automake variable `$var' was set with `"
- . $def->type . "=' here...", partial => 1);
+ . $def->type . "=' here ...", partial => 1);
error ($where, "... and is now set with `$type=' here.");
prog_error ("Automake variable assignments should be consistently\n"
- . "defined with the same sign.");
+ . "defined with the same sign");
}
# If Automake tries to override a value specified by the user,
@@ -896,7 +896,7 @@ sub define ($$$$$$$$)
my $condmsg = ($cond == TRUE
? '' : (" in condition `" . $cond->human . "'"));
msg_cond_var ('override', $cond, $var,
- "user variable `$var' defined here$condmsg...",
+ "user variable `$var' defined here$condmsg ...",
partial => 1);
msg ('override', $where,
"... overrides Automake variable `$var' defined here");
@@ -1078,7 +1078,7 @@ For debugging.
sub variables_dump ()
{
- my $text = "All variables:\n{\n";
+ my $text = "all variables:\n{\n";
foreach my $var (sort { $a->name cmp $b->name } variables)
{
$text .= $var->dump;
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index a7bb219..67298f9 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -98,9 +98,6 @@ eval {
push (@EXPORT, @O);
};
-# Used in croak error messages.
-my $me = basename ($0);
-
=head2 Methods
=over
@@ -267,7 +264,7 @@ sub seek
if (!seek ($fh, $_[0], $_[1]))
{
my $file = $fh->name;
- fatal "$me: cannot rewind $file with @_: $!";
+ fatal "cannot rewind $file with @_: $!";
}
}
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 08de45c..37f34ca 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006
+## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006, 2010
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -73,7 +73,7 @@ check-DEJAGNU: site.exp
## the possibility of a corrupted site.exp if make is interrupted.
## Jim Meyering has some useful text on this topic.
site.exp: Makefile
- @echo 'Making a new site.exp file...'
+ @echo 'Making a new site.exp file ...'
@echo '## these variables are automatically generated by make ##'
>site.tmp
@echo '# Do not edit here. If you wish to override these values'
>>site.tmp
@echo '# edit the last section' >>site.tmp
diff --git a/lib/am/progs.am b/lib/am/progs.am
index d39b23d..d26968a 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
-## 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## 2006, 2007, 2008, 2009, 2010 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
@@ -42,7 +42,7 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
## The following awk script turns that into one line containing directories
-## and then lines of 'type target_name_or_directory sources...', with type
+## and then lines of 'type target_name_or_directory sources ...', with type
## 'd' designating directories, and 'f' files.
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
diff --git a/lib/gnupload b/lib/gnupload
index d445075..08cb842 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2010-02-08.07; # UTC
+scriptversion=2010-04-25.17; # UTC
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
@@ -185,7 +185,7 @@ done
dprint()
{
- echo "Running $*..."
+ echo "Running $* ..."
}
if $dry_run; then
@@ -249,7 +249,7 @@ echo
if test $# -ne 0; then
for file
do
- echo "Signing $file..."
+ echo "Signing $file ..."
rm -f $file.sig
echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
@@ -388,7 +388,7 @@ for dest in $to
do
for file
do
- echo "Uploading $file to $dest..."
+ echo "Uploading $file to $dest ..."
stmt=
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`
diff --git a/tests/acloca14.test b/tests/acloca14.test
index 8ddbb1a..a4e86d7 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2010 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
@@ -109,4 +109,5 @@ $MAKE testdist2
# Make sure aclocal diagnose missing included files with correct `file:line:'.
rm -f b.m4
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep 'a.m4:1:.*b.m4.*does not exist' stderr
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 22feb23..276e5ba 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2008, 2010 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
@@ -87,6 +87,7 @@ grep macro23 foo
ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
rm -f foo
$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep AM_MACRO2 stderr
ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'
diff --git a/tests/aclocal.test b/tests/aclocal.test
index 6b87a9d..d3437d2 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2004, 2008, 2010 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
@@ -24,14 +25,17 @@ $ACLOCAL --output=fred
test -f fred
$ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep 'option.*--output.*an argument' stderr
grep help stderr
$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep 'unrecognized.*--unknown-option' stderr
grep help stderr
$ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep 'unrecognized.*--ver' stderr
grep help stderr
diff --git a/tests/badopt.test b/tests/badopt.test
index 59eb5fa..2da53e9 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2003, 2010 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
@@ -18,9 +18,9 @@
. ./defs || Exit 1
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = zardoz
-END
+set -e
+
+echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
$ACLOCAL
AUTOMAKE_fails
diff --git a/tests/confdeps.test b/tests/confdeps.test
index 47cdc16..f706e8c 100755
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -21,12 +21,12 @@
echo "FOO = foo" > Makefile.am
set -e
-echo "$me: Generated by aclocal..."
+echo "$me: Generated by aclocal ..."
$ACLOCAL
$AUTOMAKE
grep '^\$(ACLOCAL_M4):' Makefile.in
-echo "$me: Not generated by aclocal..."
+echo "$me: Not generated by aclocal ..."
# Pretend it is not from aclocal (remove the signature),
# but keep it correct, i.e., with AM_INIT_AUTOMAKE etc.
sed -n '3,$p' aclocal.m4 >aclocal.m4t
diff --git a/tests/configure.test b/tests/configure.test
index 4b0f28d..50a034f 100755
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -28,6 +28,13 @@ AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
+cat >configure.in <<EOF
+AC_INIT([configure], [1.0])
+AM_INIT_AUTOMAKE([an-invalid-automake-option])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
: >Makefile.am
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/confsub.test b/tests/confsub.test
index 40c90c5..65ec91b 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010 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
@@ -20,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -55,5 +57,3 @@ $sleep
echo 'After.' > subdir/config.hin
$MAKE || Exit 1
$FGREP 'After.' subdir/config.h || Exit 1
-
-Exit 0
diff --git a/tests/fort2.test b/tests/fort2.test
index 3568189..70d13f2 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 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
@@ -48,6 +48,7 @@ $AUTOMAKE
grep '.\$(LINK)' Makefile.in && Exit 1
grep '.\$(FCLINK)' Makefile.in
grep '.\$(FCCOMPILE)' Makefile.in > stdout
+cat stdout
grep -v '\$(FCFLAGS_f' stdout && Exit 1
grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
# Notice the TAB:
diff --git a/tests/help.test b/tests/help.test
index d4d7110..e9ccf62 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2010 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
@@ -33,6 +33,7 @@ $AUTOMAKE --help
# aclocal and automake cannot work without configure.ac or configure.in
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep configure.ac stderr
grep configure.in stderr
AUTOMAKE_fails
diff --git a/tests/location.test b/tests/location.test
index 21cfb4e..bdd00c4 100755
--- a/tests/location.test
+++ b/tests/location.test
@@ -61,11 +61,11 @@ library.am: change your target to read `libfoo.a$(EXEEXT)'
Makefile.am:3: while processing library `libfoo.a'
program.am: target `libfoo.a$(EXEEXT)' was defined here
Makefile.am:1: while processing program `libfoo.a'
-program.am: warning: redefinition of `libfoo.a$(EXEEXT)'...
+program.am: warning: redefinition of `libfoo.a$(EXEEXT)' ...
Makefile.am:1: while processing program `libfoo.a'
library.am: ... `libfoo.a' previously defined here
Makefile.am:3: while processing library `libfoo.a'
-tags.am: warning: redefinition of `ctags'...
+tags.am: warning: redefinition of `ctags' ...
program.am: ... `ctags$(EXEEXT)' previously defined here
Makefile.am:6: while processing program `ctags'
EOF
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index 1b7fd83..18d306d 100755
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -55,7 +55,7 @@ Makefile.am:2: ... and should also be installed in `lib' in
condition COND.
Makefile.am:4: error: liba1.la multiply defined in condition COND
Makefile.am:4: `liba1.la' should be installed in `pkglib' in condition COND ...
Makefile.am:2: ... and should also be installed in `lib' in condition COND.
-Makefile.am:2: Libtool libraries can be built for only one destination.
+Makefile.am:2: Libtool libraries can be built for only one destination
END
grep '^Makefile.am' stderr | diff - expected
diff --git a/tests/missing3.test b/tests/missing3.test
index 07ef779..d3a7823 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2010 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
@@ -23,23 +23,30 @@ set -e
# b7cb8259 assumed not to exist.
./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep . stderr && Exit 1
./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep WARNING stderr
./missing --run b7cb8259 --version && Exit 1
./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep WARNING stderr
# missing itself it known to exist :)
./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep . stderr && Exit 1
./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep WARNING stderr
./missing --run ./missing --version 2>stderr
+cat stderr >&2
grep . stderr && Exit 1
./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
grep WARNING stderr && Exit 1
grep Unknown stderr
diff --git a/tests/missing6.test b/tests/missing6.test
index b63a0d1..914546b 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010 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
@@ -32,6 +32,7 @@ touch Makefile.am
$ACLOCAL
$AUTOCONF 2>stderr
+cat stderr >&2
grep 'You have another version of autoconf' stderr
grep 'aclocal.m4:.*this file was generated for' stderr
$AUTOMAKE
diff --git a/tests/silent3.test b/tests/silent3.test
index 70023ec..f83d914 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -16,7 +16,7 @@
# Check silent-rules mode, with libtool, standard depmode case.
-# Please keep this file in sync with silent4.test.
+# Please keep this file in sync with silent4.test and silent9.test.
required=libtoolize
. ./defs
diff --git a/tests/suffix11.test b/tests/suffix11.test
index e38926a..35cb41a 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2010 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
@@ -48,7 +48,7 @@ $ACLOCAL
$AUTOCONF
# What we do is not portable. Automake should warn.
AUTOMAKE_fails -a
-grep 'Inference rules can have only one target before the colon' stderr
+grep 'inference rules can have only one target before the colon' stderr
# But this should work anyway.
$AUTOMAKE -a -Wno-portability
./configure
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-169-g83d7976,
Ralf Wildenhues <=