From b80bab45627448e86189ced13b14144ac83e9838 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 7 Dec 2016 10:35:54 -0400 Subject: [PATCH] chore: upgrade Etcher build system to use Visual Studio 2015 (#947) This version was not working the last time we checked, but it looks like there were some advancements in node-gyp in the previous months, and all dependencies have upgraded to it already. Signed-off-by: Juan Cruz Viotti --- appveyor.yml | 2 +- docs/RUNNING-LOCALLY.md | 4 ++-- scripts/unix/dependencies-npm.sh | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7d86b64b..59564540 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ init: - git config --global core.autocrlf input -image: Visual Studio 2013 +image: Visual Studio 2015 cache: - C:\Users\appveyor\.node-gyp diff --git a/docs/RUNNING-LOCALLY.md b/docs/RUNNING-LOCALLY.md index 4f48a357..103ef781 100644 --- a/docs/RUNNING-LOCALLY.md +++ b/docs/RUNNING-LOCALLY.md @@ -20,7 +20,7 @@ Prerequisites - [Rimraf](https://github.com/isaacs/rimraf) - [Asar](https://github.com/electron/asar) - [NSIS v2.51](http://nsis.sourceforge.net/Main_Page) (v3.x won't work) -- [Visual Studio Community 2013](https://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx) +- [Visual Studio Community 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48146) (free) (other editions, like Professional and Enterprise, should work too) - [7z](http://www.7-zip.org) (command line version) - [MinGW](http://www.mingw.org) @@ -69,7 +69,7 @@ make electron-develop ### Windows -**Run the following command from the _Developer Command Prompt for VS2013_**, +**Run the following command from the _Developer Command Prompt for VS2015_**, to ensure all Visual Studio command utilities are available in the `%PATH%`: ```sh diff --git a/scripts/unix/dependencies-npm.sh b/scripts/unix/dependencies-npm.sh index 07077477..0e233150 100755 --- a/scripts/unix/dependencies-npm.sh +++ b/scripts/unix/dependencies-npm.sh @@ -74,11 +74,7 @@ then fi if [ "$ARGV_TARGET_OPERATING_SYSTEM" == "win32" ]; then - - # We require Visual Studio 2013 specifically since newer versions - # lack command line build tools such as `lib.exe` and `cl.exe`. - export GYP_MSVS_VERSION=2013 - + export GYP_MSVS_VERSION=2015 fi if [ "$ARGV_TARGET_PLATFORM" == "electron" ]; then