Add Builder.prototype.appendIncludeDir. Use fs.existsSync if found (a…

…pi change in node 0.7).
joeferner · Feb 20, 2012 · 4ac7a11 · 4ac7a11
1 parent c35e03b
commit 4ac7a11
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -4,6 +4,8 @@ var fs = require('fs');
 var childProcess = require('child_process');
 var ansi = require("./ansi.js");
 
+var exists = fs.existsSync || path.existsSync;
+
 function Builder() {
   this.flagGroups = {};
   this.target = "native_bindings";
@@ -121,6 +123,10 @@ Builder.prototype.appendLinkerSearchDir = function(dir) {
   this.appendUnique('LINKFLAGS', flag);
 }
 
+Builder.prototype.appendIncludeDir = function(dir) {
+  this.appendUnique('CXXFLAGS', '-I' + dir);
+}
+
 Builder.prototype.getFlags = function(flagGroupName) {
   var flags = this.flagGroups[flagGroupName];
   if(!flags) {
@@ -187,10 +193,10 @@ Builder.prototype.getLinkerArgs = function(outFileName) {
 
 Builder.prototype.createDir = function(dirName) {
   var parent = path.dirname(dirName);
-  if(!path.existsSync(parent)) {
+  if(!exists(parent)) {
     this.createDir(parent);
   }
-  if(!path.existsSync(dirName)) {
+  if(!exists(dirName)) {
     fs.mkdirSync(dirName);
   }
 }
@@ -312,13 +318,11 @@ Builder.prototype.compile = function(callback) {
   }
 
   // need to append these last to reduce conflicts
-  this.appendUnique('CXXFLAGS', '-I' + this.nodeIncludeDir);
+  this.appendIncludeDir(this.nodeIncludeDir);
 
   if(process.platform == 'win32') {
-    this.appendUnique('CXXFLAGS', [
-      '-I' + this.v8IncludeDir,
-      '-I' + this.uvIncludeDir
-    ]);
+    this.appendIncludeDir(this.v8IncludeDir);
+    this.appendIncludeDir(this.uvIncludeDir);
   }
 
   // no source then fail
@@ -473,7 +477,7 @@ Builder.prototype.printHelp = function() {
 
 Builder.prototype.failIfNotExists = function(dirName, message) {
   dirName = path.resolve(dirName);
-  if(!path.existsSync(dirName)) {
+  if(!exists(dirName)) {
     message = message || "Could not find '%s'.";
     this.fail(message, dirName);
   }