Re: merging msvc in branch-1.11

[Peter Rosin]

[dropping address@hidden

Stefano Lattarini skrev 2011-11-04 11:37:
> Reference:
>   <http://lists.gnu.org/archive/html/automake/2011-10/msg00031.html>
> 
> [Adding automake-patches]
> 
> On Tuesday 01 November 2011, Stefano Lattarini wrote:
>> Hi Peter.
>>
>> On Sunday 30 October 2011, Peter Rosin wrote:
>>>
>>> [SNIP]
>>>
>>> Sorry for the confusion, but the latest commit from the msvc branch
>>> currently merged into master is 38846c5f, which was apparently merged
>>> via the tests-init branch. That was right before the recent round of
>>> AM_PROG_AR commits. And 38846c5f is just a few "obvious" changes
>>> after a change to the compile script, so it is a sensible point to
>>> merge into maint should it not be desirable to merge msvc wholesale.
>>> (However, from my POV, I think it is indeed desirable to just merge
>>> msvc into maint/branch-1.11 before the release. Of course.)
>>>
>> I mostly agree that we should just merge msvc into branch-1.11 before
>> the release (then we should "freeze" that branch but for bug-fixes,
>> and start doing lots of tests).
>>
>> *BUT*, I don't like the idea that a "mere" bug-fixing version will
>> introduce new warnings enabled by `-Wall' and fatal under `-Werror'
>> (even if I've already agreed that doing so for 1.12 is perfectly
>> fine -- a statement that I'm not recanting!).
>>
>> Here is waht we should do IMHO:
>>
>>   1. Merge latest maint into msvc and master, merge msvc into master.
>>
> Done (see relevant recent messages on automake-patches).

I'll add some comments there later...

>>   2. Create a new public branch `msvc-for-1.11', based off of
>>     `msvc'.
>>
> I've instead based `msvc-for-1.11' on a merge of `branch-1.11'
> and `msvc'.

The history is a maze. It's very hard to follow what's going on. Is it
really desired to merge back maint and master into the work branches
with such extreme frenzy?

>>   3. Commit a change in this new branch, ensuring that either:
>>       [3a] the `extra-portability' warnings are *not* fatal, even
>>            with `Werror'; or that:
>>       [3b] the `extra-portability' warnings are *not* enabled by
>>            `-Wall'.
>>      And we should also tweak the NEWS file accordingly (but not
>>      the docuemntation IMHO).
>>      This change is *not* to be merged into either master or msvc,
>>      obviously.
>>
> I went for [3b].  Attached is what I've pushed.

The below patch (pushed as obvious) takes care of a couple of lapses.

>>   4. Merge `msvc-for-1.11' into `branch-1.11'.
>>
> Will do once we I have some ACK from Peter or Ralf, or in a week
> for now if no objection nor regression crops up.

msvc-for-1.11 seems to work ok here. Testsuite still running though.

>>   5. Test test test ...
>>
> Here, I could use a little help for more windows-savvy
> contributors ... ;-)

right

Cheers,
Peter

Oh, and here's the patch:

>From 3ffb98d2ca887286e0524b5db52b1399a6528ea1 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Tue, 8 Nov 2011 21:45:57 +0100
Subject: [PATCH] tests: fix broken backport of AM_PROG_AR tests

* tests/ar-lib3.test: Explicitly request -Wextra-portability
in order to trigger the expected error.
* tests/ar-lib4.test: Likewise.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog          |    7 +++++++
 tests/ar-lib3.test |    2 +-
 tests/ar-lib4.test |    4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b43e29d..1a4b514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-08  Peter Rosin  <address@hidden>
+
+       tests: fix broken backport of AM_PROG_AR tests
+       * tests/ar-lib3.test: Explicitly request -Wextra-portability
+       in order to trigger the expected error.
+       * tests/ar-lib4.test: Likewise.
+
 2011-11-04  Stefano Lattarini  <address@hidden>
 
        warnings: 'extra-portability' category is not implied by '-Wall'
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
index 6bcf6c2..37705e3 100755
--- a/tests/ar-lib3.test
+++ b/tests/ar-lib3.test
@@ -31,7 +31,7 @@ libfoo_a_SOURCES = foo.c
 END
 
 $ACLOCAL
-AUTOMAKE_fails
+AUTOMAKE_fails -Wextra-portability
 
 grep 'requires.*AM_PROG_AR' stderr
 
diff --git a/tests/ar-lib4.test b/tests/ar-lib4.test
index e05a8c2..9e01d6c 100755
--- a/tests/ar-lib4.test
+++ b/tests/ar-lib4.test
@@ -37,7 +37,7 @@ END
 
 libtoolize
 $ACLOCAL
-AUTOMAKE_fails
+AUTOMAKE_fails -Wextra-portability
 
 grep 'requires.*AM_PROG_AR' stderr
 
@@ -52,6 +52,6 @@ AC_OUTPUT
 END
 
 $ACLOCAL
-$AUTOMAKE --add-missing
+$AUTOMAKE -Wextra-portability --add-missing
 
 :
-- 
1.7.5.1