Commit 969452a
John Haley
Fixed more build errors
1 parent 841740b commit 969452a
3 files changed
Lines changed: 20 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -651,6 +651,11 @@ | |||
| 651 | 651 | } | |
| 652 | 652 | } | |
| 653 | 653 | }, | |
| 654 | + "hashsig": { | ||
| 655 | + "cDependencies": [ | ||
| 656 | + "git2/sys/hashsig.h" | ||
| 657 | + ] | ||
| 658 | + }, | ||
| 654 | 659 | "ignore": { | |
| 655 | 660 | "functions": { | |
| 656 | 661 | "git_ignore_path_is_ignored": { | |
@@ -751,6 +756,9 @@ | |||
| 751 | 756 | "git_merge_base_many": { | |
| 752 | 757 | "ignore": true | |
| 753 | 758 | }, | |
| 759 | + "git_merge_bases_many": { | ||
| 760 | + "ignore": true | ||
| 761 | + }, | ||
| 754 | 762 | "git_merge_base_octopus": { | |
| 755 | 763 | "ignore": true | |
| 756 | 764 | }, | |
@@ -1363,6 +1371,11 @@ | |||
| 1363 | 1371 | } | |
| 1364 | 1372 | } | |
| 1365 | 1373 | }, | |
| 1374 | + "stream": { | ||
| 1375 | + "cDependencies": [ | ||
| 1376 | + "git2/sys/stream.h" | ||
| 1377 | + ] | ||
| 1378 | + }, | ||
| 1366 | 1379 | "submodule": { | |
| 1367 | 1380 | "functions": { | |
| 1368 | 1381 | "git_submodule_foreach": { | |
@@ -1428,7 +1441,10 @@ | |||
| 1428 | 1441 | "git_transport_smart": { | |
| 1429 | 1442 | "ignore": true | |
| 1430 | 1443 | } | |
| 1431 | - } | ||
| 1444 | + }, | ||
| 1445 | + "cDependencies": [ | ||
| 1446 | + "git2/sys/transport.h" | ||
| 1447 | + ] | ||
| 1432 | 1448 | }, | |
| 1433 | 1449 | "tree": { | |
| 1434 | 1450 | "functions": { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -108,7 +108,6 @@ module.exports = function generateNativeCode() { | |||
| 108 | 108 | utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled))); | |
| 109 | 109 | // Write out all the classes. | |
| 110 | 110 | enabled.forEach(function(idef) { | |
| 111 | - if (idef.filename == 'clone_options') debugger; | ||
| 112 | 111 | try { | |
| 113 | 112 | if (idef.type && idef.type != "enum") { | |
| 114 | 113 | utils.writeFile( | |
| 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 | ||
0 commit comments