Merge pull request #188 from nodegit/auto-gen-structs

tbranyen · tbranyen · commit 42088c9cec2c · 2014-07-11T11:52:04.000-04:00
Auto gen structs
diff --git a/.gitignore b/.gitignore
@@ -11,10 +11,10 @@
 /src/*
 !/src/functions/copy.cc
 !/src/wrapper.cc
-!/src/nodegit.cc
 
 /include/*
 !/include/functions/copy.h
 !/include/wrapper.h
 
 /generate/idefs.json
+/binding.gyp
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,3 @@ git:
 branches:
   only:
     - master
-matrix:
-  fast_finish: true
-  allow_failures:
-    - node_js: 0.11
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,10 +15,6 @@ environment:
     - nodejs_version: 0.11
     - nodejs_version: 0.10
 
-matrix:
-  allow_failures:
-    - nodejs_version: 0.11
-
 # Get the latest stable version of Node 0.STABLE.latest
 install:
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
diff --git a/binding.gyp b/binding.gyp
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -254,29 +254,6 @@
       "../include/diff.h",
       "../include/oid.h",
       "../include/types.h"
-    ],
-
-    "fields": [
-      {
-        "name": "oid",
-        "cType": "git_oid"
-      },
-      {
-        "name": "path",
-        "cType": "const char *"
-      },
-      {
-        "name": "size",
-        "cType": "git_off_t"
-      },
-      {
-        "name": "flags",
-        "cType": "uint32_t"
-      },
-      {
-        "name": "mode",
-        "cType": "uint16_t"
-      }
     ]
   },
 
@@ -375,6 +352,8 @@
   },
 
   "filter": {
+    "forwardDeclare": true,
+    "fields": []
   },
 
   "graph": {
@@ -420,6 +399,8 @@
   },
 
   "oid": {
+    "fields": [],
+
     "functions": {
       "git_oid_fromstr": {
         "isAsync": false,
diff --git a/generate/index.js b/generate/index.js
@@ -4,7 +4,6 @@ const ejs = require("ejs");
 const path = require("path");
 const idefs = require("./idefs");
 
-
 var local = path.join.bind(null, __dirname);
 
 var classTemplate = ejs.compile(
@@ -17,16 +16,29 @@ var headerTemplate = ejs.compile(
     filename: "header.h"
   });
 
-Object.keys(idefs).forEach(function(keyName) {
-  var idef = idefs[keyName];
+var bindingTemplate = ejs.compile(
+  "" + fs.readFileSync(local("templates/binding.gyp.ejs")), {});
+
+var nodegitSourceTemplate = ejs.compile(
+  "" + fs.readFileSync(local("templates/nodegit.cc.ejs")), {});
 
-  if (idef.ignore) {
-    return;
-  }
+var enabled = idefs.filter(function(idef) {
+  idef.name = path.basename(idef.filename, ".h");
+  return !idef.ignore;
+});
 
+enabled.forEach(function(idef) {
   fs.writeFileSync(local("../include/", idef.filename), headerTemplate(idef));
 
   fs.writeFileSync(
     local("../src/", path.basename(idef.filename, ".h")) + ".cc",
       classTemplate(idef));
+
+  fs.writeFileSync(local("../binding.gyp"), bindingTemplate({
+    idefs: idefs
+  }));
+
+  fs.writeFileSync(local("../src/nodegit.cc"), nodegitSourceTemplate({
+    idefs: idefs
+  }));
 });
diff --git a/generate/setup.js b/generate/setup.js
@@ -5,6 +5,10 @@ var version = require("../package.json").libgit2.version;
 var descriptor = require("./descriptor.json");
 var libgit2 = require("./v" + version + ".json");
 
+var structs = libgit2.types.reduce(function(memo, current) {
+  return memo[current[0]] = current[1], memo;
+}, {});
+
 // Extracted types.
 var typeMap = require("./types.json");
 
@@ -29,7 +33,15 @@ typeMap.__proto__ = {
   "git_branch_iterator **": { cpp: "BranchIterator", js: "Iterator" },
   "git_branch_t *": { cpp: "GitBranch", js: "Branch" },
   "const git_commit *[]": { cpp: "Array", js: "Array" },
-  "git_diff_file": { cpp: "GitDiffFile", js: "DiffFile" }
+  "git_diff_file": { cpp: "GitDiffFile", js: "DiffFile" },
+  "git_strarray": { cpp: "Array", js: "Array" },
+  "git_diff_notify_cb": { cpp: "GitDiffNotifyCb", js: "DiffNotifyCb" },
+  "unsigned char [20]": { cpp: "Array", js: "Array" },
+  "git_filter_init_fn": { cpp: "Function", js: "Function" },
+  "git_filter_shutdown_fn": { cpp: "Function", js: "Function" },
+  "git_filter_check_fn": { cpp: "Function", js: "Function" },
+  "git_filter_apply_fn": { cpp: "Function", js: "Function" },
+  "git_filter_cleanup_fn": { cpp: "Function", js: "Function" },
 };
 
 var files = [];
@@ -58,6 +70,7 @@ var fileNames = Object.keys(descriptor);
 
 fileNames.forEach(function(fileName, index) {
   var file = descriptor[fileName];
+  var structFile = structs["git_" + fileName];
 
   // Constants.
   file.filename = fileName + ".h";
@@ -90,6 +103,7 @@ fileNames.forEach(function(fileName, index) {
     // No functions.
     cFile = Object.create(file);
     cFile.functions = [];
+    cFile.fields = descriptor[fileName].fields || structFile.fields;
   }
 
   // Doesn't actually exist.
@@ -146,17 +160,18 @@ fileNames.forEach(function(fileName, index) {
     js: file.jsClassName 
   };
 
-  var fields = file.fields || [];
+  var fields = file.fields || cFile.fields || (structFile ? structFile.fields || [] : []);
 
   // Decorate fields.
   file.fields = fields.map(function(field) {
     try {
+      field.cType = field.cType || field.type;
       field.cppFunctionName = titleCase(field.name);
       field.jsFunctionName = camelCase(field.name);
       field.cppClassName = typeMap[field.cType].cpp;
       field.jsClassName = typeMap[field.cType].js;
     } catch (ex) {
-      console.error(field.name + " is missing a definition.");
+      console.error(file.filename, field.cType + " is missing a definition.");
     }
 
     return field;
diff --git a/generate/templates/binding.gyp.ejs b/generate/templates/binding.gyp.ejs
@@ -0,0 +1,44 @@
+# This is a generated file, modify: generate/templates/binding.gyp.ejs.
+{
+  "targets": [
+    {
+      "target_name": "nodegit",
+
+      "dependencies": [
+        "<(module_root_dir)/vendor/libgit2.gyp:libgit2"
+      ],
+
+      "sources": [
+        "src/nodegit.cc",
+        "src/wrapper.cc",
+        "src/functions/copy.cc",
+    <% idefs.forEach(function(idef) { -%>
+    "src/<%- idef.name %>.cc",
+    <% }); -%>
+  ],
+
+      "include_dirs": [
+        "vendor/libv8-convert",
+        "<!(node -e \"require('nan')\")"
+      ],
+
+      "cflags": [
+        "-Wall",
+      ],
+
+      "conditions": [
+        [
+          "OS=='mac'", {
+            "xcode_settings": {
+              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+
+              "WARNING_CFLAGS": [
+                "-Wno-unused-variable",
+              ],
+            }
+          }
+        ]
+      ]
+    },
+  ]
+}
diff --git a/generate/templates/class.cc.ejs b/generate/templates/class.cc.ejs
@@ -23,13 +23,13 @@
     else { return '0'; }
   }
 -%>
-/**
- * This code is auto-generated; unless you know what you're doing, do not modify!
- **/
+// This is a generated file, modify: generate/templates/class.cc.ejs.
 #include <nan.h>
 #include <string.h>
 
-#include "git2.h"
+extern "C" {
+#include <git2.h>
+}
 
 #include "../include/functions/copy.h"
 
diff --git a/generate/templates/header.h.ejs b/generate/templates/header.h.ejs
@@ -1,14 +1,13 @@
-/**
- * This code is auto-generated; unless you know what you're doing, do not modify!
- **/
-
+// This is a generated file, modify: generate/templates/header.h.ejs.
 #ifndef <%- cppClassName.toUpperCase() %>_H
 #define <%- cppClassName.toUpperCase() %>_H
 
 #include <nan.h>
 #include <string>
 
-#include "git2.h"
+extern "C" {
+#include <git2.h>
+}
 
 <% if (typeof dependencies != 'undefined') { -%>
 <% for (d in dependencies) { -%>
diff --git a/generate/templates/nodegit.cc.ejs b/generate/templates/nodegit.cc.ejs
@@ -0,0 +1,24 @@
+// This is a generated file, modify: generate/templates/nodegit.cc.ejs.
+#include <v8.h>
+#include <node.h>
+
+#include "git2.h"
+
+#include "../include/wrapper.h"
+#include "../include/functions/copy.h"
+
+<% idefs.forEach(function(idef) { -%>
+#include "../include/<%- idef.filename %>"
+<% }); -%>
+
+extern "C" void init(Handle<v8::Object> target) {
+  NanScope();
+
+  Wrapper::Initialize(target);
+
+<% idefs.forEach(function(idef) { -%>
+  <%- idef.cppClassName %>::Initialize(target);
+<% }); -%>
+}
+
+NODE_MODULE(nodegit, init)
diff --git a/generate/v0.20.0.json b/generate/v0.20.0.json
diff --git a/src/nodegit.cc b/src/nodegit.cc
