[skip travis] try AppVeyor

wilhelmberg · wilhelmberg · commit e64e063d0438 · 2016-04-01T08:06:00.000Z
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     },
     "dependencies": {
         "nan": "~2.2.0",
-        "node-pre-gyp": "~0.6.25"
+        "node-pre-gyp": "https://github.com/mapbox/node-pre-gyp/tarball/v0.7.x"
     },
     "bundledDependencies": [
         "node-pre-gyp"
@@ -49,6 +49,7 @@
     },
     "scripts": {
         "prepublish":"npm ls",
+        "preinstall": "npm install node-pre-gyp",
         "install": "node-pre-gyp install --fallback-to-build",
         "pretest": "node test/support/createdb.js",
         "test": "mocha -R spec --timeout 480000"
diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat
@@ -6,7 +6,7 @@ ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 SET PATH=%CD%;%PATH%
 SET msvs_version=2013
-IF "%msvs_toolset"=="14" SET msvs_version=2015
+IF "%msvs_toolset%"=="14" SET msvs_version=2015
 
 ECHO APPVEYOR^: %APPVEYOR%
 ECHO nodejs_version^: %nodejs_version%
@@ -59,10 +59,17 @@ ECHO deleting node ...
 SET NODE_EXE_PRG=%ProgramFiles%\nodejs\node.exe
 IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+IF EXIST "%ProgramFiles%\nodejs" ECHO copy custom node.exe to %ProgramFiles%\nodejs\ && COPY node.exe "%ProgramFiles%\nodejs\"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
 SET NODE_EXE_PRG=%ProgramFiles(x86)%\nodejs\node.exe
 IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+IF EXIST "%ProgramFiles(x86)%\nodejs" ECHO copy custom node.exe to %ProgramFiles(x86)%\nodejs\ && COPY node.exe "%ProgramFiles(x86)%\nodejs\"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+ECHO delete node.exe in current directory && DEL node.exe
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 :NODE_INSTALLED
 
@@ -72,7 +79,7 @@ ECHO available npm^:
 call where npm
 
 ECHO node^: && call node -v
-call node -e "console.log(process.argv,process.execPath)"
+call node -e "console.log('  - arch:',process.arch,'\n  - argv:',process.argv,'\n  - execPath:',process.execPath)"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO npm^: && CALL npm -v
diff --git a/scripts/build-local.bat b/scripts/build-local.bat
@@ -13,19 +13,22 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF EXIST node_modules ECHO deleting node_modules && RD /Q /S node_modules
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+GOTO VS2015
+
 ECHO                 ============================
 ECHO                           VS2013
 ECHO                 ============================
-SET nodejs_version=0.10.36
-SET platform=x64
+SET nodejs_version=4.4.2
+SET platform=x86
 SET msvs_toolset=12
 SET TOOLSET_ARGS=
 
 CALL scripts\build-appveyor.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+GOTO DONE
 
-
+:VS2015
 
 IF EXIST lib\binding ECHO deleting lib/binding && RD /Q /S lib\binding
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
@@ -35,10 +38,13 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO                 ============================
 ECHO                           VS2015
 ECHO                 ============================
-SET nodejs_version=0.12.7
-SET platform=x86
+SET nodejs_version=4.4.1
+ECHO SET nodejs_version^: %nodejs_version%
+SET platform=x64
+ECHO SET platform^: %platform%
 SET msvs_toolset=14
-SET TOOLSET_ARGS=--dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
+ECHO SET msvs_toolset^: %msvs_toolset%
+::SET TOOLSET_ARGS=--dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
 
 CALL scripts\build-appveyor.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
