You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/07/18 22:32:44 UTC
svn commit: r1148043 - /subversion/trunk/build/generator/gen_win.py
Author: rhuijben
Date: Mon Jul 18 20:32:44 2011
New Revision: 1148043
URL: http://svn.apache.org/viewvc?rev=1148043&view=rev
Log:
* build/generator/gen_win.py
(get_win_libs,
write_serf_project_file): Fix compilation agains serf trunk (2.0) which
currently still creates a serf-1.lib on Windows.
Modified:
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1148043&r1=1148042&r2=1148043&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Mon Jul 18 20:32:44 2011
@@ -1021,7 +1021,7 @@ class WinGeneratorBase(GeneratorBase):
neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
if self.serf_lib:
- if self.serf_ver_maj == 1:
+ if self.serf_ver_maj != 0:
serflib = 'serf-1.lib'
else:
serflib = 'serf.lib'
@@ -1181,7 +1181,7 @@ class WinGeneratorBase(GeneratorBase):
return
serf_path = os.path.abspath(self.serf_path)
- if self.serf_ver_maj == 1:
+ if self.serf_ver_maj != 0:
serflib = 'serf-1.lib'
else:
serflib = 'serf.lib'
Re: svn commit: r1148043 - /subversion/trunk/build/generator/gen_win.py
Posted by Greg Stein <gs...@gmail.com>.
On Mon, Jul 18, 2011 at 16:32, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Mon Jul 18 20:32:44 2011
> New Revision: 1148043
>
> URL: http://svn.apache.org/viewvc?rev=1148043&view=rev
> Log:
> * build/generator/gen_win.py
> (get_win_libs,
> write_serf_project_file): Fix compilation agains serf trunk (2.0) which
> currently still creates a serf-1.lib on Windows.
Fixed in serf r1547: it now creates serf-2.lib.
Cheers,
-g