diff --git a/README.md b/README.md index 149fdd3..f471d5d 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,9 @@ You can also download the [protocol.json][protocol]. To build this project you will need [VS2017 Community][vs2017]. Make sure to select the Windows 10 14393 SDK in the options. -Then run the following commands: +You will also need to install the [windows-build-tools][windows-build-tools]. + +Once you have the previous dependencies, run the following commands: ```bash @@ -133,3 +135,4 @@ any additional questions or comments. [releases]: https://github.com/Microsoft/EdgeDiagnosticsAdapter/releases [testsigning]: https://msdn.microsoft.com/en-us/windows/hardware/drivers/install/the-testsigning-boot-configuration-option [vs2017]: https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15 +[windows-build-tools]: https://npmjs.com/package/windows-build-tools diff --git a/appveyor.yml b/appveyor.yml index 27a7f91..88baee4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,11 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - nodejs_version: Stable + nodejs_version: 6 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 nodejs_version: LTS + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + nodejs_version: Stable matrix: fast_finish: true diff --git a/package.json b/package.json index 01996f0..ac1d85d 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ ], "scripts": { "copy:static": "cpx \"./src/**/{!(*.ts),.!(ts)}\" out/src", - "build": "npm run clean && npm run lint && npm run build:ts && npm run copy:static && npm run build:native", + "build": "npm run clean && npm run lint && npm run build:ts && npm run copy:static && prebuild.cmd && npm run build:native", "build:native": "npm config set msvs_version 2015 && gulp buildnative", "build:ts": "tsc", "clean": "rimraf out", diff --git a/prebuild.cmd b/prebuild.cmd index cc36efc..03d3850 100644 --- a/prebuild.cmd +++ b/prebuild.cmd @@ -1,4 +1,4 @@ -REM If you have installed vs2017 enterprise edition: -REM set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets -set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v140 +@echo off + +IF DEFINED VCTargetsPath (ECHO VCTargetsPath is already defined) ELSE (set VCTargetsPath="C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v140") set GYP_MSVS_VERSION=2015