Fixed more build errors

John Haley · John Haley · commit 969452ad6796 · 2015-02-11T10:40:57.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -651,6 +651,11 @@
         }
       }
     },
+    "hashsig": {
+      "cDependencies": [
+        "git2/sys/hashsig.h"
+      ]
+    },
     "ignore": {
       "functions": {
         "git_ignore_path_is_ignored": {
@@ -751,6 +756,9 @@
         "git_merge_base_many": {
           "ignore": true
         },
+        "git_merge_bases_many": {
+          "ignore": true
+        },
         "git_merge_base_octopus": {
           "ignore": true
         },
@@ -1363,6 +1371,11 @@
         }
       }
     },
+    "stream": {
+      "cDependencies": [
+        "git2/sys/stream.h"
+      ]
+    },
     "submodule": {
       "functions": {
         "git_submodule_foreach": {
@@ -1428,7 +1441,10 @@
         "git_transport_smart": {
           "ignore": true
         }
-      }
+      },
+      "cDependencies": [
+        "git2/sys/transport.h"
+      ]
     },
     "tree": {
       "functions": {
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -108,7 +108,6 @@ module.exports = function generateNativeCode() {
     utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)));
     // Write out all the classes.
     enabled.forEach(function(idef) {
-if (idef.filename == 'clone_options') debugger;
       try {
         if (idef.type && idef.type != "enum") {
           utils.writeFile(
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -157,7 +157,9 @@ var Helpers = {
           type.isMask = enums[type.cType].isMask || false
         }
       }
-      _.merge(type, descriptor.types[normalizedType.replace("git_", "")] || {});
+
+      // we don't want to overwrite the c type of the passed in type
+      _.merge(type, descriptor.types[normalizedType.replace("git_", "")] || {}, { cType: type.cType });
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,9 @@ var Helpers = {`
`157`	`157`	`type.isMask = enums[type.cType].isMask \|\| false`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- _.merge(type, descriptor.types[normalizedType.replace("git_", "")] \|\| {});`
	`160`	`+`
	`161`	`+ // we don't want to overwrite the c type of the passed in type`
	`162`	`+ _.merge(type, descriptor.types[normalizedType.replace("git_", "")] \|\| {}, { cType: type.cType });`
`161`	`163`	`}`
`162`	`164`	`},`
`163`	`165`