Skip to content

N
node-sqlite3
Commit 435c4118 by Dane Springmeyer
Options

Merge pull request #363 from mapbox/visual-studio-2014 

Support for Visual studio 2014
parents ab70efa1 2ef7028e
Showing with 126 additions and 23 deletions
.travis.yml
......@@ -14,6 +14,7 @@ branches:
env:
matrix:
- NODE_VERSION="0.10.33"
- NODE_VERSION="0.11.13"
- NODE_VERSION="0.11.14"
- NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32"
- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
......
CHANGELOG.md
# Changelog
## 3.0.3
- Upgraded to node-pre-gyp@0.6.0 which should fix crashes against node v0.11.14
- Now providing binaries against Visual Studio 2014 (pass --toolset=v140) and use binaries from https://github.com/mapbox/node-cpp11
## 3.0.2
- Republish for possibly busted npm package.
......
appveyor.yml
......@@ -4,41 +4,86 @@ environment:
node_pre_gyp_secretAccessKey:
secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i
matrix:
- nodejs_version: 0.10.30
- nodejs_version: 0.10.32
nw_version: 0.8.6
PLATFORM: x86
- nodejs_version: 0.10.30
msvs_toolset: 12
- nodejs_version: 0.10.32
nw_version: 0.8.6
PLATFORM: x64
msvs_toolset: 12
- nodejs_version: 0.11.13
nw_version: 0.10.5
PLATFORM: x86
msvs_toolset: 12
- nodejs_version: 0.11.13
nw_version: 0.10.5
PLATFORM: x64
msvs_toolset: 12
- nodejs_version: 0.11.13
nw_version: 0.10.5
PLATFORM: x86
msvs_toolset: 12
BUILD_ARGS: --target=0.11.14
- nodejs_version: 0.11.13
nw_version: 0.10.5
PLATFORM: x64
msvs_toolset: 12
BUILD_ARGS: --target=0.11.14
# custoom 64 bit visual studio 2014 builds
- nodejs_version: 0.10.33
PLATFORM: x64
msvs_toolset: 14
BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
- nodejs_version: 0.11.14
PLATFORM: x64
msvs_toolset: 14
BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
os: Visual Studio 2014 CTP4
install:
- ps: Update-NodeJsInstallation $env:nodejs_version $env:Platform
- node --version
- npm --version
- echo %PLATFORM%
- SET PATH=c:\python27;%PATH%
- SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
- SET PATH=%APPDATA%\npm;%PATH%
# add local node to path (since we install it for msvs_toolset == 14)
- SET PATH=%CD%;%PATH%;
# add local node-pre-gyp dir to path
- SET PATH=node_modules\.bin;%PATH%
# # work around old npm problem with ^
- npm update npm -g
- npm --version
# use 64 bit python if platform is 64 bit
- if "%PLATFORM%" == "x64" set PATH=C:\Python27-x64;%PATH%
# install node version per visual studio toolset
- if "%msvs_toolset%" == "12" powershell Install-Product node $env:nodejs_version $env:Platform
- if "%msvs_toolset%" == "14" powershell Write-Output "fetching 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"
# only needed if not using 'os: Visual Studio 2014 CTP4'
#- if "%msvs_toolset%" == "14" powershell Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe"
#- if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/vcredist_$env:Platform.exe"
#- if "%msvs_toolset%" == "14" .\vcredist_%platform%.exe /q /norestart
- node -v
- node -e "console.log(process.argv,process.execPath)"
- npm -v
# upgrade node-gyp to support --msvs_version=2013
- npm install node-gyp
- npm install --build-from-source --msvs_version=2013
# clear out node-gyp header cache
- if "%msvs_toolset%" == "14" rd /s /q %USERPROFILE%\.node-gyp
- SET PATH=C:\Program Files (x86)\MSBuild\%msvs_toolset%.0\bin;%PATH%
- SET PATH=C:\Program Files (x86)\Microsoft Visual Studio %msvs_toolset%.0\VC\bin;%PATH%
- 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
- npm install --build-from-source --msvs_version=2013 %BUILD_ARGS% --loglevel=http
- node_modules\.bin\node-pre-gyp reveal module --silent > module.txt
- SET /p MODULE=<module.txt
- del module.txt
- node -e "console.log(process.execPath)" > node_path.txt
- SET /p NODE_EXE_PATH=<node_path.txt
- del node_path.txt
# should display MSVCP140.dll if build with visual studio 2014 and /MD
- dumpbin /DEPENDENTS "%NODE_EXE_PATH%"
- dumpbin /DEPENDENTS "%MODULE%"
- npm test
- node-pre-gyp package
- node-pre-gyp package %BUILD_ARGS%
# make commit message env var shorter
- SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
- if not "%CM%" == "%CM:[publish binary]=%" node-pre-gyp --msvs_version=2013 publish
- call scripts\build_for_node_webkit.cmd %PLATFORM%
- if not "%CM%" == "%CM:[publish binary]=%" node-pre-gyp --msvs_version=2013 publish %BUILD_ARGS%
- if "%msvs_toolset%" == "12" call scripts\build_for_node_webkit.cmd %PLATFORM%
build: OFF
test: OFF
......
binding.gyp
......@@ -10,7 +10,7 @@
"include_dirs": ["<!(node -e \"require('nan')\")"],
"conditions": [
["sqlite != 'internal'", {
"include_dirs": [ "<@(sqlite)/include" ],
"include_dirs": [ "<(sqlite)/include" ],
"libraries": [
"-l<(sqlite_libname)"
],
......@@ -19,7 +19,7 @@
'msvs_settings': {
'VCLinkerTool': {
'AdditionalLibraryDirectories': [
'<@(sqlite)/lib'
'<(sqlite)/lib'
],
},
}
......
deps/common-sqlite.gypi
{
'variables': {
'sqlite_version%':'3080701'
'sqlite_version%':'3080701',
"toolset%":'',
},
'target_defaults': {
'default_configuration': 'Release',
'msbuild_toolset':'<(toolset)',
'configurations': {
'Debug': {
'defines!': [
'NDEBUG'
],
'cflags_cc!': [
'-O3',
'-Os',
'-DNDEBUG'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS!': [
'-O3',
'-Os',
'-DDEBUG'
],
'GCC_OPTIMIZATION_LEVEL': '0',
'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES'
},
'msvs_settings': {
'VCCLCompilerTool': {
'ExceptionHandling': 1, # /EHsc
}
}
},
'Release': {
'defines': [
'NDEBUG'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS!': [
'-Os',
'-O2'
],
'GCC_OPTIMIZATION_LEVEL': '3',
'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO',
'DEAD_CODE_STRIPPING': 'YES',
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES'
},
'msvs_settings': {
'VCCLCompilerTool': {
'ExceptionHandling': 1, # /EHsc
}
}
}
}
}
}
\ No newline at end of file
package.json
{
"name": "sqlite3",
"description": "Asynchronous, non-blocking SQLite3 bindings",
"version": "3.0.2",
"version": "3.0.3",
"homepage": "http://github.com/mapbox/node-sqlite3",
"author": {
"name": "MapBox",
......@@ -11,7 +11,7 @@
"module_name" : "node_sqlite3",
"module_path" : "./lib/binding/{node_abi}-{platform}-{arch}",
"host" : "https://mapbox-node-binary.s3.amazonaws.com",
"remote_path" : "./{name}/v{version}/",
"remote_path" : "./{name}/v{version}/{toolset}/",
"package_name": "{node_abi}-{platform}-{arch}.tar.gz"
},
"contributors": [
......@@ -37,14 +37,14 @@
},
"dependencies": {
"nan": "~1.4.1",
"node-pre-gyp": "~0.5.27"
"node-pre-gyp": "~0.6.0"
},
"bundledDependencies": [
"node-pre-gyp"
],
"devDependencies": {
"mocha": "1.x",
"aws-sdk": "~2.0.4"
"aws-sdk": "~2.0.25"
},
"engines": {
"node": ">= 0.10.0 < 0.11.0 || >= 0.11.13 < 0.13.0"
......
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