Commit 35329a84 by Dane Springmeyer

start setting msbuild_toolset to trigger msvs 2014 build

parent 811dda29
...@@ -18,7 +18,7 @@ environment: ...@@ -18,7 +18,7 @@ environment:
nw_version: 0.8.6 nw_version: 0.8.6
PLATFORM: x64 PLATFORM: x64
msvs_toolset: 14 msvs_toolset: 14
TOOLSET_ARGS: --toolset=cpp11 --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11/ TOOLSET_ARGS: --toolset=v140 --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11/
# - nodejs_version: 0.11.13 # - nodejs_version: 0.11.13
# nw_version: 0.10.5 # nw_version: 0.10.5
# PLATFORM: x86 # PLATFORM: x86
...@@ -38,11 +38,12 @@ install: ...@@ -38,11 +38,12 @@ install:
# use 64 bit python if platform is 64 bit # use 64 bit python if platform is 64 bit
- if "%PLATFORM%" == "x64" set PATH=C:\Python27-x64;%PATH% - if "%PLATFORM%" == "x64" set PATH=C:\Python27-x64;%PATH%
# install node version per visual studio toolset # install node version per visual studio toolset
- ps: Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"
- if "%msvs_toolset%" == "12" powershell "Install-Product node $env:nodejs_version $env:Platform" - if "%msvs_toolset%" == "12" powershell "Install-Product node $env:nodejs_version $env:Platform"
- if "%msvs_toolset%" == "14" powershell "Start-FileDownload https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe" - if "%msvs_toolset%" == "14" powershell 'Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"'
# upgrade node-gyp to support --msvs_version=2013 # upgrade node-gyp to support --msvs_version=2013
- npm install node-gyp - npm install node-gyp
- SET PATH=C:\Program Files (x86)\MSBuild\%msvs_toolset%.0\bin\;%PATH% - SET PATH=C:\Program Files (x86)\MSBuild\%msvs_toolset%.0\bin;%PATH%
- if %platform% == x64 CALL "C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\vcvarsall.bat" amd64 - if %platform% == x64 CALL "C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\vcvarsall.bat" amd64
- if %platform% == x86 CALL "C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\vcvarsall.bat" amd64_x86 - if %platform% == x86 CALL "C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\vcvarsall.bat" amd64_x86
- npm install --build-from-source --msvs_version=2013 %TOOLSET_ARGS% - npm install --build-from-source --msvs_version=2013 %TOOLSET_ARGS%
......
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
"includes": [ "deps/common-sqlite.gypi" ], "includes": [ "deps/common-sqlite.gypi" ],
"variables": { "variables": {
"sqlite%":"internal", "sqlite%":"internal",
"sqlite_libname%":"sqlite3" "sqlite_libname%":"sqlite3",
"toolset%":'',
},
'target_defaults': {
'default_configuration': 'Release',
'msbuild_toolset':'<(toolset)'
}, },
"targets": [ "targets": [
{ {
...@@ -10,7 +15,7 @@ ...@@ -10,7 +15,7 @@
"include_dirs": ["<!(node -e \"require('nan')\")"], "include_dirs": ["<!(node -e \"require('nan')\")"],
"conditions": [ "conditions": [
["sqlite != 'internal'", { ["sqlite != 'internal'", {
"include_dirs": [ "<@(sqlite)/include" ], "include_dirs": [ "<(sqlite)/include" ],
"libraries": [ "libraries": [
"-l<(sqlite_libname)" "-l<(sqlite_libname)"
], ],
...@@ -19,7 +24,7 @@ ...@@ -19,7 +24,7 @@
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'<@(sqlite)/lib' '<(sqlite)/lib'
], ],
}, },
} }
......
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