Commit 943da935 by Dane Springmeyer

build against msvs_toolset=14 when we can

parent 72bddafd
...@@ -6,46 +6,36 @@ environment: ...@@ -6,46 +6,36 @@ environment:
matrix: matrix:
- nodejs_version: 0.10 - nodejs_version: 0.10
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 0.10 - nodejs_version: 0.10
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 0.12 - nodejs_version: 0.12
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 0.12 - nodejs_version: 0.12
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 4 - nodejs_version: 4
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 4 - nodejs_version: 4
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 5 - nodejs_version: 5
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 5 - nodejs_version: 5
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 6 - nodejs_version: 6
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 6 - nodejs_version: 6
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 7 - nodejs_version: 7
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 7 - nodejs_version: 7
platform: x86 platform: x86
msvs_toolset: 12
- nodejs_version: 8 - nodejs_version: 8
platform: x64 platform: x64
msvs_toolset: 12
- nodejs_version: 8 - nodejs_version: 8
platform: x86 platform: x86
msvs_toolset: 12 - nodejs_version: 9
platform: x64
- nodejs_version: 9
platform: x86
# custom visual studio 2015 builds # custom visual studio 2015 builds
- nodejs_version: 0.10.40 - nodejs_version: 0.10.40
platform: x86 platform: x86
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"url": "git://github.com/mapbox/node-sqlite3.git" "url": "git://github.com/mapbox/node-sqlite3.git"
}, },
"dependencies": { "dependencies": {
"nan": "~2.7.0", "nan": "~2.8.0",
"node-pre-gyp": "~0.6.38" "node-pre-gyp": "~0.6.38"
}, },
"bundledDependencies": [ "bundledDependencies": [
......
...@@ -4,10 +4,14 @@ SET EL=0 ...@@ -4,10 +4,14 @@ SET EL=0
ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
IF "%msvs_toolset%"=="" ECHO "msvs_toolset unset, defaulting to 12" && SET msvs_toolset=12
IF %NODE_MAJOR% GTR 4 ECHO "detected >= node v5, forcing msvs_toolset=14" && SET msvs_toolset=14
SET PATH=%CD%;%PATH% SET PATH=%CD%;%PATH%
SET msvs_version=2013 SET msvs_version=2013
IF "%msvs_toolset%"=="14" SET msvs_version=2015 IF "%msvs_toolset%"=="14" SET msvs_version=2015
ECHO APPVEYOR^: %APPVEYOR% ECHO APPVEYOR^: %APPVEYOR%
ECHO nodejs_version^: %nodejs_version% ECHO nodejs_version^: %nodejs_version%
ECHO platform^: %platform% ECHO platform^: %platform%
...@@ -51,6 +55,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR ...@@ -51,6 +55,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
:SKIP_APPVEYOR_INSTALL :SKIP_APPVEYOR_INSTALL
IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED
IF %NODE_MAJOR% GTR 4 GOTO NODE_INSTALLED
::custom node for VS2015 ::custom node for VS2015
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment