Windows fixes.

tbranyen · tbranyen · commit 6b6493bb4eab · 2014-06-24T22:35:18.000-04:00
diff --git a/generate/index.js b/generate/index.js
@@ -4,13 +4,16 @@ const ejs = require("ejs");
 const path = require("path");
 const idefs = require("./idefs");
 
+
+var local = path.join.bind(null, __dirname);
+
 var classTemplate = ejs.compile(
-  "" + fs.readFileSync(String(__dirname + "/templates/class.cc.ejs")), {
+  "" + fs.readFileSync(local("templates/class.cc.ejs")), {
     filename: "class.cc"
   });
 
 var headerTemplate = ejs.compile(
-  "" + fs.readFileSync(String(__dirname + "/templates/header.h.ejs")), {
+  "" + fs.readFileSync(local("templates/header.h.ejs")), {
     filename: "header.h"
   });
 
@@ -21,10 +24,9 @@ Object.keys(idefs).forEach(function(keyName) {
     return;
   }
 
-  fs.writeFileSync(
-    __dirname + "/../include/" + idef.filename, headerTemplate(idef));
+  fs.writeFileSync(local("../include/", idef.filename), headerTemplate(idef));
 
   fs.writeFileSync(
-    __dirname + "/../src/" + path.basename(idef.filename, ".h") + ".cc",
+    local("../src/", path.basename(idef.filename, ".h")) + ".cc",
       classTemplate(idef));
 });
diff --git a/package.json b/package.json
@@ -66,8 +66,7 @@
     "lint": "jshint src",
     "test": "cd test && nodeunit nodegit.js",
     "publish": "node-pre-gyp package && node-pre-gyp publish",
-    "codegen": "node build/codegen/t.js ; node build/codegen/generate.js",
-    "generate": "node generate/setup ; node generate",
+    "generate": "node generate/setup && node generate",
     "install": "npm run generate && node install"
   }
 }
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -200,9 +200,6 @@
         "vendor/libgit2/src/transports/smart_pkt.c",
         "vendor/libgit2/src/transports/smart_protocol.c",
         "vendor/libgit2/src/transports/ssh.c",
-        "vendor/libgit2/src/unix/map.c",
-        "vendor/libgit2/src/unix/posix.h",
-        "vendor/libgit2/src/unix/realpath.c",
         "vendor/libgit2/src/xdiff/xdiff.h",
         "vendor/libgit2/src/xdiff/xdiffi.c",
         "vendor/libgit2/src/xdiff/xdiffi.h",
@@ -220,6 +217,13 @@
         "vendor/libgit2/src/xdiff/xutils.h"
       ],
       "conditions": [
+        ["OS=='win'", {}, {
+          "sources": [
+            "vendor/libgit2/src/unix/map.c",
+            "vendor/libgit2/src/unix/posix.h",
+            "vendor/libgit2/src/unix/realpath.c",
+          ]
+        }],
         ["OS=='linux'", {
           "cflags": [
             "-w",
@@ -270,6 +274,7 @@
             "vendor/libgit2/src/win32/findfile.c",
             "vendor/libgit2/src/win32/findfile.h",
             "vendor/libgit2/src/win32/git2.rc",
+            "vendor/libgit2/src/win32/map.c",
             "vendor/libgit2/src/win32/mingw-compat.h",
             "vendor/libgit2/src/win32/msvc-compat.h",
             "vendor/libgit2/src/win32/posix.h",

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@`
`66`	`66`	`"lint": "jshint src",`
`67`	`67`	`"test": "cd test && nodeunit nodegit.js",`
`68`	`68`	`"publish": "node-pre-gyp package && node-pre-gyp publish",`
`69`		`- "codegen": "node build/codegen/t.js ; node build/codegen/generate.js",`
`70`		`- "generate": "node generate/setup ; node generate",`
	`69`	`+ "generate": "node generate/setup && node generate",`
`71`	`70`	`"install": "npm run generate && node install"`
`72`	`71`	`}`
`73`	`72`	`}`