Merge branch 'master' into fix-windows-specs

This commit is contained in:
Matt Colyer 2014-01-03 15:24:52 -08:00
commit 9af6e99682

View File

@ -7,7 +7,7 @@ process.chdir(path.dirname(__dirname));
cp.safeExec('node script/bootstrap', function() {
// build/node_modules/.bin/grunt "$@"
var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
var args = ['--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
args = args.concat(process.argv.slice(2));
cp.safeSpawn(process.execPath, args, process.exit);
cp.safeSpawn(gruntPath, args, process.exit);
});