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 2013/10/20 12:41:47 UTC
svn commit: r1533874 - in /subversion/branches/1.8.x: ./ STATUS
build/generator/gen_win.py
Author: rhuijben
Date: Sun Oct 20 10:41:47 2013
New Revision: 1533874
URL: http://svn.apache.org/r1533874
Log:
Merge ^/subversion/branches/1.8.x-serf-1.3+-windows from trunk manually,
because our automatic merge script doesn't like the branch name.
* ^/subversion/branches/1.8.x-serf-1.3+-windows
Allow compiling against serf 1.3 and later on Windows
Justification:
Serf 1.3 brings a lot of fixes that we need for 1.8.x stability.
Notes:
The dependency handling on Windows was updated for 1.9+, so this
needs a specific backport patch (r1517123)
Votes:
+1: rhuijben, brane, stefan2
../trunk/tools/dist/backport.pl: sh(256): (in 'the 1.8.x-serf-1.3+-windows branch') at
../trunk/tools/dist/backport.pl line 258, <STATUS> chunk 21.
Warning summary
===============
1.8.x-serf-1.3+-windows (^/subversion/branches/1.8.x-serf-1.3+-windows[...]): sh(256):
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/generator/gen_win.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x-serf-1.3+-windows:r1517122-1533873
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1533874&r1=1533873&r2=1533874&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Oct 20 10:41:47 2013
@@ -144,14 +144,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * ^/subversion/branches/1.8.x-serf-1.3+-windows
- Allow compiling against serf 1.3 and later on Windows
- Justification:
- Serf 1.3 brings a lot of fixes that we need for 1.8.x stability.
- Notes:
- The dependency handling on Windows was updated for 1.9+, so this
- needs a specific backport patch (r1517123)
- Votes:
- +1: rhuijben, brane, stefan2
-
Modified: subversion/branches/1.8.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_win.py?rev=1533874&r1=1533873&r2=1533874&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Sun Oct 20 10:41:47 2013
@@ -386,11 +386,18 @@ class WinGeneratorBase(GeneratorBase):
install_targets = [x for x in install_targets if not (isinstance(x, gen_base.TargetExe)
and x.install == 'bdb-test')]
+ # Don't build serf when we don't have it or for 1.3+
+ if not self.serf_lib or (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ install_targets = [x for x in install_targets if x.name != 'serf']
+
# Drop the serf target if we don't have both serf and openssl
if not self.serf_lib:
- install_targets = [x for x in install_targets if x.name != 'serf']
install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
+ # Don't build zlib if we have an already compiled serf
+ if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ install_targets = [x for x in install_targets if x.name != 'zlib']
+
# Drop the swig targets if we don't have swig
if not self.swig_path and not self.swig_libdir:
install_targets = [x for x in install_targets
@@ -993,7 +1000,10 @@ class WinGeneratorBase(GeneratorBase):
if self.sasl_path:
fakelibdirs.append(self.apath(self.sasl_path, "lib"))
if self.serf_lib:
- fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
+ if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ fakelibdirs.append(self.apath(self.serf_path))
+ else:
+ fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
fakelibdirs.append(self.apath(self.apr_path, libcfg))
fakelibdirs.append(self.apath(self.apr_util_path, libcfg))
@@ -1030,7 +1040,14 @@ class WinGeneratorBase(GeneratorBase):
else:
serflib = 'serf.lib'
- zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+ if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ # We don't build zlib ourselves, so use the standard name
+ # (zdll.lib would link to zlib.dll)
+ zlib = 'zlib.lib'
+ else:
+ # We compile zlib ourselves to these explicit (non-standard) names
+ zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+
sasllib = None
if self.sasl_path:
sasllib = 'libsasl.lib'
@@ -1074,6 +1091,9 @@ class WinGeneratorBase(GeneratorBase):
if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
nondeplibs.append(serflib)
+ if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ nondeplibs.append('ssleay32.lib')
+ nondeplibs.append('libeay32.lib')
if dep.external_lib == '$(SVN_SASL_LIBS)':
nondeplibs.append(sasllib)