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/26 12:21:40 UTC

svn commit: r1151055 - /subversion/trunk/build/generator/gen_win.py

Author: rhuijben
Date: Tue Jul 26 10:21:39 2011
New Revision: 1151055

URL: http://svn.apache.org/viewvc?rev=1151055&view=rev
Log:
* build/generator/gen_win.py
  (get_win_libs, write_serf_project_file): Following up on r1148043 (and a fix
    in serf) dynamically generate serf library names based on the serf version.

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=1151055&r1=1151054&r2=1151055&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Jul 26 10:21:39 2011
@@ -1022,7 +1022,7 @@ class WinGeneratorBase(GeneratorBase):
 
     if self.serf_lib:
       if self.serf_ver_maj != 0:
-        serflib = 'serf-1.lib'
+        serflib = 'serf-%d.lib' % self.serf_ver_maj
       else:
         serflib = 'serf.lib'
 
@@ -1182,7 +1182,7 @@ class WinGeneratorBase(GeneratorBase):
 
     serf_path = os.path.abspath(self.serf_path)
     if self.serf_ver_maj != 0:
-      serflib = 'serf-1.lib'
+      serflib = 'serf-%d.lib' % self.serf_ver_maj
     else:
       serflib = 'serf.lib'