You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/07/27 00:55:18 UTC
svn commit: r1692785 - in /subversion/branches/1.8.x: ./ STATUS
build/generator/gen_win.py
Author: brane
Date: Sun Jul 26 22:55:17 2015
New Revision: 1692785
URL: http://svn.apache.org/r1692785
Log:
Merge the 1.8.x-VS2015 branch:
* ^/subversion/branches/1.8.x-VS2015
Allow builing Subversion 1.8.x with VS2015
Justification:
Allows building Subversion with the latest version of Visual Studio
without custom patches.
Votes:
+1: rhuijben, brane
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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 26 22:55:17 2015
@@ -1,6 +1,7 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/1.8.x-VS2013-14:1603404-1615199
+/subversion/branches/1.8.x-VS2015:1691901-1692784
/subversion/branches/1.8.x-apr-0.9:1585493-1589570
/subversion/branches/1.8.x-busted-proxy:1499222-1502434
/subversion/branches/1.8.x-gpg-agent:1600789-1640662
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1692785&r1=1692784&r2=1692785&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Jul 26 22:55:17 2015
@@ -108,11 +108,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * ^/subversion/branches/1.8.x-VS2015
- Allow builing Subversion 1.8.x with VS2015
- Justification:
- Allows building Subversion with the latest version of Visual Studio
- without custom patches.
- Votes:
- +1: rhuijben, brane
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=1692785&r1=1692784&r2=1692785&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Sun Jul 26 22:55:17 2015
@@ -194,6 +194,11 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '12.00'
self.vcproj_version = '12.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '2015' or val == '14':
+ self.vs_version = '2015'
+ self.sln_version = '12.00'
+ self.vcproj_version = '14.0'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^1\d+$', val):
self.vs_version = val
self.sln_version = '12.00'
@@ -873,7 +878,7 @@ class WinGeneratorBase(GeneratorBase):
if target.name == 'mod_dav_svn':
fakedefines.extend(["AP_DECLARE_EXPORT"])
- if target.name.find('ruby') == -1:
+ if target.name.find('ruby') == -1 and float(self.vcproj_version) < 14.0:
fakedefines.append("snprintf=_snprintf")
if isinstance(target, gen_base.TargetSWIG):