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 2014/06/11 13:12:58 UTC
svn commit: r1601851 - in /subversion/trunk/build/generator:
gen_win_dependencies.py templates/vcnet_sln.ezt
Author: rhuijben
Date: Wed Jun 11 11:12:58 2014
New Revision: 1601851
URL: http://svn.apache.org/r1601851
Log:
Create Visual Studio 2010+ compatible solutions and projects when generating
projects for VS 2012 and later. This introduces/fixes support for the Visual
Studio '14' compile chain's projects via the 'fallback' 14 behavior.
As the current estimated release time for VS '14' is 2015 at earliest, I'm
not adding a more specific name yet.
* build/generator/gen_win_dependencies.py
Make regex matches for deprecated versions a bit stricter. Fix vsversion
typo.
* build/generator/templates/vcnet_sln.ezt
Generate compatible versions header, specifying compatibility with VS 2010
SP 1 (which introduced support for the 12.0 format, really added in VS2012).
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/build/generator/templates/vcnet_sln.ezt
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1601851&r1=1601850&r2=1601851&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Jun 11 11:12:58 2014
@@ -218,22 +218,22 @@ class GenDependenciesBase(gen_base.Gener
elif opt == '-D':
self.cpp_defines.append(val)
elif opt == '--vsnet-version':
- if val == '2002' or re.match('7(\.\d+)?$', val):
+ if val == '2002' or re.match('^7(\.\d+)?$', val):
self.vs_version = '2002'
self.sln_version = '7.00'
self.vcproj_version = '7.00'
self.vcproj_extension = '.vcproj'
- elif val == '2003' or re.match('8(\.\d+)?$', val):
+ elif val == '2003' or re.match('^8(\.\d+)?$', val):
self.vs_version = '2003'
self.sln_version = '8.00'
self.vcproj_version = '7.10'
self.vcproj_extension = '.vcproj'
- elif val == '2005' or re.match('9(\.\d+)?$', val):
+ elif val == '2005' or re.match('^9(\.\d+)?$', val):
self.vs_version = '2005'
self.sln_version = '9.00'
self.vcproj_version = '8.00'
self.vcproj_extension = '.vcproj'
- elif val == '2008' or re.match('10(\.\d+)?$', val):
+ elif val == '2008' or re.match('^10(\.\d+)?$', val):
self.vs_version = '2008'
self.sln_version = '10.00'
self.vcproj_version = '9.00'
@@ -252,10 +252,10 @@ class GenDependenciesBase(gen_base.Gener
self.vs_version = '2013'
self.sln_version = '12.00'
self.vcproj_version = '12.0'
- self.vcproj_extension = '.vcxproj'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^1\d+$', val):
- self.vsversion = val
- self.sln_version = val + '.00'
+ self.vs_version = val
+ self.sln_version = '12.00'
self.vcproj_version = val + '.0'
self.vcproj_extension = '.vcxproj'
else:
Modified: subversion/trunk/build/generator/templates/vcnet_sln.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_sln.ezt?rev=1601851&r1=1601850&r2=1601851&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_sln.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_sln.ezt Wed Jun 11 11:12:58 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