Hash :
26147eac
Author :
Date :
2009-03-12T07:40:20
Rename `silent' mode to `silent-rules' mode. * automake.in (define_verbose_var, verbose_flag) (define_verbose_tagvar, handle_options, handle_languages) (handle_configure, parse_arguments): Rename the `silent' option to `silent-rules', so it coincides with the `--silent-rules' command line option; adjust all code and comments. * lib/Automake/Options.pm (_process_option_list): Likewise. * doc/automake.texi (Invoking Automake, Libtool Flags, Options): Likewise. * NEWS: Adjust. * tests/dollarvar.test, tests/silent.test, tests/silent2.test, tests/silent3.test, tests/silent4.test, tests/silent5.test, tests/silent6.test, tests/silent7.test: Likewise. Suggestion by Jan Engelhardt. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
#!/bin/sh
# Copyright (C) 2009 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 3, 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 that -Wportability complains about recursive
# variable expansions and variables containing `$', `$(...)', or
# `${...}' in the name. We support recursive variable expansions using
# the latter two constructs for the `silent-rules' option, and they are
# rather widely supported in practice. OTOH variable definitions
# containing a `$' on the left hand side of an assignment are not
# portable in practice, even though POSIX allows them. :-/
. ./defs
set -e
cat >Makefile.am <<'EOF'
x = 1
foo$x = 1
bar$(x) = 1
baz${x} = 1
bla = $(foo$x)
bli = $(foo$(x))
blo = $(foo${x})
EOF
$ACLOCAL
AUTOMAKE_fails -Wportability
grep 'Makefile.am:2' stderr
grep 'Makefile.am:3' stderr
grep 'Makefile.am:4' stderr
grep 'Makefile.am:5' stderr
grep 'Makefile.am:6' stderr
grep 'Makefile.am:7' stderr
# On the other hand, if we allow `silent-rules' mode, then we need to
# allow recursive variable expansion, too.
# This should work with the `--silent-rules' command line switch.
AUTOMAKE_fails -Wportability --silent-rules
grep 'Makefile.am:2' stderr
grep 'Makefile.am:3' stderr
grep 'Makefile.am:4' stderr
grep 'Makefile.am:5' stderr
grep 'Makefile.am:6' stderr && Exit 1
grep 'Makefile.am:7' stderr && Exit 1
# This should work with AUTOMAKE_OPTIONS.
echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
AUTOMAKE_fails -Wportability
grep 'Makefile.am:2' stderr
grep 'Makefile.am:3' stderr
grep 'Makefile.am:4' stderr
grep 'Makefile.am:5' stderr
grep 'Makefile.am:6' stderr && Exit 1
grep 'Makefile.am:7' stderr && Exit 1
: