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/18 12:45:23 UTC
svn commit: r1603405 - in /subversion/branches/1.8.x-VS2013-14: ./
build/generator/gen_win.py build/generator/templates/vcnet_sln.ezt
Author: rhuijben
Date: Wed Jun 18 10:45:22 2014
New Revision: 1603405
URL: http://svn.apache.org/r1603405
Log:
* .
Record merge of r1601851
* build/generator/gen_win.py
Explicitly support VS 2013 and fix support of future VS versions by setting
the right variable.
* build/generator/templates/vcnet_sln.ezt
Properly generate a forward and backward compatible solution file for
VS > 2010.
Modified:
subversion/branches/1.8.x-VS2013-14/ (props changed)
subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py
subversion/branches/1.8.x-VS2013-14/build/generator/templates/vcnet_sln.ezt
Propchange: subversion/branches/1.8.x-VS2013-14/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1601851
Modified: subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py?rev=1603405&r1=1603404&r2=1603405&view=diff
==============================================================================
--- subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py Wed Jun 18 10:45:22 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 = '2012'
+ 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-VS2013-14/build/generator/templates/vcnet_sln.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-VS2013-14/build/generator/templates/vcnet_sln.ezt?rev=1603405&r1=1603404&r2=1603405&view=diff
==============================================================================
--- subversion/branches/1.8.x-VS2013-14/build/generator/templates/vcnet_sln.ezt (original)
+++ subversion/branches/1.8.x-VS2013-14/build/generator/templates/vcnet_sln.ezt Wed Jun 18 10:45:22 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
Re: svn commit: r1603405 - in /subversion/branches/1.8.x-VS2013-14:
./ build/generator/gen_win.py build/generator/templates/vcnet_sln.ezt
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 18 June 2014 14:45, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Wed Jun 18 10:45:22 2014
> New Revision: 1603405
>
> URL: http://svn.apache.org/r1603405
> Log:
> * .
> Record merge of r1601851
>
> * build/generator/gen_win.py
> Explicitly support VS 2013 and fix support of future VS versions by setting
> the right variable.
>
> * build/generator/templates/vcnet_sln.ezt
> Properly generate a forward and backward compatible solution file for
> VS > 2010.
>
> Modified:
> subversion/branches/1.8.x-VS2013-14/ (props changed)
> subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py
> subversion/branches/1.8.x-VS2013-14/build/generator/templates/vcnet_sln.ezt
>
> Propchange: subversion/branches/1.8.x-VS2013-14/
> ------------------------------------------------------------------------------
> Merged /subversion/trunk:r1601851
>
> Modified: subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py
> URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py?rev=1603405&r1=1603404&r2=1603405&view=diff
> ==============================================================================
> --- subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py (original)
> +++ subversion/branches/1.8.x-VS2013-14/build/generator/gen_win.py Wed Jun 18 10:45:22 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 = '2012'
^^^^^
This looks like a typo. It should be "self.vs_version = '2012'", isn't it?
--
Ivan Zhakov
CTO | VisualSVN | http://www.visualsvn.com