Skip to content

Commit

Permalink
Windows x64 io.js support
Browse files Browse the repository at this point in the history
- use mongodb-js/node-gyp with nodejs/node-gyp#599
  for proper windows 64bit support
- get appveyor auto-deploying and testing for the full matrix
  https://ci.appveyor.com/project/imlucas/bson-ext/build/1.0.83
  • Loading branch information
imlucas committed Apr 19, 2015
1 parent 5ff99bd commit e5033ae
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.travis.yml
appveyor.yml
test.bat
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ env:
global:
- secure: ER5LYPXeYbQz8IH7IFlEOdiUFhQZ/he6MBiKgAQlUEaY+aF48Ypd9FaXue0R6OPxqBoTVA6rFixdiAZk7U0wB9wTzyABWWUBEmFO7WMbDWfFp4cOTbtHGQREBotYv0vaC8L+qgRDqtM0ASGm8/i8duRM1ICQ7n3N01ezAlMTu8I=
- secure: hlJfOM3VG9xYFQ+TrGWgIc5H2zowRGJBtIm710Mg5JQ4F6tpz7wzIZ+MpynGOklD8ltuLhUUSmf+doejVzCiRRADqF2ubjTRWafyqfz8p5nESz0ovw4g+rQuOOt3S4FbmKiHCZtoYEqn1N47GIaN06ucakK+rvS2DANgpSwOLPI=
cache:
directories:
- node_modules
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ npm test

bson-ext uses [node-pre-gyp](http://npm.im/node-pre-gyp) to publish and install
prebuilt binaries. This means you don't need the full toolchain installed
and configured correctly to use this module.
and configured correctly to use this module.

## License

Expand Down
16 changes: 3 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,17 @@ environment:
matrix:
- nodejs_version: 0.10
- nodejs_version: 0.12
- nodejs_version: 1.x
- nodejs_version: "1"

platform:
- x86
- x64

install:
- ps: Install-Product node $env:nodejs_version
- npm install --build-from-source
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)

test_script:
- node --version
- npm --version
- npm test

matrix:
fast_finish: true

cache:
- C:\Users\appveyor\AppData\Roaming\npm\node_modules -> package.json # global npm modules
- C:\Users\appveyor\AppData\Roaming\npm-cache -> package.json # npm cache
- node_modules -> package.json # local npm modules
- .\test.bat

build: OFF
12 changes: 12 additions & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
'targets': [
{
'win_delay_load_hook': 'true',
'target_name': 'bson',
'sources': [ 'ext/bson.cc' ],
'cflags!': [ '-fno-exceptions' ],
Expand All @@ -11,6 +12,17 @@
'xcode_settings': {
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
}
}],
['OS=="win"', {
'configurations': {
'Release': {
'msvs_settings': {
'VCCLCompilerTool': {
'ExceptionHandling': 1
}
}
}
}
}]
]
}
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
},
"dependencies": {
"nan": "~1.7.0",
"node-pre-gyp": "mongodb-js/node-pre-gyp"
"node-pre-gyp": "https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz"
},
"bundledDependecies": [
"node-pre-gyp"
],
"devDependencies": {
"aws-sdk": "~2.1.20",
"nodeunit": "~0.9.0"
},
"bundledDependencies": [
"node-pre-gyp"
],
"main": "./index",
"directories": {
"lib": "./lib/bson"
Expand Down
10 changes: 10 additions & 0 deletions scripts/test.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
call node --version
call npm --version
SET GYP_MSVS_VERSION=2013
SET PATH=%PATH%;%APPDATA%\npm
SET PATH=%PATH%;C:\Program Files (x86)\Git\bin
SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin
call npm install https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz
call npm install https://github.com/mongodb-js/node-gyp/archive/v1.04-appveyor.tar.gz
call npm install --build-from-source
call npm test

0 comments on commit e5033ae

Please sign in to comment.