Some comments and stuff.

This commit is contained in:
Nathan Rajlich 2012-02-06 11:55:53 -08:00
parent b182b3a9bd
commit fb8c30f680
3 changed files with 6 additions and 2 deletions

View file

@ -40,9 +40,10 @@ function build (gyp, argv, callback) {
if (win) { if (win) {
argv.push('/p:Configuration=' + config) argv.push('/p:Configuration=' + config)
} else { } else {
argv.push('BUILDTYPE=' + config)
// Don't overwrite an existing Makefile
argv.push('-f'); argv.push('-f');
argv.push('Makefile.gyp'); argv.push('Makefile.gyp');
argv.push('BUILDTYPE=' + config)
} }
if (win && !hasSln) { if (win && !hasSln) {

View file

@ -47,9 +47,10 @@ function configure (gyp, argv, callback) {
argv.push(path.join(devDir, 'tools', 'patch.gypi')) argv.push(path.join(devDir, 'tools', 'patch.gypi'))
} }
} else { } else {
// Force the 'make' target for non-Windows // use a 'gyp' suffix on the Makefile, as to not overwrite an existing one
argv.unshift('.gyp') argv.unshift('.gyp')
argv.unshift('--suffix') argv.unshift('--suffix')
// force the 'make' target for non-Windows
argv.unshift('make') argv.unshift('make')
argv.unshift('-f') argv.unshift('-f')
} }

View file

@ -8,6 +8,8 @@ exports.usage = 'Copies a compiled bindings to an appropriate dir for runtime de
*/ */
var fs = require('fs') var fs = require('fs')
, path = require('path')
, mkdir = require('mkdirp')
function copy (gyp, argv, callback) { function copy (gyp, argv, callback) {
callback(new Error('TODO: implement me')) callback(new Error('TODO: implement me'))