Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Support for Node 0.11+ #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbranyen merged 3 commits into from
Mar 19, 2014
Merged

Support for Node 0.11+ #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d46f7da
Add Node 0.11+ Compatibility using NAN #164
pierreinglebert Mar 1, 2014
197c71b
make travis test for node 0.10 & 0.11
pierreinglebert Mar 1, 2014
b33ad8c
add nan in include dirs
pierreinglebert Mar 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 2 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
language: node_js
node_js:
- 0.8
- 0.10
- 0.11.10
git:
depth: 1000
3 changes: 2 additions & 1 deletion 3 binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@

'include_dirs': [
'vendor/libv8-convert',
'vendor/libgit2/include'
'vendor/libgit2/include',
"<!(node -e \"require('nan')\")"
],

'libraries': [
Expand Down
14 changes: 7 additions & 7 deletions 14 include/blob.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <v8.h>
#include <node.h>
#include <string>
#include "nan.h"

#include "git2.h"

Expand All @@ -17,7 +18,7 @@ using namespace v8;
class GitBlob : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_blob *GetValue();
Expand All @@ -28,13 +29,12 @@ class GitBlob : public ObjectWrap {
GitBlob(git_blob *raw);
~GitBlob();

static Handle<Value> New(const Arguments& args);
static NAN_METHOD(New);


static Handle<Value> Oid(const Arguments& args);
static Handle<Value> Content(const Arguments& args);
static Handle<Value> Size(const Arguments& args);
static Handle<Value> IsBinary(const Arguments& args);
static NAN_METHOD(Oid);
static NAN_METHOD(Content);
static NAN_METHOD(Size);
static NAN_METHOD(IsBinary);
git_blob *raw;
};

Expand Down
31 changes: 16 additions & 15 deletions 31 include/branch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class Branch : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_branch *GetValue();
Expand All @@ -28,20 +30,19 @@ class Branch : public ObjectWrap {
Branch(git_branch *raw);
~Branch();

static Handle<Value> New(const Arguments& args);


static Handle<Value> Create(const Arguments& args);
static Handle<Value> Delete(const Arguments& args);
static Handle<Value> Foreach(const Arguments& args);
static Handle<Value> Move(const Arguments& args);
static Handle<Value> Lookup(const Arguments& args);
static Handle<Value> Name(const Arguments& args);
static Handle<Value> Upstream(const Arguments& args);
static Handle<Value> SetUpstream(const Arguments& args);
static Handle<Value> UpstreamName(const Arguments& args);
static Handle<Value> IsHead(const Arguments& args);
static Handle<Value> RemoteName(const Arguments& args);
static NAN_METHOD(New);

static NAN_METHOD(Create);
static NAN_METHOD(Delete);
static NAN_METHOD(Foreach);
static NAN_METHOD(Move);
static NAN_METHOD(Lookup);
static NAN_METHOD(Name);
static NAN_METHOD(Upstream);
static NAN_METHOD(SetUpstream);
static NAN_METHOD(UpstreamName);
static NAN_METHOD(IsHead);
static NAN_METHOD(RemoteName);
git_branch *raw;
};

Expand Down
7 changes: 4 additions & 3 deletions 7 include/clone_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitCloneOptions : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_clone_options *GetValue();
Expand All @@ -28,8 +30,7 @@ class GitCloneOptions : public ObjectWrap {
GitCloneOptions(git_clone_options *raw);
~GitCloneOptions();

static Handle<Value> New(const Arguments& args);

static NAN_METHOD(New);

git_clone_options *raw;
};
Expand Down
31 changes: 16 additions & 15 deletions 31 include/commit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitCommit : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_commit *GetValue();
Expand All @@ -28,20 +30,19 @@ class GitCommit : public ObjectWrap {
GitCommit(git_commit *raw);
~GitCommit();

static Handle<Value> New(const Arguments& args);


static Handle<Value> Oid(const Arguments& args);
static Handle<Value> MessageEncoding(const Arguments& args);
static Handle<Value> Message(const Arguments& args);
static Handle<Value> Time(const Arguments& args);
static Handle<Value> Offset(const Arguments& args);
static Handle<Value> Committer(const Arguments& args);
static Handle<Value> Author(const Arguments& args);
static Handle<Value> TreeId(const Arguments& args);
static Handle<Value> ParentCount(const Arguments& args);
static Handle<Value> ParentId(const Arguments& args);
static Handle<Value> NthGenAncestor(const Arguments& args);
static NAN_METHOD(New);

static NAN_METHOD(Oid);
static NAN_METHOD(MessageEncoding);
static NAN_METHOD(Message);
static NAN_METHOD(Time);
static NAN_METHOD(Offset);
static NAN_METHOD(Committer);
static NAN_METHOD(Author);
static NAN_METHOD(TreeId);
static NAN_METHOD(ParentCount);
static NAN_METHOD(ParentId);
static NAN_METHOD(NthGenAncestor);
git_commit *raw;
};

Expand Down
16 changes: 9 additions & 7 deletions 16 include/delta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitDelta : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_diff_delta *GetValue();
Expand All @@ -28,13 +30,13 @@ class GitDelta : public ObjectWrap {
GitDelta(git_diff_delta *raw);
~GitDelta();

static Handle<Value> New(const Arguments& args);
static NAN_METHOD(New);

static Handle<Value> OldFile(const Arguments& args);
static Handle<Value> NewFile(const Arguments& args);
static Handle<Value> Status(const Arguments& args);
static Handle<Value> Similarity(const Arguments& args);
static Handle<Value> Flags(const Arguments& args);
static NAN_METHOD(OldFile);
static NAN_METHOD(NewFile);
static NAN_METHOD(Status);
static NAN_METHOD(Similarity);
static NAN_METHOD(Flags);

git_diff_delta *raw;
};
Expand Down
26 changes: 14 additions & 12 deletions 26 include/diff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitDiff : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_diff_list *GetValue();
Expand All @@ -26,10 +28,10 @@ class GitDiff : public ObjectWrap {
GitDiff(git_diff_list *raw);
~GitDiff();

static Handle<Value> New(const Arguments& args);
static NAN_METHOD(New);

static NAN_METHOD(TreeToTree);

static Handle<Value> TreeToTree(const Arguments& args);
static void TreeToTreeWork(uv_work_t* req);
static void TreeToTreeAfterWork(uv_work_t* req);

Expand All @@ -47,7 +49,7 @@ class GitDiff : public ObjectWrap {
const git_diff_options * opts;
Persistent<Function> callback;
};
static Handle<Value> TreeToIndex(const Arguments& args);
static NAN_METHOD(TreeToIndex);
static void TreeToIndexWork(uv_work_t* req);
static void TreeToIndexAfterWork(uv_work_t* req);

Expand All @@ -65,7 +67,7 @@ class GitDiff : public ObjectWrap {
const git_diff_options * opts;
Persistent<Function> callback;
};
static Handle<Value> IndexToWorkdir(const Arguments& args);
static NAN_METHOD(IndexToWorkdir);
static void IndexToWorkdirWork(uv_work_t* req);
static void IndexToWorkdirAfterWork(uv_work_t* req);

Expand All @@ -81,7 +83,7 @@ class GitDiff : public ObjectWrap {
const git_diff_options * opts;
Persistent<Function> callback;
};
static Handle<Value> TreeToWorkdir(const Arguments& args);
static NAN_METHOD(TreeToWorkdir);
static void TreeToWorkdirWork(uv_work_t* req);
static void TreeToWorkdirAfterWork(uv_work_t* req);

Expand All @@ -97,12 +99,12 @@ class GitDiff : public ObjectWrap {
const git_diff_options * opts;
Persistent<Function> callback;
};
static Handle<Value> Merge(const Arguments& args);
static Handle<Value> FindSimilar(const Arguments& args);
static Handle<Value> StatusChar(const Arguments& args);
static Handle<Value> NumDeltas(const Arguments& args);
static Handle<Value> NumDeltasOfType(const Arguments& args);
static Handle<Value> GetPatch(const Arguments& args);
static NAN_METHOD(Merge);
static NAN_METHOD(FindSimilar);
static NAN_METHOD(StatusChar);
static NAN_METHOD(NumDeltas);
static NAN_METHOD(NumDeltasOfType);
static NAN_METHOD(GetPatch);
git_diff_list *raw;
};

Expand Down
16 changes: 9 additions & 7 deletions 16 include/diff_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitDiffFile : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_diff_file *GetValue();
Expand All @@ -28,13 +30,13 @@ class GitDiffFile : public ObjectWrap {
GitDiffFile(git_diff_file *raw);
~GitDiffFile();

static Handle<Value> New(const Arguments& args);
static NAN_METHOD(New);

static Handle<Value> Oid(const Arguments& args);
static Handle<Value> Path(const Arguments& args);
static Handle<Value> Size(const Arguments& args);
static Handle<Value> Flags(const Arguments& args);
static Handle<Value> Mode(const Arguments& args);
static NAN_METHOD(Oid);
static NAN_METHOD(Path);
static NAN_METHOD(Size);
static NAN_METHOD(Flags);
static NAN_METHOD(Mode);

git_diff_file *raw;
};
Expand Down
7 changes: 4 additions & 3 deletions 7 include/diff_find_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <node.h>
#include <string>

#include "nan.h"

#include "git2.h"

using namespace node;
Expand All @@ -17,7 +19,7 @@ using namespace v8;
class GitDiffFindOptions : public ObjectWrap {
public:

static Persistent<Function> constructor_template;
static Persistent<FunctionTemplate> constructor_template;
static void Initialize (Handle<v8::Object> target);

git_diff_find_options *GetValue();
Expand All @@ -28,8 +30,7 @@ class GitDiffFindOptions : public ObjectWrap {
GitDiffFindOptions(git_diff_find_options *raw);
~GitDiffFindOptions();

static Handle<Value> New(const Arguments& args);

static NAN_METHOD(New);

git_diff_find_options *raw;
};
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.