Skip to content

Commit e5033ae

Browse files
committed
Windows x64 io.js support
- 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
1 parent 5ff99bd commit e5033ae

File tree

7 files changed

+33
-21
lines changed

7 files changed

+33
-21
lines changed

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.travis.yml
2+
appveyor.yml
3+
test.bat

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ env:
99
global:
1010
- secure: ER5LYPXeYbQz8IH7IFlEOdiUFhQZ/he6MBiKgAQlUEaY+aF48Ypd9FaXue0R6OPxqBoTVA6rFixdiAZk7U0wB9wTzyABWWUBEmFO7WMbDWfFp4cOTbtHGQREBotYv0vaC8L+qgRDqtM0ASGm8/i8duRM1ICQ7n3N01ezAlMTu8I=
1111
- secure: hlJfOM3VG9xYFQ+TrGWgIc5H2zowRGJBtIm710Mg5JQ4F6tpz7wzIZ+MpynGOklD8ltuLhUUSmf+doejVzCiRRADqF2ubjTRWafyqfz8p5nESz0ovw4g+rQuOOt3S4FbmKiHCZtoYEqn1N47GIaN06ucakK+rvS2DANgpSwOLPI=
12-
cache:
13-
directories:
14-
- node_modules

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm test
1919

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

2424
## License
2525

appveyor.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,17 @@ environment:
88
matrix:
99
- nodejs_version: 0.10
1010
- nodejs_version: 0.12
11-
- nodejs_version: 1.x
11+
- nodejs_version: "1"
1212

1313
platform:
1414
- x86
1515
- x64
1616

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

2121
test_script:
22-
- node --version
23-
- npm --version
24-
- npm test
25-
26-
matrix:
27-
fast_finish: true
28-
29-
cache:
30-
- C:\Users\appveyor\AppData\Roaming\npm\node_modules -> package.json # global npm modules
31-
- C:\Users\appveyor\AppData\Roaming\npm-cache -> package.json # npm cache
32-
- node_modules -> package.json # local npm modules
22+
- .\test.bat
3323

3424
build: OFF

binding.gyp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
'targets': [
33
{
4+
'win_delay_load_hook': 'true',
45
'target_name': 'bson',
56
'sources': [ 'ext/bson.cc' ],
67
'cflags!': [ '-fno-exceptions' ],
@@ -11,6 +12,17 @@
1112
'xcode_settings': {
1213
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
1314
}
15+
}],
16+
['OS=="win"', {
17+
'configurations': {
18+
'Release': {
19+
'msvs_settings': {
20+
'VCCLCompilerTool': {
21+
'ExceptionHandling': 1
22+
}
23+
}
24+
}
25+
}
1426
}]
1527
]
1628
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
},
2020
"dependencies": {
2121
"nan": "~1.7.0",
22-
"node-pre-gyp": "mongodb-js/node-pre-gyp"
22+
"node-pre-gyp": "https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz"
2323
},
24+
"bundledDependecies": [
25+
"node-pre-gyp"
26+
],
2427
"devDependencies": {
2528
"aws-sdk": "~2.1.20",
2629
"nodeunit": "~0.9.0"
2730
},
28-
"bundledDependencies": [
29-
"node-pre-gyp"
30-
],
3131
"main": "./index",
3232
"directories": {
3333
"lib": "./lib/bson"

scripts/test.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
call node --version
2+
call npm --version
3+
SET GYP_MSVS_VERSION=2013
4+
SET PATH=%PATH%;%APPDATA%\npm
5+
SET PATH=%PATH%;C:\Program Files (x86)\Git\bin
6+
SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin
7+
call npm install https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz
8+
call npm install https://github.com/mongodb-js/node-gyp/archive/v1.04-appveyor.tar.gz
9+
call npm install --build-from-source
10+
call npm test

0 commit comments

Comments
 (0)