From 3ffa73601eece95276e7e8c788d4ab354a899304 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 9 Feb 2015 23:46:43 -0800 Subject: [PATCH 1/7] test node v0.12x instead of v0.11.x + add io-js - refs #389 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27880f18e..4a5e33925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ branches: env: matrix: - NODE_VERSION="0.10.33" - - NODE_VERSION="0.11.13" - - NODE_VERSION="0.11.14" + - NODE_VERSION="0.12.0" + - NODE_VERSION="iojs-1.1.0" - NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32" - NODE_WEBKIT="0.8.6" TARGET_ARCH="x64" - NODE_WEBKIT="0.10.5" TARGET_ARCH="ia32" From 869d9e5f478d14fb77c15b123cb1bd2e698af916 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 9 Feb 2015 23:52:56 -0800 Subject: [PATCH 2/7] try node-webkit v0.11.6 (http://dl.nwjs.io/v0.11.6) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a5e33925..ad25e6514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ env: - NODE_WEBKIT="0.8.6" TARGET_ARCH="x64" - NODE_WEBKIT="0.10.5" TARGET_ARCH="ia32" - NODE_WEBKIT="0.10.5" TARGET_ARCH="x64" - - NODE_WEBKIT="0.11.5" TARGET_ARCH="ia32" - - NODE_WEBKIT="0.11.5" TARGET_ARCH="x64" + - NODE_WEBKIT="0.11.6" TARGET_ARCH="ia32" + - NODE_WEBKIT="0.11.6" TARGET_ARCH="x64" global: - secure: PifMOSnn+mWR1RUptXse+fLvWiTrzg0R/mazO7RWhXHWBKv0uAJ/qV3dI0GIRBLtjG10Iy+tT5RNh1TIbBzB9Y67wMcGvylUPG1+3EOKoBMEPnOD9AgCEQw4SOXfGPx0cq2N6ueSKieCgu1yKN9Wq7XCbE+zTk/DiRNIdLirVoo= - secure: cc4esJY1vPXL31IeumAJoKWDDO2BTGFiltwfO1jbTbiV7QT911QUjTUasxXIVpOaHNCpxSTyevPwwTWfzt2EtF92Lli+qhQ2bbzMiDSBZstSrHdAe62Ai2M1oYYUwk/0cABB/2nO9uRyYwITCxpTSNzZBrYhn3C29WqBhPeVDmM= From 51e557d5184918e2a15f1b4bb888adede9291ff3 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 00:00:31 -0800 Subject: [PATCH 3/7] apply patch from @fengmk2 for iojs 32 bit build support - refs #399 --- scripts/build_against_node.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/build_against_node.sh b/scripts/build_against_node.sh index 488d1ab03..f602069ca 100755 --- a/scripts/build_against_node.sh +++ b/scripts/build_against_node.sh @@ -51,10 +51,19 @@ if [[ $(uname -s) == 'Linux' ]]; then # node v0.8 and above provide pre-built 32 bit and 64 bit binaries # so here we use the 32 bit ones to also test 32 bit builds NVER=`node -v` - wget http://nodejs.org/dist/${NVER}/node-${NVER}-${platform}-x86.tar.gz - tar xf node-${NVER}-${platform}-x86.tar.gz # enable 32 bit node export PATH=$(pwd)/node-${NVER}-${platform}-x86/bin:$PATH + if [[ ${NODE_VERSION:0:4} == 'iojs' ]]; then + wget http://iojs.org/dist/${NVER}/iojs-${NVER}-${platform}-x86.tar.gz + tar xf iojs-${NVER}-${platform}-x86.tar.gz + # enable 32 bit iojs + export PATH=$(pwd)/iojs-${NVER}-${platform}-x86/bin:$PATH + else + wget http://nodejs.org/dist/${NVER}/node-${NVER}-${platform}-x86.tar.gz + tar xf node-${NVER}-${platform}-x86.tar.gz + # enable 32 bit node + export PATH=$(pwd)/node-${NVER}-${platform}-x86/bin:$PATH + fi # install 32 bit compiler toolchain and X11 # test source compile in 32 bit mode with internal libsqlite3 CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source From 2a5868f8d258b68f61834bbf5e38ee27e50a173a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 00:00:51 -0800 Subject: [PATCH 4/7] apply patch from @fengmk2 for iojs support in engines - refs #399 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6ab1cbbb..0862e24e3 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "aws-sdk": "~2.0.25" }, "engines": { - "node": ">= 0.10.0 < 0.11.0 || >= 0.11.13 < 0.13.0" + "node": ">= 0.10.0 < 0.11.0 || >= 0.11.13 < 0.13.0 || >= 1.0.0 < 2.0.0" }, "engineStrict": true, "scripts": { From 59ff442ee28cc7b1da3738943961256931d57de2 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 00:19:11 -0800 Subject: [PATCH 5/7] give up on node-webkit > 0.10 since it does not compile with latest NAN --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad25e6514..4a39a6949 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,6 @@ env: - NODE_WEBKIT="0.8.6" TARGET_ARCH="x64" - NODE_WEBKIT="0.10.5" TARGET_ARCH="ia32" - NODE_WEBKIT="0.10.5" TARGET_ARCH="x64" - - NODE_WEBKIT="0.11.6" TARGET_ARCH="ia32" - - NODE_WEBKIT="0.11.6" TARGET_ARCH="x64" global: - secure: PifMOSnn+mWR1RUptXse+fLvWiTrzg0R/mazO7RWhXHWBKv0uAJ/qV3dI0GIRBLtjG10Iy+tT5RNh1TIbBzB9Y67wMcGvylUPG1+3EOKoBMEPnOD9AgCEQw4SOXfGPx0cq2N6ueSKieCgu1yKN9Wq7XCbE+zTk/DiRNIdLirVoo= - secure: cc4esJY1vPXL31IeumAJoKWDDO2BTGFiltwfO1jbTbiV7QT911QUjTUasxXIVpOaHNCpxSTyevPwwTWfzt2EtF92Lli+qhQ2bbzMiDSBZstSrHdAe62Ai2M1oYYUwk/0cABB/2nO9uRyYwITCxpTSNzZBrYhn3C29WqBhPeVDmM= From c5f178c6a9706d7b7f7931d91d63d4dbf7e89b97 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 00:25:47 -0800 Subject: [PATCH 6/7] skip 32 shared build with io.js --- scripts/build_against_node.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/build_against_node.sh b/scripts/build_against_node.sh index f602069ca..24598993f 100755 --- a/scripts/build_against_node.sh +++ b/scripts/build_against_node.sh @@ -71,8 +71,11 @@ if [[ $(uname -s) == 'Linux' ]]; then npm test publish make clean - # test source compile in 32 bit mode against external libsqlite3 - sudo apt-get -y install libsqlite3-dev:i386 - CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source --sqlite=/usr - npm test + # broken for some unknown reason against io.js + if [[ ${NODE_VERSION:0:4} != 'iojs' ]]; then + # test source compile in 32 bit mode against external libsqlite3 + sudo apt-get -y install libsqlite3-dev:i386 + CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source --sqlite=/usr + npm test + fi fi From b3671ba16c5eb3a990fd0e5e018264dc386813ea Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Feb 2015 00:36:49 -0800 Subject: [PATCH 7/7] appveyor: test node v0.10.x and v0.12.x and io.js 1.1.0 --- appveyor.yml | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 066c2713e..84db9b59c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,49 +4,33 @@ environment: node_pre_gyp_secretAccessKey: secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i matrix: - # custom visual studio 2014 builds - - nodejs_version: 0.10.33 - platform: x86 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.11.14 - platform: x86 - msvs_toolset: 14 - BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - 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 - - nodejs_version: 0.10.32 - nw_version: 0.8.6 + - nodejs_version: 0.10.36 platform: x86 msvs_toolset: 12 - - nodejs_version: 0.10.32 - nw_version: 0.8.6 + - nodejs_version: 0.10.36 platform: x64 msvs_toolset: 12 - - nodejs_version: 0.11.13 - nw_version: 0.11.5 + - nodejs_version: 0.12.0 platform: x86 msvs_toolset: 12 - - nodejs_version: 0.11.13 - nw_version: 0.11.5 + - nodejs_version: 0.12.0 platform: x64 msvs_toolset: 12 - - nodejs_version: 0.11.13 - nw_version: 0.11.5 + - nodejs_version: 1.1.0 platform: x86 msvs_toolset: 12 - BUILD_ARGS: --target=0.11.14 - - nodejs_version: 0.11.13 - nw_version: 0.11.5 + - nodejs_version: 1.1.0 platform: x64 msvs_toolset: 12 - BUILD_ARGS: --target=0.11.14 + # custom visual studio 2014 builds + - nodejs_version: 0.10.33 + platform: x86 + msvs_toolset: 14 + BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 + - nodejs_version: 0.10.33 + platform: x64 + msvs_toolset: 14 + BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 os: Visual Studio 2014 CTP4 @@ -60,7 +44,7 @@ install: - SET ARCHPATH= - if %platform% == x64 (SET ARCHPATH=x64/) # install node version per visual studio toolset - - if "%msvs_toolset%" == "12" powershell Install-Product node $env:nodejs_version $env:platform + - if "%msvs_toolset%" == "12" powershell Update-NodeJsInstallation $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:ARCHPATH}node.exe" - if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe" # only needed if not using 'os: Visual Studio 2014 CTP4'