Author: svn-role
Date: Fri Aug 1 18:59:15 2014
New Revision: 1615200
URL: http://svn.apache.org/r1615200
Log:
Merge the 1.8.x-VS2013-14 branch:
* ^/subversion/branches/1.8.x-VS2013-14
Enable support for generating VS2013 and later ("14"+) project files.
Justification:
This makes it possible to build with recent Visual Studio versions
without local patches.
Branch:
^/subversion/branches/1.8.x-VS2013-14
Votes:
+1: rhuijben, ivan, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/generator/gen_win.py
subversion/branches/1.8.x/build/generator/templates/vcnet_sln.ezt
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x-VS2013-14:r1603404-1615199
Merged /subversion/trunk:r1601851
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1615200&r1=1615199&r2=1615200&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Aug 1 18:59:15 2014
@@ -189,16 +189,6 @@ Veto-blocked changes:
Approved changes:
=================
- * ^/subversion/branches/1.8.x-VS2013-14
- Enable support for generating VS2013 and later ("14"+) project files.
- Justification:
- This makes it possible to build with recent Visual Studio versions
- without local patches.
- Branch:
- ^/subversion/branches/1.8.x-VS2013-14
- Votes:
- +1: rhuijben, ivan, breser
-
* r1606009
Allocate hash values in hash pool to avoid lifetime issue.
Justification:
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=1615200&r1=1615199&r2=1615200&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Fri Aug 1 18:59:15
2014
@@ -189,8 +189,13 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '12.00'
self.vcproj_version = '11.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '2013' or val == '12':
+ self.vs_version = '2013'
+ self.sln_version = '12.00'
+ self.vcproj_version = '12.0'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^1\d+$', val):
- self.vsversion = val
+ self.vs_version = val
self.sln_version = '12.00'
self.vcproj_version = val + '.0'
self.vcproj_extension = '.vcxproj'
Modified: subversion/branches/1.8.x/build/generator/templates/vcnet_sln.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/templates/vcnet_sln.ezt?rev=1615200&r1=1615199&r2=1615200&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/templates/vcnet_sln.ezt (original)
+++ subversion/branches/1.8.x/build/generator/templates/vcnet_sln.ezt Fri Aug
1 18:59:15 2014
@@ -21,7 +21,9 @@
#
[end]Microsoft Visual Studio Solution File, Format Version [version]
# Visual Studio [vs_version]
-[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"[targets.name]", "[targets.path]", "[targets.guid]"
+[is version "12.00"]VisualStudioVersion = 12.3.4.5
+MinimumVisualStudioVersion = 10.0.40219.1
+[end][for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"[targets.name]", "[targets.path]", "[targets.guid]"
[is dependency_location "solution"] ProjectSection(ProjectDependencies) =
postProject
[for targets.depends] [targets.depends.guid] = [targets.depends.guid]
[end] EndProjectSection
