But, but ... I re-run gen-make.py pretty often (especially after I've
not built it for a while), so I certainly did in this case. Or do I
need to manually "clean" something before rerunning gen-make.py?

Bert, does the windows ra buildbot do a release build? The problem is
only for release builds, not for debug builds, as I mentioned in my
first post. The debug build works fine here.

Another possible difference: maybe the windows buildbot uses
--disable-shared? I don't. I'll give it a try to see if that makes a
difference.

-- 
Johan

On Tue, Apr 10, 2012 at 9:37 AM, Daniel Shahaf <danie...@elego.de> wrote:
> aka "need to re-run gen-make.py"
>
> Bert Huijben wrote on Mon, Apr 09, 2012 at 23:34:53 -0700:
>>  defined symbols (SVN_WITH_SYMMETRIC_MERGE)
>> MIME-Version: 1.0
>> Content-Type: text/plain; charset="utf-8"
>> Content-Transfer-Encoding: 7bit
>>
>> If that would be the problem here the windows ra buildbot would have
>> failed.
>>
>> I think the problem is that the extractor wasn't used, while public
>> APIs were added/removed.
>>
>> Bert Huijben (Cell phone)
>> From: Daniel Shahaf
>> Sent: 10-4-2012 5:03
>> To: Johan Corveleyn
>> Cc: Subversion Development
>> Subject: Re: build probs on Windows with release build and
>> conditionally defined symbols (SVN_WITH_SYMMETRIC_MERGE)
>> Johan Corveleyn wrote on Tue, Apr 10, 2012 at 03:19:24 +0200:
>> > (This reminds me of a similar problem I had a couple of months ago
>> > with some debug helpers which were also only defined conditional on
>> > SVN_DEBUG. I fixed it by moving the #ifdef SVN_DEBUG markers a bit
>> > deeper so the functions were always declared / defined).
>> >
>> > Anyway, I'm just noting it here, before I go disconnected for a couple
>> > of days. I don't know how to fix it right now (except by always
>> > enabling SVN_WITH_SYMMETRIC_MERGE, regardless of debug).
>>
>> One fix as you say is to make the two symbols[1] always
>> declared/defined.  The other is to add them to the list of exceptions in
>> build/generator/extractor.py for release builds.
>>
>>
>> [1]  svn_client__do_symmetric_merge and svn_client__find_symmetric_merge

Reply via email to