Author: pburba
Date: Mon Jun 27 15:37:12 2011
New Revision: 1140208
URL: http://svn.apache.org/viewvc?rev=1140208&view=rev
Log:
Support forthcoming serf 1.0.0 on Windows (and fix Windows build when using
serf trunk).
* build/generator/gen_win.py
(WinGeneratorBase.get_win_libs.): Support serf-1.lib or serf.lib as
appropriate.
(WinGeneratorBase._get_serf_version): Keep the major, minor, and patch
version of serf as class attributes.
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=1140208&r1=1140207&r2=1140208&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Mon Jun 27 15:37:12 2011
@@ -1021,7 +1021,10 @@ class WinGeneratorBase(GeneratorBase):
neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
if self.serf_lib:
- serflib = 'serf.lib'
+ if self.serf_ver_maj == 1:
+ serflib = 'serf-1.lib'
+ else:
+ serflib = 'serf.lib'
zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
sasllib = None
@@ -1433,27 +1436,27 @@ class WinGeneratorBase(GeneratorBase):
# shouldn't be called unless serf is there
assert self.serf_path and os.path.exists(self.serf_path)
+ self.serf_ver_maj = None
+ self.serf_ver_min = None
+ self.serf_ver_patch = None
+
# serf.h should be present
if not os.path.exists(os.path.join(self.serf_path, 'serf.h')):
return None, None, None
- ver_maj = None
- ver_min = None
- ver_patch = None
-
txt = open(os.path.join(self.serf_path, 'serf.h')).read()
maj_match = re.search(r'SERF_MAJOR_VERSION\s+(\d+)', txt)
min_match = re.search(r'SERF_MINOR_VERSION\s+(\d+)', txt)
patch_match = re.search(r'SERF_PATCH_VERSION\s+(\d+)', txt)
if maj_match:
- ver_maj = int(maj_match.group(1))
+ self.serf_ver_maj = int(maj_match.group(1))
if min_match:
- ver_min = int(min_match.group(1))
+ self.serf_ver_min = int(min_match.group(1))
if patch_match:
- ver_patch = int(patch_match.group(1))
+ self.serf_ver_patch = int(patch_match.group(1))
- return ver_maj, ver_min, ver_patch
+ return self.serf_ver_maj, self.serf_ver_min, self.serf_ver_patch
def _find_serf(self):
"Check if serf and its dependencies are available"
