Bug 147887 – [Win] Switch Windows build to Visual Studio 2015

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Brent Fulgham]

Switch the target compiler and build environment to use Visual Studio 2015.

[Brent Fulgham]

<rdar://problem/22235098>

[Brent Fulgham]

Created attachment 258731 [details]
Patch

[WebKit Commit Bot]

Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE

[Alex Christensen]

Comment on attachment 258731 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=258731&action=review

Hooray! I'm pretty sure I'll r+ the next patch.
May as well change my comment in the build-webkit script about vcvarsall.bat, too.

> Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:58
> +    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

Will the binary still work on Windows 7 and vista?

> Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:83
> -    <PlatformToolset>v120_xp</PlatformToolset>
> +    <PlatformToolset>v140_xp</PlatformToolset>

This should change v120_xp to v140.  I don't think there is a v140_xp toolset.

> Tools/Scripts/webkitdirs.pm:508
> -        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 12.0");
> +        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 14.0");
> +        if (! -e $vsInstallDir) {
> +            $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 12.0");
> +        }

vs2015 has to be installed for the v140 toolset to be installed, so I don't think this fallback is necessary or helpful.

[Brent Fulgham]

Comment on attachment 258731 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=258731&action=review

>> Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:58
>> +    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
> 
> Will the binary still work on Windows 7 and vista?

Yes. This new field is apparently comparable to the v140 setting. The ability to execute the code is set to Windows 7.1 through the WINVER=0x601 setting.

>> Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:83
>> +    <PlatformToolset>v140_xp</PlatformToolset>
> 
> This should change v120_xp to v140.  I don't think there is a v140_xp toolset.

Agreed! I've corrected this.

>> Tools/Scripts/webkitdirs.pm:508
>> +        }
> 
> vs2015 has to be installed for the v140 toolset to be installed, so I don't think this fallback is necessary or helpful.

OK. We should also ditch the MSBuild 12.0 stuff too, then, since that's the stuff that shipped with "Microsoft Visual Studio 12.0".

[Brent Fulgham]

Created attachment 258738 [details]
Patch

[Alex Christensen]

Comment on attachment 258738 [details]
Patch

r=me.  Hooray!

[Brent Fulgham]

Committed r188291: <http://trac.webkit.org/changeset/188291>