[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-291-g108aec9 |
|
Date: |
Sat, 02 Jun 2012 10:23:15 +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=108aec93076a47ad4db91071915cc6dd234e366f
The branch, ng/master has been updated
via 108aec93076a47ad4db91071915cc6dd234e366f (commit)
via 405781dfa2adf3623f49e77a03ad2ac97c4e3373 (commit)
via baf0c10ed15a9af263f720b38a5807abb4468c90 (commit)
via 9c6bfea40542f3b37b2ce4f972629658876f54c4 (commit)
via e92bd2e745cc8273654b51cc1c3712211e9b3def (commit)
via 6476663785760c46e5ed81ccdede6449a3345ced (commit)
via cdf93debc6f791756a17aaba756a77c129151953 (commit)
via 94dc4ba08884ec27760a9c86b139ed548637a104 (commit)
via 964972933623c754cec5d929bc6d722e6b247174 (commit)
via 12bef166300e5fe2061166e20b94e2a3e2204f26 (commit)
via 58cad831c25194bc8b9e28c675d9bdec923f652e (commit)
via 192d699aaa4d31da0d7e75481fcbb51aa6862605 (commit)
via 423105aa0f9db7b6979e99d1a096dda03b2983d6 (commit)
via 9a7a83ba81789eddcd0aece24c079bac1116c8c1 (commit)
via ff022f46d098098bc17100332e2c96ebef715dff (commit)
via e6184b2ce04c2cb2aab55377b0fbd615a99d62c8 (commit)
via 6bf58a59a1f3803e57e3f0378aa9344686707b75 (commit)
via abc3d3d1c4acb4e8f83c948ee7b2ce51c6022291 (commit)
via 21da52c2d428168f06fecf1d7527dc5d1505633a (commit)
via 8ad470b671fdbdefe59ed60a1a5aa642c93d30c0 (commit)
via a12d9e9c49075f607106b719535f1f185ef43b4d (commit)
via 8ef057e44b8ce535b905d5cdd7159c3bd3f60b2f (commit)
via 6bd70f6a189aed90a574bd8607a7cef353f8232e (commit)
via 0d1e28a86cf4700ac078145cee44e07ba34c28a0 (commit)
via 16bf8ebc8156278699571ff92b47a923f242ace6 (commit)
via 0bec8b53f0c3808ee282d88dc0d86f8c1357073c (commit)
via a36a8f6e7f52521d3c5d9f382ab5a4e7676b42f1 (commit)
from 3155551c638623bfe42f7f6b7c15f66d712956c4 (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 108aec93076a47ad4db91071915cc6dd234e366f
Merge: 405781d e92bd2e
Author: Stefano Lattarini <address@hidden>
Date: Sat Jun 2 11:40:29 2012 +0200
Merge branch 'master' into ng/master
* master: (21 commits)
news: document deprecation of configure.in
news: put planned backward compatibilities early
sync: update files from upstream with "make fetch"
maint: deprecate 'configure.in' as autoconf input
maint: post-release minor version bump
release: stable release 1.12.1
copyright: update copyright years in a couple of files
tests: avoid spurious failures with Solaris 9 cscope program
maintcheck: fix a spurious failure
perf: beginning of a performance testsuite
aclocal: declare function prototypes, do not use '&' in function calls
news: support for configure.in will be dropped in future automake versions
missing: support AC_CONFIG_HEADERS in addition to obsolete
AC_CONFIG_HEADER
missing: don't bother checking for AM_CONFIG_HEADER: it is gone now
docs: remove mention of AM_CONFIG_HEADER: it is obsolete and removed now
tests: fix botched heading comments in 'lex-clean-cxx.sh'
[ng] maintcheck: some tweaks and fixlets
help: fix a typo in the list of warning categories
maint: version bump after beta release
release: beta release 1.12.0b (will become 1.12.1)
...
+ Extra non-trivial edits:
* Makefile.am (TESTS): Add the tests in the 't/perf' directory.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 405781dfa2adf3623f49e77a03ad2ac97c4e3373
Author: Stefano Lattarini <address@hidden>
Date: Sat Jun 2 11:04:42 2012 +0200
[ng] install: fix an unquoted usage of $(DESTDIR)
* lib/am/texinfos.am (am__create_installdir): Single-quote $(DESTDIR).
Issue revealed by the 'sc_unquoted_DESTDIR' maintainer check.
Signed-off-by: Stefano Lattarini <address@hidden>
commit baf0c10ed15a9af263f720b38a5807abb4468c90
Author: Stefano Lattarini <address@hidden>
Date: Sat Jun 2 10:59:56 2012 +0200
[ng] maintcheck: fix several spurious failures
* syntax-checks.mk ($(sc_renamed_variables_rules)): Only match the
"blacklisted" old variable names when they constitute a single word.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 9c6bfea40542f3b37b2ce4f972629658876f54c4
Author: Stefano Lattarini <address@hidden>
Date: Thu May 31 11:23:11 2012 +0200
[ng] maintcheck: fix bad typo, was preventing some checks to run
* syntax-check.mk (Sc_renamed_variables_rules): Renamed ...
(sc_renamed_variables_rules): ... to this.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
HACKING | 8 ++--
Makefile.am | 6 +--
NEWS | 21 +++++++++-
THANKS | 1 +
aclocal.in | 42 ++++++++++++++++----
defs | 10 +++++
doc/automake-ng.texi | 6 +-
doc/help2man | 3 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/am/texinfos.am | 2 +-
lib/config.sub | 3 +
lib/gitlog-to-changelog | 22 +++++++++-
lib/missing | 12 +++--
lib/texinfo.tex | 42 ++++++++++---------
syntax-checks.mk | 16 ++++----
t/aclocal-verbose-install.sh | 2 +-
t/cscope.tap | 7 ++-
t/ext2.sh | 2 +-
t/lex-clean-cxx.sh | 7 +--
t/{cond29.sh => perf/cond.sh} | 7 ---
.../testsuite-recheck.sh} | 0
.../testsuite-summary.sh} | 0
23 files changed, 148 insertions(+), 75 deletions(-)
rename t/{cond29.sh => perf/cond.sh} (80%)
rename t/{testsuite-recheck-speed.sh => perf/testsuite-recheck.sh} (100%)
rename t/{testsuite-summary-speed.sh => perf/testsuite-summary.sh} (100%)
diff --git a/.gitignore b/.gitignore
index eb45fca..b8b2951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,8 @@
/t/*.trs
/t/pm/*.log
/t/pm/*.trs
+/t/perf/*.log
+/t/perf/*.trs
cscope.files
cscope.in.out
cscope.out
diff --git a/HACKING b/HACKING
index 7ab4e7f..6966384 100644
--- a/HACKING
+++ b/HACKING
@@ -238,10 +238,10 @@
./bootstrap.sh && ./configure && make && make check && make distcheck
* Run "make git-tag-release".
- This will run the maintainer checks, check that the NEWS file is
- up-to-date, check that the local git repository and working tree
- are clean and up-to-date, and create a proper signed git tag for
- the release (based on the contents of $(VERSION)).
+ This will run the maintainer checks, verify that the local git
+ repository and working tree are clean and up-to-date, and create
+ a proper signed git tag for the release (based on the contents
+ of $(VERSION)).
* Run "make git-upload-release".
This will first verify that you are releasing from a tagged version
diff --git a/Makefile.am b/Makefile.am
index c7b7686..4f95e11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,7 +299,8 @@ EXTRA_DIST += t/README t/ax/is
all_TESTS = \
$(wildcard $(srcdir)/t/*.sh) \
$(wildcard $(srcdir)/t/*.tap) \
- $(wildcard $(srcdir)/t/pm/*.pl)
+ $(wildcard $(srcdir)/t/pm/*.pl) \
+ $(wildcard $(srcdir)/t/perf/*.sh)
# This is to ensure longer-running tests will be run earlier, which is
# useful when running the testsuite in parallel on multicore machines.
@@ -666,9 +667,6 @@ git-tag-release: maintainer-check
esac; \
$(determine_release_type); \
$(git_must_have_clean_workdir); \
-## Make sure the NEWS file is up-to-date.
- sed 1q $(srcdir)/NEWS | grep '$(VERSION)' >/dev/null \
- || fatal "NEWS not updated"; \
## If all was successful, tag the release in the local repository.
$$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
diff --git a/NEWS b/NEWS
index 6d83ac5..282fde2 100644
--- a/NEWS
+++ b/NEWS
@@ -58,10 +58,14 @@ New in 1.13:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.12.1:
+New in 1.12.2:
* WARNING: Future backward-incompatibilities!
+ - Future versions of Automake will likely drop support for the
+ long-deprecated 'configure.in' name for the Autoconf input file.
+ You are advised to use the recommended name 'configure.ac' instead.
+
- Starting from the next major Automake version (1.13), the rules to
build pdf, ps and dvi output from Texinfo input will use the '--tidy'
option by default. Since such an option was introduced in Texinfo
@@ -82,6 +86,17 @@ New in 1.12.1:
search path are looked up is probably going to be changed in the
next Automake release (1.13).
+* Warnings and deprecations:
+
+ - Automake now issues a warning (in the 'portability' category) if
+ 'configure.in' is used instead of 'configure.ac' as the Autoconf
+ input file. Such a warning will also be present in the next
+ Autoconf version (2.70).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12.1:
+
* New supported languages:
- Support for Objective C++ has been added; it should work similarly to
@@ -145,6 +160,10 @@ Bugs fixed in 1.12.1:
#line 7 "grammar.y"
as it did before.
+* Bugs with new Perl versions:
+
+ - Aclocal works correctly with perl 5.16.0 (automake bug#11543).
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.12:
diff --git a/THANKS b/THANKS
index 0824c4f..01b78c1 100644
--- a/THANKS
+++ b/THANKS
@@ -239,6 +239,7 @@ Martin Waitz address@hidden
Mathias Doreille address@hidden
Mathias Froehlich address@hidden
Mathias Hasselmann address@hidden
+Matt Burgess address@hidden
Matt Leach address@hidden
Matthew D. Langston address@hidden
Matthias Andree address@hidden
diff --git a/aclocal.in b/aclocal.in
index 28e2218..cc7343d 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -152,8 +152,34 @@ my $erase_me;
################################################################
+# Prototypes for all subroutines.
+
+sub unlink_tmp (;$);
+sub xmkdir_p ($);
+sub check_acinclude ();
+sub reset_maps ();
+sub install_file ($$);
+sub list_compare (address@hidden@);
+sub scan_m4_dirs ($@);
+sub scan_m4_files ();
+sub add_macro ($);
+sub scan_configure_dep ($);
+sub add_file ($);
+sub scan_file ($$$);
+sub strip_redundant_includes (%);
+sub trace_used_macros ();
+sub scan_configure ();
+sub write_aclocal ($@);
+sub usage ($);
+sub version ();
+sub handle_acdir_option ($$);
+sub parse_arguments ();
+sub parse_ACLOCAL_PATH ();
+
+################################################################
+
# Erase temporary file ERASE_ME. Handle signals.
-sub unlink_tmp
+sub unlink_tmp (;$)
{
my ($sig) = @_;
@@ -350,7 +376,7 @@ sub scan_m4_dirs ($@)
next if $file eq 'aclocal.m4';
my $fullfile = File::Spec->canonpath ("$m4dir/$file");
- &scan_file ($type, $fullfile, 'aclocal');
+ scan_file ($type, $fullfile, 'aclocal');
}
closedir (DIR);
}
@@ -361,12 +387,12 @@ sub scan_m4_files ()
{
# First, scan configure.ac. It may contain macro definitions,
# or may include other files that define macros.
- &scan_file (FT_USER, $configure_ac, 'aclocal');
+ scan_file (FT_USER, $configure_ac, 'aclocal');
# Then, scan acinclude.m4 if it exists.
if (-f 'acinclude.m4')
{
- &scan_file (FT_USER, 'acinclude.m4', 'aclocal');
+ scan_file (FT_USER, 'acinclude.m4', 'aclocal');
}
# Finally, scan all files in our search paths.
@@ -380,7 +406,7 @@ sub scan_m4_files ()
my $search = "sub search {\nmy \$found = 0;\n";
foreach my $key (reverse sort keys %map)
{
- $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key
+ $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key
. '"); $found = 1; }' . "\n");
}
$search .= "return \$found;\n};\n";
@@ -403,7 +429,7 @@ sub add_macro ($)
verb "saw macro $macro";
$macro_seen{$macro} = 1;
- &add_file ($map{$macro});
+ add_file ($map{$macro});
}
# scan_configure_dep ($file)
@@ -465,7 +491,7 @@ sub scan_configure_dep ($)
}
add_macro ($_) foreach (@rlist);
- &scan_configure_dep ($_) foreach @ilist;
+ scan_configure_dep ($_) foreach @ilist;
}
# add_file ($FILE)
@@ -931,7 +957,7 @@ EOF
}
# Print version and exit.
-sub version()
+sub version ()
{
print <<EOF;
aclocal (GNU $PACKAGE) $VERSION
diff --git a/defs b/defs
index 564e7f9..4b2e086 100644
--- a/defs
+++ b/defs
@@ -618,6 +618,16 @@ require_compiler_ ()
## required by them. ##
## ----------------------------------------------------------- ##
+# Performance tests must be enabled explicitly.
+case $argv0 in
+ */perf/*)
+ case $AM_TESTSUITE_PERF in
+ [yY]|[yY]es|1) ;;
+ *) skip_ "performance tests not explicitly enabled" ;;
+ esac
+ ;;
+esac
+
# Look for (and maybe set up) required tools and/or system features; skip
# the current test if they are not found.
for tool in : $required
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 7216d2c..a01136c 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -6032,9 +6032,9 @@ Automake already provides some @option{-I} options
automatically, in a
separate variable that is also passed to every compilation that invokes
the C preprocessor. In particular it generates @samp{-I.},
@samp{-I$(srcdir)}, and a @option{-I} pointing to the directory holding
address@hidden (if you've used @code{AC_CONFIG_HEADERS} or
address@hidden). You can disable the default @option{-I}
-options using the @option{nostdinc} option.
address@hidden (if you've used @code{AC_CONFIG_HEADERS}). You can
+disable the default @option{-I} options using the @option{nostdinc}
+option.
When a file to be included is generated during the build and not part
of a distribution tarball, its location is under @code{$(builddir)},
diff --git a/doc/help2man b/doc/help2man
index 45cb182..6b915bc 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -1,8 +1,7 @@
#!/usr/bin/perl -w
# Generate a short man page from --help and --version output.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-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
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 6fc14be..b1ee32e 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -193,7 +193,7 @@ Warning categories include:
unsupported unsupported or incomplete features (default)
all all the warnings
no-CATEGORY turn off warnings in CATEGORY
- none' turn off all the warnings
+ none turn off all the warnings
error treat warnings as errors
EOF
}
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 2c94db1..afe08a1 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -16,7 +16,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
## FIXME: this should probably be moved to header-vars.am ...
-am__create_installdir = $(if $(and $1,$^),$(MKDIR_P) $(DESTDIR)$1,@:)
+am__create_installdir = $(if $(and $1,$^),$(MKDIR_P) '$(DESTDIR)$1',@:)
## ----------- ##
## Variables. ##
diff --git a/lib/config.sub b/lib/config.sub
index 59bb593..6205f84 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1543,6 +1543,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 38c6f3a..17c4562 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-18 07:50'; # UTC
+my $VERSION = '2012-05-22 09:40'; # 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
@@ -73,7 +73,10 @@ OPTIONS:
--format=FMT set format string for commit subject and body;
see 'man git-log' for the list of format metacharacters;
the default is '%s%n%b%n'
-
+ --strip-tab remove one additional leading TAB from commit message lines.
+ --strip-cherry-pick remove data inserted by "git cherry-pick";
+ this includes the "cherry picked from commit ..." line,
+ and the possible final "Conflicts:" paragraph.
--help display this help and exit
--version output version information and exit
@@ -195,6 +198,8 @@ sub parse_amend_file($)
my $amend_file;
my $append_dot = 0;
my $cluster = 1;
+ my $strip_tab = 0;
+ my $strip_cherry_pick = 0;
GetOptions
(
help => sub { usage 0 },
@@ -204,6 +209,8 @@ sub parse_amend_file($)
'amend=s' => \$amend_file,
'append-dot' => \$append_dot,
'cluster!' => \$cluster,
+ 'strip-tab' => \$strip_tab,
+ 'strip-cherry-pick' => \$strip_cherry_pick,
) or usage 1;
@@ -263,6 +270,13 @@ sub parse_amend_file($)
$rest = $_;
}
+ # Remove lines inserted by "git cherry-pick".
+ if ($strip_cherry_pick)
+ {
+ $rest =~ s/^\s*Conflicts:\n.*//sm;
+ $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
+ }
+
my @line = split "\n", $rest;
my $author_line = shift @line;
defined $author_line
@@ -347,6 +361,10 @@ sub parse_amend_file($)
}
}
+ # Remove one additional leading TAB from each line.
+ $strip_tab
+ and map { s/^\t// } @line;
+
# Prefix each non-empty line with a TAB.
@line = map { length $_ ? "\t$_" : '' } @line;
diff --git a/lib/missing b/lib/missing
index 6b4153e..be44a62 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-05-20.14; # UTC
+scriptversion=2012-06-02.10; # UTC
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <address@hidden>, 1996.
@@ -151,10 +151,12 @@ WARNING: '$1' is $msg. You should only need it if
autoheader*)
echo 1>&2 "\
WARNING: '$1' is $msg. You should only need it if
- you modified '${configure_ac}'. You might want to install the
- Autoconf and GNU m4 packages. Grab them from any GNU archive
- site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
+ you modified 'acconfig.h' or '${configure_ac}'. You might want
+ to install the Autoconf and GNU m4 packages. Grab them
+ from any GNU archive site."
+ files=`sed -n -e 's/^[ ]*AC_CONFIG_HEADER(\([^)]*\)).*/\1/p' \
+ -e 's/^[ ]*AC_CONFIG_HEADERS(\([^)]*\)).*/\1/p' \
+ ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index e4dca02..0f3a096 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-04-06.11}
+\def\texinfoversion{2012-05-16.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -28,9 +28,9 @@
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
-% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-% ftp://tug.org/tex/texinfo.tex
-% (and all CTAN mirrors, see http://www.ctan.org).
+% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
% The texinfo.tex in any given distribution could well be out
% of date, so if that's what you're using, please check.
%
@@ -1367,9 +1367,8 @@ output) for that.)}
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
\else\let\nextsp\skipspaces
- \ifx\p\space\else\addtokens{\filename}{\PP}%
- \advance\filenamelength by 1
- \fi
+ \addtokens{\filename}{\PP}%
+ \advance\filenamelength by 1
\fi
\nextsp}
\def\getfilename#1{%
@@ -1475,9 +1474,6 @@ output) for that.)}
\def\ttsl{\setfontstyle{ttsl}}
-% Default leading.
-\newdimen\textleading \textleading = 13.2pt
-
% Set the baselineskip to #1, and the lineskip and strut size
% correspondingly. There is no deep meaning behind these magic numbers
% used as factors; they just match (closely enough) what Knuth defined.
@@ -1489,6 +1485,7 @@ output) for that.)}
% can get a sort of poor man's double spacing by redefining this.
\def\baselinefactor{1}
%
+\newdimen\textleading
\def\setleading#1{%
\dimen0 = #1\relax
\normalbaselineskip = \baselinefactor\dimen0
@@ -1761,18 +1758,24 @@ end
\fi\fi
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
+% Set the font macro #1 to the font named \fontprefix#2.
% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
-% empty to omit).
+% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
+% Example:
+% #1 = \textrm
+% #2 = \rmshape
+% #3 = 10
+% #4 = \mainmagstep
+% #5 = OT1
+%
\def\setfont#1#2#3#4#5{%
\font#1=\fontprefix#2#3 scaled #4
\csname cmap#5\endcsname#1%
}
% This is what gets called when #5 of \setfont is empty.
\let\cmap\gobble
-% emacs-page end of cmaps
+%
+% (end of cmaps)
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
@@ -1782,7 +1785,7 @@ end
\fi
% Support font families that don't use the same naming scheme as CM.
\def\rmshape{r}
-\def\rmbshape{bx} %where the normal face is bold
+\def\rmbshape{bx} % where the normal face is bold
\def\bfshape{b}
\def\bxshape{bx}
\def\ttshape{tt}
@@ -1797,8 +1800,7 @@ end
\def\scshape{csc}
\def\scbshape{csc}
-% Definitions for a main text size of 11pt. This is the default in
-% Texinfo.
+% Definitions for a main text size of 11pt. (The default in Texinfo.)
%
\def\definetextfontsizexi{%
% Text fonts (11.2pt, magstep1).
@@ -1923,7 +1925,7 @@ end
\textleading = 13.2pt % line spacing for 11pt CM
\textfonts % reset the current fonts
\rm
-} % end of 11pt text font size definitions
+} % end of 11pt text font size definitions, \definetextfontsizexi
% Definitions to make the main text be 10pt Computer Modern, with
@@ -2055,7 +2057,7 @@ end
\textleading = 12pt % line spacing for 10pt CM
\textfonts % reset the current fonts
\rm
-} % end of 10pt text font size definitions
+} % end of 10pt text font size definitions, \definetextfontsizex
% We provide the user-level command
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 2f5be71..a13ce38 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -105,10 +105,10 @@ sc_perl_syntax:
@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
-## expect no instances of '${...}'. However, $${...} is ok, since that
+## Expect no instances of '${...}'. However, $${...} is ok, since that
## is a shell construct, not a Makefile construct.
sc_no_brace_variable_expansions:
- @if grep -F '$${' $(ams) | grep -F -v '$$$$'; then \
+ @if grep -v '^ *#' $(ams) | grep -F '$${' | grep -F -v '$$$$'; then \
echo "Found too many uses of '\$${' in the lines above." 1>&2; \
exit 1; \
else :; fi
@@ -327,7 +327,7 @@ modern.am__TEST_RESULTS = am__test_results
modern.CONFIG_HEADER = AM_CONFIG_HEADERS
modern.DEFAULT_INCLUDES = AM_DEFAULT_INCLUDES
-Sc_renamed_variables_rules = \
+sc_renamed_variables_rules = \
$(patsubst modern.%,sc_no_%,$(filter modern.%,$(.VARIABLES)))
$(sc_renamed_variables_rules): sc_no_% :
@@ -338,7 +338,7 @@ $(sc_renamed_variables_rules): sc_no_% :
$(srcdir)/automake.in \
$(srcdir)/doc/*.texi \
"; \
- if grep -F '$*' $$files; then \
+ if grep -E '\b$*\b' $$files; then \
echo "'\$$($*)' is obsolete and no more used." >&2; \
echo "You should use '$(modern.$*)' instead." >&2; \
exit 1; \
@@ -437,19 +437,19 @@ $(sc_tests_plain_check_rules): sc_tests_plain_% :
## Tests should only use END and EOF for here documents
## (so that the next test is effective).
sc_tests_here_document_format:
- @if grep '<<' $(xtests) | grep -Ev '\b(END|EOF)\b|\bstd::cout <<'; then
\
+ @if grep '<<' $(xtests) | grep -Ev '\b(END|EOF)\b|\bcout <<'; then \
echo 'Use here documents with "END" and "EOF" only, for
greppability.' 1>&2; \
exit 1; \
fi
## Tests should never call exit directly, but use Exit.
## This is so that the exit status is transported correctly across the 0 trap.
-## Ignore comments, testsuite self tests, and one perl line in ext2.sh.
+## Ignore comments and our testsuite's own self tests.
sc_tests_Exit_not_exit:
@found=false; for file in $(xtests); do \
case $$file in */self-check-*) continue;; esac; \
- res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
- -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
+ res=`sed -n -e '/^#/d' -e '/<<.*END/,/^END/b' -e '/<<.*EOF/,/^EOF/b' \
+ -e '/exit [$$0-9]/p' $$file`; \
if test -n "$$res"; then \
echo "$$file:$$res"; \
found=true; \
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 099fff4..594c607 100755
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
diff --git a/t/cscope.tap b/t/cscope.tap
index 1e09331..fb808cc 100755
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -65,8 +65,9 @@ $ACLOCAL || fatal_ "aclocal failed"
$AUTOCONF || fatal_ "autoconf failed"
$AUTOMAKE -i -a || fatal_ "automake -i -a failed"
-# Sun cscope is interactive without redirection.
-if cscope --version </dev/null; then
+# Sun cscope is interactive without redirection; also, it might not
+# support the '-q' option, which is required by our generated recipes.
+if cscope -q --version </dev/null; then
have_cscope=yes
else
have_cscope=no
@@ -99,7 +100,7 @@ test_cscope ()
if test $have_cscope = no; then
# For later tests.
touch cscope.files cscope.out cscope.in.out cscope.po.out
- skip_row_ 3 -r "no cscope program avaiable"
+ skip_row_ 3 -r "no proper cscope program available"
return 0
fi
diff --git a/t/ext2.sh b/t/ext2.sh
index 3df0282..ac5b777 100755
--- a/t/ext2.sh
+++ b/t/ext2.sh
@@ -63,4 +63,4 @@ cat rules
#| #r-i.o: i.cxx
# Bail out if we find a duplicate.
-$PERL -ne 'if (exists $a{$_}) { exit 1 } else { $a{$_} = 1 }' < rules
+$PERL -ne 'if (exists $a{$_}) { exit (1) } else { $a{$_} = 1 }' < rules
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index d1a745b..8834a74 100755
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -14,10 +14,9 @@
# 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 that C++ source and header files derived from non-distributed
-# Yacc sources are cleaned by "make clean", while C++ source and
-# header files derived from distributed Yacc sources are cleaned by
-# "make maintainer-clean".
+# Check that C++ source files derived from non-distributed Lex sources
+# are cleaned by "make clean", while C++ source files derived from
+# distributed Lex sources are cleaned by "make maintainer-clean".
# See also sister test 'lex-clean.test'.
required='c++ lex'
diff --git a/t/cond29.sh b/t/perf/cond.sh
similarity index 80%
rename from t/cond29.sh
rename to t/perf/cond.sh
index ee9bf9b..7c8261e 100755
--- a/t/cond29.sh
+++ b/t/perf/cond.sh
@@ -32,13 +32,6 @@ EOF
# to define a01_DEPENDENCIES, a02_DEPENDENCIES, a03_OBJECTS,
# a04_OBJECTS, and to rewrite bin_PROGRAM), eating all memory, swap,
# or cpu time it can found.
-# Limit memory available to spawned processes to ~ 150 MB. Considering
-# that 70 MB is enough for x86_64 Fedora 16, that gives tools and
-# libraries plenty of room to grow. Suggested by Jim Meyering in
-# automake bug#10374.
-(ulimit -v 1; sh -c ":") && skip_ "no adequate 'ulimit' builtin found"
-(ulimit -v 150000; sh -c ":") || skip_ "no adequate 'ulimit' builtin found"
-ulimit -v 150000
for i in \
01 02 03 04 05 06 07 08 09 10 \
diff --git a/t/testsuite-recheck-speed.sh b/t/perf/testsuite-recheck.sh
similarity index 100%
rename from t/testsuite-recheck-speed.sh
rename to t/perf/testsuite-recheck.sh
diff --git a/t/testsuite-summary-speed.sh b/t/perf/testsuite-summary.sh
similarity index 100%
rename from t/testsuite-summary-speed.sh
rename to t/perf/testsuite-summary.sh
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-291-g108aec9,
Stefano Lattarini <=