Re: svn commit: r1667823 - in /subversion/branches/v1.7.x-VS2012-15: ./ build/generator/ build/generator/templates/

[Johan Corveleyn <jc...@gmail.com>]

Hi Bert,

This backport branch works fine for building 1.7.x with VS 2013.
Thanks, that makes it much easier.

However, see below ...

On Thu, Mar 19, 2015 at 7:15 PM,  <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Thu Mar 19 18:15:17 2015
> New Revision: 1667823
>
> URL: http://svn.apache.org/r1667823
> Log:
> Create backport branch for supporting compilation with VS2012, VS2013 and
> VS2015.
>
> This patch makes it possible to compile with the newer Visual Studio
> toolchains.
>
> * build/generator/gen_vcnet_vcproj.py
>   Pass toolset_version
>
> * build/generator/gen_win.py
>   Pass toolset_version.
>
> * build/generator/templates/svn_config.vcxproj.ezt
> * build/generator/templates/vcnet_vcxproj.ezt
> * build/generator/templates/zlib.vcxproj.ezt
>   Generate PlatformToolset element.
>
> * gen-make.py
>   Document support for newer VS versions.
>
> Added:
>     subversion/branches/v1.7.x-VS2012-15/   (props changed)
>       - copied from r1667822, subversion/branches/1.7.x/
> Modified:
>     subversion/branches/v1.7.x-VS2012-15/build/generator/gen_vcnet_vcproj.py
>     subversion/branches/v1.7.x-VS2012-15/build/generator/gen_win.py
>     subversion/branches/v1.7.x-VS2012-15/build/generator/templates/svn_config.vcxproj.ezt
>     subversion/branches/v1.7.x-VS2012-15/build/generator/templates/vcnet_vcxproj.ezt
>     subversion/branches/v1.7.x-VS2012-15/build/generator/templates/zlib.vcxproj.ezt
>     subversion/branches/v1.7.x-VS2012-15/gen-make.py
>

...

> Modified: subversion/branches/v1.7.x-VS2012-15/build/generator/gen_win.py
> URL: http://svn.apache.org/viewvc/subversion/branches/v1.7.x-VS2012-15/build/generator/gen_win.py?rev=1667823&r1=1667822&r2=1667823&view=diff
> ==============================================================================
> --- subversion/branches/v1.7.x-VS2012-15/build/generator/gen_win.py (original)
> +++ subversion/branches/v1.7.x-VS2012-15/build/generator/gen_win.py Thu Mar 19 18:15:17 2015
> @@ -188,6 +188,26 @@ class GeneratorBase(gen_base.GeneratorBa
>            self.sln_version = '11.00'
>            self.vcproj_version = '10.0'
>            self.vcproj_extension = '.vcxproj'
> +        elif val == '2010':
> +          self.vs_version = '2010'
> +          self.sln_version = '11.00'
> +          self.vcproj_version = '10.0'
> +          self.vcproj_extension = '.vcxproj'

You added this block for 2010, while there was already a block "elif
val == '2010'" (right above it). So now that block is there twice :-).

-- 
Johan