* lib/Automake/Options.pm: Prefer leading spaces to leading tabs
throughout. Minor whitespace and comment changes.
(_process_option_list): Simple refactoring to make the code more
pleasant to read and easier to modify in the future. This
refactoring also reduces code duplication, with the help of ...
(_option_must_be_from_configure, _is_valid_easy_option): ... these
new internal subroutines.
* tests/tar3.test: Enhance.
* tests/silent-amopts.test: New, checks that automake complains if
the 'silent-rules' option is used in AUTOMAKE_OPTIONS.
* tests/list-of-tests.mk: Add it.
lib/Automake/Options.pm | 174 ++++++++++++++++++++++++++--------------------
tests/list-of-tests.mk | 1 +
tests/silent-amopts.test | 28 ++++++++
tests/tar3.test | 10 ++-
4 files changed, 136 insertions(+), 77 deletions(-)
The patch is attached both in the proper, "complete" format and in a
format that ignores differences in whitespace only (obtained with
"git format-patch -w").
Regards,
Stefano
>From 00eb4ac9689ebc593e2d52ec3769e5696f105c35 Mon Sep 17 00:00:00 2001
Message-Id: <00eb4ac9689ebc593e2d52ec3769e5696f105c35.1330099996.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 24 Feb 2012 14:35:06 +0100
Subject: [PATCH] refactor: in Automake::Options (no semantic change)
* lib/Automake/Options.pm: Prefer leading spaces to leading tabs
throughout. Minor whitespace and comment changes.
(_process_option_list): Simple refactoring to make the code more
pleasant to read and easier to modify in the future. This
refactoring also reduces code duplication, with the help of ...
(_option_must_be_from_configure, _is_valid_easy_option): ... these
new internal subroutines.
* tests/tar3.test: Enhance.
* tests/silent-amopts.test: New, checks that automake complains if
the 'silent-rules' option is used in AUTOMAKE_OPTIONS.
* tests/list-of-tests.mk: Add it.
---
lib/Automake/Options.pm | 84 +++++++++++++++++++++++++++++----------------
tests/list-of-tests.mk | 1 +
tests/silent-amopts.test | 28 +++++++++++++++
tests/tar3.test | 10 ++++-
4 files changed, 91 insertions(+), 32 deletions(-)
create mode 100755 tests/silent-amopts.test
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index aac609c..651430d 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -72,7 +72,7 @@ F<Makefile.am>s.
# Values are the Automake::Location of the definition.
use vars '%_options'; # From AUTOMAKE_OPTIONS
-use vars '%_global_options'; # from AM_INIT_AUTOMAKE or the command line.
+use vars '%_global_options'; # From AM_INIT_AUTOMAKE or the command line.
# Whether process_option_list has already been called for the current
# Makefile.am.
@@ -244,6 +244,53 @@ Return 1 on error, 0 otherwise.
=cut
+# _option_must_be_from_configure ($OPTION, $WHERE)
+# ----------------------------------------------
+# Check that the $OPTION given in location $WHERE is specified with
+# AM_INIT_AUTOMAKE, not with AUTOMAKE_OPTIONS.
+sub _option_must_be_from_configure ($$)
+{
+ my ($opt, $where)= @_;
+ return
+ if $where->get =~ /^configure\./;
+ error $where,
+ "option '$opt' can only be used as argument to AM_INIT_AUTOMAKE\n" .
+ "but not in AUTOMAKE_OPTIONS makefile statements";
+}
+
+# _is_valid_easy_option ($OPTION)
+# -------------------------------
+# Explicitly recognize valid automake options that require no
+# special handling by '_process_option_list' below.
+sub _is_valid_easy_option ($)
+{
+ my $opt = shift;
+ return scalar grep { $opt eq $_ } qw(
+ check-news
+ color-tests
+ cygnus
+ dejagnu
+ dist-bzip2
+ dist-lzip
+ dist-shar
+ dist-tarZ
+ dist-xz
+ dist-zip
+ no-define
+ no-dependencies
+ no-dist
+ no-dist-gzip
+ no-exeext
+ no-installinfo
+ no-installman
+ no-texinfo.tex
+ nostdinc
+ readme-alpha
+ std-options
+ subdir-objects
+ );
+}
+
# $BOOL
# _process_option_list (\%OPTIONS, @LIST)
# ------------------------------------------
@@ -285,50 +332,27 @@ sub _process_option_list (\%@)
# This is a little of an hack, but good enough for the moment.
delete $options->{'parallel-tests'};
}
- elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
- || $_ eq 'dist-shar' || $_ eq 'dist-zip'
- || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
- || $_ eq 'dist-lzip' || $_ eq 'dist-xz'
- || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
- || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
- || $_ eq 'readme-alpha' || $_ eq 'check-news'
- || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
- || $_ eq 'no-exeext' || $_ eq 'no-define'
- || $_ eq 'std-options'
- || $_ eq 'color-tests'
- || $_ eq 'cygnus' || $_ eq 'no-dependencies')
- {
- # Explicitly recognize these.
- }
- elsif ($_ =~ /^filename-length-max=(\d+)$/)
+ elsif (/^filename-length-max=(\d+)$/)
{
delete $options->{$_};
$options->{'filename-length-max'} = [$_, $1];
}
elsif ($_ eq 'silent-rules')
{
- error ($where,
- "option '$_' can only be used as argument to AM_INIT_AUTOMAKE\n"
- . "but not in AUTOMAKE_OPTIONS makefile statements")
- if $where->get !~ /^configure\./;
+ _option_must_be_from_configure ($_, $where);
}
elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
{
- error ($where,
- "option '$_' can only be used as argument to AM_INIT_AUTOMAKE\n"
- . "but not in AUTOMAKE_OPTIONS makefile statements")
- if $where->get !~ /^configure\./;
+ _option_must_be_from_configure ($_, $where);
for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
{
- next if $opt eq $_;
- if (exists $options->{$opt})
- {
+ next
+ if $opt eq $_ or ! exists $options->{$opt};
error ($where,
"options '$_' and '$opt' are mutually exclusive");
last;
}
}
- }
elsif (/^\d+\.\d+(?:\.\d+)?[a-z]?(?:-[A-Za-z0-9]+)?$/)
{
# Got a version number.
@@ -344,7 +368,7 @@ sub _process_option_list (\%@)
my @w = map { { cat => $_, loc => $where} } split (',', $1);
push @warnings, @w;
}
- else
+ elsif (! _is_valid_easy_option $_)
{
error ($where, "option '$_' not recognized",
uniq_scope => US_GLOBAL);
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 542e1db..eaaa888 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -921,6 +921,7 @@ silentcxx.test \
silentcxx-gcc.test \
silentf77.test \
silentf90.test \
+silent-amopts.test \
silent-many-gcc.test \
silent-many-generic.test \
silent-nowarn.test \
diff --git a/tests/silent-amopts.test b/tests/silent-amopts.test
new file mode 100755
index 0000000..f71ad13
--- /dev/null
+++ b/tests/silent-amopts.test
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Copyright (C) 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
+# 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/>.
+
+# Check that automake complaints if the 'silent-rules' option is
+# used in AUTOMAKE_OPTIONS.
+
+. ./defs || Exit 1
+
+echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep "^Makefile\.am:1:.*'silent-rules'.*AM_INIT_AUTOMAKE" stderr
+
+:
diff --git a/tests/tar3.test b/tests/tar3.test
index ea46bb8..403ce99 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -29,7 +29,11 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure.ac:2:.*mutually exclusive' stderr
+grep "^configure\.ac:2:.*mutually exclusive" stderr > tar-err
+cat tar-err
+test 1 = `wc -l < tar-err`
+grep "'tar-pax'" tar-err
+grep "'tar-v7'" tar-err
rm -rf autom4te.cache
@@ -43,4 +47,6 @@ END
echo 'AUTOMAKE_OPTIONS = tar-pax' > Makefile.am
AUTOMAKE_fails
-grep 'Makefile.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
+grep '^Makefile\.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
+
+:
--
1.7.9
>From 00eb4ac9689ebc593e2d52ec3769e5696f105c35 Mon Sep 17 00:00:00 2001
Message-Id: <00eb4ac9689ebc593e2d52ec3769e5696f105c35.1330099979.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 24 Feb 2012 14:35:06 +0100
Subject: [PATCH] refactor: in Automake::Options (no semantic change)
* lib/Automake/Options.pm: Prefer leading spaces to leading tabs
throughout. Minor whitespace and comment changes.
(_process_option_list): Simple refactoring to make the code more
pleasant to read and easier to modify in the future. This
refactoring also reduces code duplication, with the help of ...
(_option_must_be_from_configure, _is_valid_easy_option): ... these
new internal subroutines.
* tests/tar3.test: Enhance.
* tests/silent-amopts.test: New, checks that automake complains if
the 'silent-rules' option is used in AUTOMAKE_OPTIONS.
* tests/list-of-tests.mk: Add it.
---
lib/Automake/Options.pm | 174 ++++++++++++++++++++++++++--------------------
tests/list-of-tests.mk | 1 +
tests/silent-amopts.test | 28 ++++++++
tests/tar3.test | 10 ++-
4 files changed, 136 insertions(+), 77 deletions(-)
create mode 100755 tests/silent-amopts.test
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index aac609c..651430d 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -26,11 +26,11 @@ use vars qw (@ISA @EXPORT);
@ISA = qw (Exporter);
@EXPORT = qw (option global_option
- set_option set_global_option
- unset_option unset_global_option
- process_option_list process_global_option_list
- set_strictness $strictness $strictness_name
- &FOREIGN &GNU &GNITS);
+ set_option set_global_option
+ unset_option unset_global_option
+ process_option_list process_global_option_list
+ set_strictness $strictness $strictness_name
+ &FOREIGN &GNU &GNITS);
=head1 NAME
@@ -71,8 +71,8 @@ F<Makefile.am>s.
=cut
# Values are the Automake::Location of the definition.
-use vars '%_options'; # From AUTOMAKE_OPTIONS
-use vars '%_global_options'; # from AM_INIT_AUTOMAKE or the command line.
+use vars '%_options'; # From AUTOMAKE_OPTIONS
+use vars '%_global_options'; # From AM_INIT_AUTOMAKE or the command line.
# Whether process_option_list has already been called for the current
# Makefile.am.
@@ -244,6 +244,53 @@ Return 1 on error, 0 otherwise.
=cut
+# _option_must_be_from_configure ($OPTION, $WHERE)
+# ----------------------------------------------
+# Check that the $OPTION given in location $WHERE is specified with
+# AM_INIT_AUTOMAKE, not with AUTOMAKE_OPTIONS.
+sub _option_must_be_from_configure ($$)
+{
+ my ($opt, $where)= @_;
+ return
+ if $where->get =~ /^configure\./;
+ error $where,
+ "option '$opt' can only be used as argument to AM_INIT_AUTOMAKE\n" .
+ "but not in AUTOMAKE_OPTIONS makefile statements";
+}
+
+# _is_valid_easy_option ($OPTION)
+# -------------------------------
+# Explicitly recognize valid automake options that require no
+# special handling by '_process_option_list' below.
+sub _is_valid_easy_option ($)
+{
+ my $opt = shift;
+ return scalar grep { $opt eq $_ } qw(
+ check-news
+ color-tests
+ cygnus
+ dejagnu
+ dist-bzip2
+ dist-lzip
+ dist-shar
+ dist-tarZ
+ dist-xz
+ dist-zip
+ no-define
+ no-dependencies
+ no-dist
+ no-dist-gzip
+ no-exeext
+ no-installinfo
+ no-installman
+ no-texinfo.tex
+ nostdinc
+ readme-alpha
+ std-options
+ subdir-objects
+ );
+}
+
# $BOOL
# _process_option_list (\%OPTIONS, @LIST)
# ------------------------------------------
@@ -262,15 +309,15 @@ sub _process_option_list (\%@)
my $where = $h->{'where'};
$options->{$_} = $where;
if ($_ eq 'gnits' || $_ eq 'gnu' || $_ eq 'foreign')
- {
- set_strictness ($_);
- }
+ {
+ set_strictness ($_);
+ }
elsif (/^(.*\/)?ansi2knr$/)
- {
+ {
# Obsolete (and now removed) de-ANSI-fication support.
error ($where,
"automatic de-ANSI-fication support has been removed");
- }
+ }
elsif ($_ eq 'dist-lzma')
{
error ($where, "support for lzma-compressed distribution " .
@@ -283,73 +330,50 @@ sub _process_option_list (\%@)
elsif ($_ eq 'serial-tests')
{
# This is a little of an hack, but good enough for the moment.
- delete $options->{'parallel-tests'};
+ delete $options->{'parallel-tests'};
}
- elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
- || $_ eq 'dist-shar' || $_ eq 'dist-zip'
- || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
- || $_ eq 'dist-lzip' || $_ eq 'dist-xz'
- || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
- || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
- || $_ eq 'readme-alpha' || $_ eq 'check-news'
- || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
- || $_ eq 'no-exeext' || $_ eq 'no-define'
- || $_ eq 'std-options'
- || $_ eq 'color-tests'
- || $_ eq 'cygnus' || $_ eq 'no-dependencies')
- {
- # Explicitly recognize these.
- }
- elsif ($_ =~ /^filename-length-max=(\d+)$/)
- {
- delete $options->{$_};
- $options->{'filename-length-max'} = [$_, $1];
- }
- elsif ($_ eq 'silent-rules')
+ elsif (/^filename-length-max=(\d+)$/)
{
- error ($where,
- "option '$_' can only be used as argument to AM_INIT_AUTOMAKE\n"
- . "but not in AUTOMAKE_OPTIONS makefile statements")
- if $where->get !~ /^configure\./;
- }
+ delete $options->{$_};
+ $options->{'filename-length-max'} = [$_, $1];
+ }
+ elsif ($_ eq 'silent-rules')
+ {
+ _option_must_be_from_configure ($_, $where);
+ }
elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
- {
- error ($where,
- "option '$_' can only be used as argument to AM_INIT_AUTOMAKE\n"
- . "but not in AUTOMAKE_OPTIONS makefile statements")
- if $where->get !~ /^configure\./;
- for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
- {
- next if $opt eq $_;
- if (exists $options->{$opt})
- {
- error ($where,
- "options '$_' and '$opt' are mutually exclusive");
- last;
- }
- }
- }
+ {
+ _option_must_be_from_configure ($_, $where);
+ for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
+ {
+ next
+ if $opt eq $_ or ! exists $options->{$opt};
+ error ($where,
+ "options '$_' and '$opt' are mutually exclusive");
+ last;
+ }
+ }
elsif (/^\d+\.\d+(?:\.\d+)?[a-z]?(?:-[A-Za-z0-9]+)?$/)
- {
- # Got a version number.
- if (Automake::Version::check ($VERSION, $&))
- {
- error ($where, "require Automake $_, but have $VERSION",
- uniq_scope => US_GLOBAL);
- return 1;
- }
- }
+ {
+ # Got a version number.
+ if (Automake::Version::check ($VERSION, $&))
+ {
+ error ($where, "require Automake $_, but have $VERSION",
+ uniq_scope => US_GLOBAL);
+ return 1;
+ }
+ }
elsif (/^(?:--warnings=|-W)(.*)$/)
- {
- my @w = map { { cat => $_, loc => $where} } split (',', $1);
- push @warnings, @w;
- }
- else
- {
- error ($where, "option '$_' not recognized",
- uniq_scope => US_GLOBAL);
- return 1;
- }
+ {
+ my @w = map { { cat => $_, loc => $where} } split (',', $1);
+ push @warnings, @w;
+ }
+ elsif (! _is_valid_easy_option $_)
+ {
+ error ($where, "option '$_' not recognized",
+ uniq_scope => US_GLOBAL);
+ return 1;
+ }
}
# We process warnings here, so that any explicitly-given warning setting
# will take precedence over warning settings defined implicitly by the
@@ -358,7 +382,7 @@ sub _process_option_list (\%@)
{
msg 'unsupported', $w->{'loc'},
"unknown warning category '$w->{'cat'}'"
- if switch_warning $w->{cat};
+ if switch_warning $w->{cat};
}
return 0;
}
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 542e1db..eaaa888 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -921,6 +921,7 @@ silentcxx.test \
silentcxx-gcc.test \
silentf77.test \
silentf90.test \
+silent-amopts.test \
silent-many-gcc.test \
silent-many-generic.test \
silent-nowarn.test \
diff --git a/tests/silent-amopts.test b/tests/silent-amopts.test
new file mode 100755
index 0000000..f71ad13
--- /dev/null
+++ b/tests/silent-amopts.test
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Copyright (C) 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
+# 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/>.
+
+# Check that automake complaints if the 'silent-rules' option is
+# used in AUTOMAKE_OPTIONS.
+
+. ./defs || Exit 1
+
+echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep "^Makefile\.am:1:.*'silent-rules'.*AM_INIT_AUTOMAKE" stderr
+
+:
diff --git a/tests/tar3.test b/tests/tar3.test
index ea46bb8..403ce99 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -29,7 +29,11 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure.ac:2:.*mutually exclusive' stderr
+grep "^configure\.ac:2:.*mutually exclusive" stderr > tar-err
+cat tar-err
+test 1 = `wc -l < tar-err`
+grep "'tar-pax'" tar-err
+grep "'tar-v7'" tar-err
rm -rf autom4te.cache
@@ -43,4 +47,6 @@ END
echo 'AUTOMAKE_OPTIONS = tar-pax' > Makefile.am
AUTOMAKE_fails
-grep 'Makefile.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
+grep '^Makefile\.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
+
+:
--
1.7.9
