Re: 1.6.20 up for testing/signing

[Johan Corveleyn <jc...@gmail.com>]

On Mon, Dec 31, 2012 at 1:35 PM, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
>> Sent: maandag 31 december 2012 08:55
>> To: Johan Corveleyn
>> Cc: Ben Reser; Subversion Development
>> Subject: Re: 1.6.20 up for testing/signing
>>
>> Johan Corveleyn wrote on Mon, Dec 31, 2012 at 01:50:19 +0100:
>> > I remember I could successfully build 1.6.19 with serf-0.7.1, so maybe
>> > I'll just do that for 1.6.20 too. However, maybe it's easy to fix
>> > this? The problem seems to be that, from serf-1.0 onwards, the
>> > resulting lib file is serf-1.lib. With serf-0.7.1 it was still named
>> > serf.lib. I'm not very familiar with the build system, so I don't know
>> > off hand how / where to fix this. Maybe someone else here knows, or
>> > can point me in the right direction?
>>
>> ENOTBERT but --- assuming libsvn_ra_serf-1.6.x supports serf-1.x in the
>> first place --- it should be a matter of s/serf/serf-1/ in the right
>> place.
>>
>> trunk suggests that place is get_win_libs():
>>
>> % grep -nR serf-'[012%]' build gen-make.py -l
>> build/transform_libtool_scripts.sh
>> build/generator/gen_win.py
>> build/ac-macros/serf.m4
>> % grep -nR serf-'[012%]' build/generator/gen_win.py
>> 1017:        serflib = 'serf-%d.lib' % self.serf_ver_maj
>> 1166:      serflib = 'serf-%d.lib' % self.serf_ver_maj
>
> I think the necessary patches are in
> ^/subversion/branches/subversion/branches/1.6.x-serf-1-win32

Thanks, Bert. I tried it (locally patched my subversion-1.6.20 (from
subversion-1.6.20.zip) with your changes). But unfortunately, I then
run into other problems:

libsvn_ra_serf-1.lib(util.obj) : error LNK2019: unresolved external
symbol _serf_bucket_snapshot referenced in function _setup_request
[C:\research\svn\client_build\subversion-1.6.20\build\win32\vcnet-vcproj\libsvn_ra_dll_vcnet.vcxproj]
libsvn_ra_serf-1.lib(util.obj) : error LNK2019: unresolved external
symbol _serf_bucket_restore_snapshot referenced in function
_setup_request [C:\research\svn\client_build\subversion-1.6.20\build\win32\vcnet-vcproj\libsvn_ra_dll_vcnet.vcxproj]
..\..\..\Release\subversion\libsvn_ra\libsvn_ra-1.dll : fatal error
LNK1120: 2 unresolved externals
[C:\research\svn\client_build\subversion-1.6.20\build\win32\vcnet-vcproj\libsvn_ra_dll_vcnet.vcxproj]

Should we try further, or should we just drop this, and instead try
again building with serf-0.7.1 on Windows (which does work)?

-- 
Johan