commit 90079e8bba596a39a145f46ea97988bf24f4867f
Merge: 7e693f2 4c39a5f
Author: Stefano Lattarini
Date: Sat May 11 01:38:51 2013 +0200
Merge branch 'master' into ng/master
* master:
options: consistently use return statuses to report errors (more)
options: try to report as m
This is a follow-up to commit 'v1.13.1d-128-g6e486c5', needed to deal
with errors that are only present in the 'master' branch (while the
reported commit was on the 'maint' branch).
* lib/Automake/Options.pm (_process_option_list): Adjust, where dealing
with the removed options 'dist-shar' and 'di
commit 65643c8d626b2d60608300ad8495f1dfba1006a4
Merge: 1ffdec4 9f21b55
Author: Stefano Lattarini
Date: Sat May 11 01:06:58 2013 +0200
Merge branch 'maint'
* maint:
options: try to report as much errors as possible
warns: don't tell AM_PROG_MKDIR_P is going to be removed
For example, if two invalid options are used in AUTOMAKE_OPTIONS, don't
report just the first one, but both of them.
* lib/Automake/Options.pm (_process_option_list): Do so by avoiding
early returns in here.
Signed-off-by: Stefano Lattarini
---
lib/Automake/Options.pm | 19 +++
commit 421f0ad97b4344e7ed35321850df1ae896ed7298
Merge: 90ec3fe 74be388
Author: Stefano Lattarini
Date: Sat May 11 00:16:14 2013 +0200
Merge branch 'branch-1.13.2' into maint
* branch-1.13.2:
warns: don't tell AM_PROG_MKDIR_P is going to be removed
That is no longer true. For a more extended rationale, see file
'PLANS/obsolete-removed/am-prog-mkdir-p.txt' in the maint branch
(as of commit v1.13.1d-132-g90ec3fe).
* automake.in (scan_autoconf_traces): So adjust the warning message
here.
Signed-off-by: Stefano Lattarini
---
automake.in | 4
In some subroutines, we used a return value of 0 to indicate success,
and a return status of 1 to indicate failure. That was not very
consistent with the perl interpretation of 0 as a false value and 1 as
a true value. So we now invert the meaning of the exit statuses.
* lib/Automake/Options.pm
* lib/Automake/Options.pm (_option_must_be_from_configure): By giving
a proper return status here.
(_process_option_list): And using it here.
Signed-off-by: Stefano Lattarini
---
lib/Automake/Options.pm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/Automake/Opti
* lib/Automake/Options.pm (_process_option_list): Here, when an
invalid option is detected, there's no need to call &error with
the "uniq_scope => US_GLOBAL" switch. In fact, if the same
erroneous option is specified in AUTOMAKE_OPTIONS in both (say)
'Makefile.am' and 'sub/Makefile.am', we want ea
On 05/10/2013 10:49 PM, Eric Blake wrote:
> On 05/10/2013 02:19 PM, Stefano Lattarini wrote:
>> Signed-off-by: Stefano Lattarini
>> ---
>> THANKS | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Eric, can I have your ACK or NAK on this?
>
> Both are still valid, but I obviously us
On 05/10/2013 02:19 PM, Stefano Lattarini wrote:
> Signed-off-by: Stefano Lattarini
> ---
> THANKS | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Eric, can I have your ACK or NAK on this?
Both are still valid, but I obviously use my redhat.com address more
these days. ACK.
>
>
They had been unwittingly disabled by a slightly incorrect
code ordering.
* lib/Automake/Options.pm (process_option_list): Here.
(process_global_option_list): And here.
Signed-off-by: Stefano Lattarini
---
lib/Automake/Options.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -
Signed-off-by: Stefano Lattarini
---
THANKS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Eric, can I have your ACK or NAK on this?
Thanks,
Stefano
diff --git a/THANKS b/THANKS
index 66b3270..fe7a7de 100644
--- a/THANKS
+++ b/THANKS
@@ -108,7 +108,7 @@ Elmar Hoffmann
On 05/10/2013 09:37 PM, Eric Blake wrote:
> On 05/10/2013 01:18 PM, Stefano Lattarini wrote:
>> * NEWS: Automake 1.14 will warn if a subdir source file is
>> specified but the 'subdir-objects' option is not given. This
>> is done to smooth the transition to Automake 2.0, which will
>> unconditiona
See also discussion about automake wishlist bug#13324.
* lib/Automake/Options.pm: Give fatal errors (rather than warnings) if
the 'dist-shar' or 'dist-tarZ' options are used.
* lib/distdir.am: Remove the 'dist-tarZ' and 'dist-shar' targets, and
references to the '.tar.Z' and '.shar' archives.
* bi
On 05/10/2013 01:18 PM, Stefano Lattarini wrote:
> * NEWS: Automake 1.14 will warn if a subdir source file is
> specified but the 'subdir-objects' option is not given. This
> is done to smooth the transition to Automake 2.0, which will
> unconditionally assume the behaviour now given only with the
commit 0cf58ea7c1c05cdc7b6abff6edc68e934333d1e2
Merge: 0dd95c8 7a2ff99
Author: Stefano Lattarini
Date: Fri May 10 21:18:40 2013 +0200
Merge branch 'maint'
* maint:
news: document new 'subdir-objects' warning
PLANS: one minor fixlet (mostly cosmetic)
PLANS: we have alr
* NEWS: Automake 1.14 will warn if a subdir source file is
specified but the 'subdir-objects' option is not given. This
is done to smooth the transition to Automake 2.0, which will
unconditionally assume the behaviour now given only with the
'subdir-objects' option.
Signed-off-by: Stefano Lattari
See also discussion about automake wishlist bug#13324.
* lib/Automake/Options.pm: Give proper warnings in the 'obsolete'
category if the 'dist-shar' or 'dist-tarZ' options are used.
* lib/distdir.am: When the 'dist-tarZ' or 'dist-shar' targets are
invoked, make them give a non-fatal warning.
* doc
* maintainer/syntax-checks.mk (sc_perl_at_substs): Here: it should
refer to 'bin/automake' and 'bin/aclocal', not 'automake' and
'alocal'.
Signed-off-by: Stefano Lattarini
---
maintainer/syntax-checks.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maintainer/syntax-ch
On 05/09/2013 12:53 PM, Stefano Lattarini wrote:
> This is convenient to do, now that we have improved "relative directory"
> support with the '%reladir%' (a.k.a. '%D%') and '%canon_reladir%' (a.k.a.
> '%C%') Automake-time substitutions for included makefile fragments.
>
> This move also satisfy o
Signed-off-by: Stefano Lattarini
---
automake.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/automake.in b/automake.in
index 0c2ab3d..d22065a 100644
--- a/automake.in
+++ b/automake.in
@@ -318,7 +318,7 @@ my $configure_ac;
# Files found by scanning configure.ac for
* lib/am/*.am: In comments in some of these files.
Signed-off-by: Stefano Lattarini
---
lib/am/check.am | 2 +-
lib/am/header-vars.am | 2 +-
lib/am/library.am | 1 +
lib/am/ltlibrary.am | 1 +
lib/am/program.am | 1 +
lib/am/remake-hdr.am | 2 +-
6 files changed, 6 insertions(+
* lib/am/header-vars.am (am__make_running_with_option): Here.
Signed-off-by: Stefano Lattarini
---
lib/am/header-vars.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 4b9cc04..aef1082 100644
--- a/lib/am/header-vars.am
+
24 matches
Mail list logo
