Commit 354d6889 by Dane Springmeyer

remove node-gyp from package.json since it will now break node v0.10.x support

parent 105861de
...@@ -38,13 +38,12 @@ ...@@ -38,13 +38,12 @@
}, },
"dependencies": { "dependencies": {
"nan": "~2.7.0", "nan": "~2.7.0",
"node-pre-gyp": "https://github.com/mapbox/node-pre-gyp/tarball/node-v0.10" "node-pre-gyp": "https://github.com/mapbox/node-pre-gyp/tarball/master"
}, },
"bundledDependencies": [ "bundledDependencies": [
"node-pre-gyp" "node-pre-gyp"
], ],
"devDependencies": { "devDependencies": {
"node-gyp": "^3.6.1",
"aws-sdk": "2.x", "aws-sdk": "2.x",
"eslint": "3.5.0", "eslint": "3.5.0",
"mocha": "3.x" "mocha": "3.x"
......
...@@ -110,8 +110,9 @@ IF /I "%NPM_BIN_DIR%"=="%CD%" ECHO ERROR npm bin -g equals local directory && SE ...@@ -110,8 +110,9 @@ IF /I "%NPM_BIN_DIR%"=="%CD%" ECHO ERROR npm bin -g equals local directory && SE
ECHO ===== where npm puts stuff END ============ ECHO ===== where npm puts stuff END ============
ECHO installing node-gyp IF "%nodejs_version:~0,1%"=="0" npm install https://github.com/springmeyer/node-gyp/tarball/v3.x
CALL npm install -g node-gyp IF %ERRORLEVEL% NEQ 0 GOTO ERROR
IF "%nodejs_version:~0,1%"=="4" npm install node-gyp@4.x
IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF %ERRORLEVEL% NEQ 0 GOTO ERROR
CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http
......
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