Merge pull request #1128 from xzyfer/feat/node-gyp

xzyfer · xzyfer · commit cfd7dd2d6bd3 · 2015-09-09T11:54:11.000+10:00
Replace pangyp with node-gyp
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "mkdirp": "^0.5.1",
     "nan": "^2.0.8",
     "npmconf": "^2.1.2",
-    "pangyp": "^2.3.0",
+    "node-gyp": "^3.0.1",
     "request": "^2.61.0",
     "sass-graph": "^2.0.1"
   },
diff --git a/scripts/build.js b/scripts/build.js
@@ -130,7 +130,7 @@ function build(options) {
       process.exit(1);
     }
 
-    var args = [require.resolve(path.join('pangyp', 'bin', 'node-gyp.js')), 'rebuild', '--verbose'].concat(
+    var args = [require.resolve(path.join('node-gyp', 'bin', 'node-gyp.js')), 'rebuild', '--verbose'].concat(
       ['libsass_ext', 'libsass_cflags', 'libsass_ldflags', 'libsass_library'].map(function(subject) {
         return ['--', subject, '=', process.env[subject.toUpperCase()] || ''].join('');
       })).concat(options.args);

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ function build(options) {`
`130`	`130`	`process.exit(1);`
`131`	`131`	`}`
`132`	`132`
`133`		`- var args = [require.resolve(path.join('pangyp', 'bin', 'node-gyp.js')), 'rebuild', '--verbose'].concat(`
	`133`	`+ var args = [require.resolve(path.join('node-gyp', 'bin', 'node-gyp.js')), 'rebuild', '--verbose'].concat(`
`134`	`134`	`['libsass_ext', 'libsass_cflags', 'libsass_ldflags', 'libsass_library'].map(function(subject) {`
`135`	`135`	`return ['--', subject, '=', process.env[subject.toUpperCase()] \|\| ''].join('');`
`136`	`136`	`})).concat(options.args);`