1118873 - Add support Microsoft Visual Studio 2015 (VS2015) to MozillaBuild

Status: RESOLVED FIXED

(Firefox Build System :: MozillaBuild, task)

Description

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

+++ This bug was initially created as a clone of Bug #889721 +++

The goal of this bug is to add support for building with VS2015 to MozillaBuild, similar to what was done for bug 889721. It is NOT a goal of this bug to get Firefox to build with successfully with VS2015, or any of the things that would come after that.

Comment 1

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Attachment: vs2015-mozillabuild.patch

It seems like there won't be any VS2015 "Express" product, so I didn't add any logic for that. ("Community" is replacing "Express" and is equivalent to "Professional".) The changes from start-shell-msvc2013*.bat to start-shell-msvc2015*.bat look larger than they actually are, because of the reformatting for simplifying the control flow given the lack of an 2015 Express, and due to the fact that a good version of the Platform SDK is already included with VS2015, just like VS2013 Pro+.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8545575 [details] [diff] [review]
vs2015-mozillabuild.patch

Review of attachment 8545575 [details] [diff] [review]:
-----------------------------------------------------------------

You'll need to add the new files to packageit.sh as well or they won't end up being included with the installer.
http://hg.mozilla.org/mozilla-build/file/58edf3344962/packageit.sh#l64

::: start-shell-msvc2015-x64.bat
@@ +26,5 @@
> +rem By default, the Windows 8.1 SDK should be automatically included via vcvars64.bat.
> +if exist "%VC14DIR%\bin\amd64\vcvars64.bat" (
> +    call "%VC14DIR%\bin\amd64\vcvars64.bat"
> +) else (
> +    call "%VC14DIR%\bin\x86_amd64\vcvarsx86_amd64.bat"

Isn't this cruft from the Express versions?

Comment 3

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Attachment: vs2015-mozillabuild.patch [v2]

Ryan:

1) In your review of the previous version, you asked if there was some leftover "Express" cruft. I don't think there is. The code you commented on switches between cross-compiling 64-bit-on-32-bit or native compiling 64-bit-on-64-bit. So, I think the patch is OK as-is. Let me know if I'm misnuderstanding something.

2) I added the two new batch files to the packaging script. Thanks for the tip on what to change.

Please re-review this to make sure we're on the same page. Thanks!

Comment 4

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Attachment: msvc2015-drop-in-your-mozillabuild.zip

Anybody can extract these batch files into an existing MozillaBuild instance to get VS2015 working while we wait for a new MozillaBuild release. This will overwrite the guess-msvc.bat file, but the change is purely additive.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8545660 [details] [diff] [review]
vs2015-mozillabuild.patch [v2]

Review of attachment 8545660 [details] [diff] [review]:
-----------------------------------------------------------------

Yeah, nevermind.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

http://hg.mozilla.org/mozilla-build/rev/040837a79759

Not sure what release this is going to be shipping in yet other than "the next one" :P. Thanks for the patch!