Skip to content

Commit 7f6f64d

Browse files
tbranyentbranyen
committed
Updated the license date and binding to latest.
I took the latest binding and made it work with the existing to resolve the build failure.
1 parent 35be88f commit 7f6f64d

File tree

2 files changed

+107
-63
lines changed

2 files changed

+107
-63
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013 Tim Branyen
1+
Copyright (c) 2014 Tim Branyen
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

‎binding.gyp‎

Lines changed: 106 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,114 @@
11
{
2-
'targets': [
3-
{
4-
'target_name': 'nodegit',
5-
'sources': [
6-
'src/base.cc',
7-
'src/blob.cc',
8-
'src/commit.cc',
9-
'src/oid.cc',
10-
'src/reference.cc',
11-
'src/object.cc',
12-
'src/repo.cc',
13-
'src/index.cc',
14-
'src/index_entry.cc',
15-
'src/index_time.cc',
16-
'src/tag.cc',
17-
'src/revwalk.cc',
18-
'src/signature.cc',
19-
'src/time.cc',
20-
'src/tree.cc',
21-
'src/tree_builder.cc',
22-
'src/tree_entry.cc',
23-
'src/diff_find_options.cc',
24-
'src/diff_options.cc',
25-
'src/diff_list.cc',
26-
'src/patch.cc',
27-
'src/delta.cc',
28-
'src/diff_file.cc',
29-
'src/diff_range.cc',
30-
'src/threads.cc',
31-
'src/wrapper.cc',
32-
'src/refdb.cc',
33-
'src/odb_object.cc',
34-
'src/odb.cc',
35-
'src/submodule.cc',
36-
'src/remote.cc',
37-
'src/clone_options.cc',
38-
'src/functions/copy.cc',
2+
"targets": [
3+
{
4+
"target_name": "nodegit",
395

40-
],
6+
"sources": [
7+
"src/base.cc",
8+
"src/blob.cc",
9+
"src/commit.cc",
10+
"src/oid.cc",
11+
"src/reference.cc",
12+
"src/object.cc",
13+
"src/repo.cc",
14+
"src/index.cc",
15+
"src/index_entry.cc",
16+
"src/index_time.cc",
17+
"src/tag.cc",
18+
"src/revwalk.cc",
19+
"src/signature.cc",
20+
"src/time.cc",
21+
"src/tree.cc",
22+
"src/tree_builder.cc",
23+
"src/tree_entry.cc",
24+
"src/diff_find_options.cc",
25+
"src/diff_options.cc",
26+
"src/diff_list.cc",
27+
"src/patch.cc",
28+
"src/delta.cc",
29+
"src/diff_file.cc",
30+
"src/diff_range.cc",
31+
"src/threads.cc",
32+
"src/wrapper.cc",
33+
"src/refdb.cc",
34+
"src/odb_object.cc",
35+
"src/odb.cc",
36+
"src/submodule.cc",
37+
"src/remote.cc",
38+
"src/clone_options.cc",
39+
"src/functions/copy.cc",
40+
],
4141

42-
'include_dirs': [
43-
'vendor/libv8-convert',
44-
'vendor/libgit2/include',
45-
"<!(node -e \"require('nan')\")"
46-
],
42+
"include_dirs": [
43+
"vendor/libv8-convert",
44+
"vendor/libgit2/include",
45+
"<!(node -e \"require('nan')\")"
46+
],
4747

48-
'libraries': [
49-
'-L<!(pwd)/vendor/libgit2/build',
50-
'-lgit2'
51-
],
48+
"cflags": [
49+
"-Wall"
50+
],
5251

53-
'cflags': [
54-
'-Wall'
55-
],
52+
"ldflags": [
53+
"-Wl,-rpath,\$$ORIGIN/../../vendor/libgit2/build"
54+
],
5655

57-
'ldflags': [
58-
'-Wl,-rpath,\$$ORIGIN/../../vendor/libgit2/build'
59-
],
60-
61-
'conditions': [
62-
['OS=="mac"', {
63-
'xcode_settings': {
64-
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
65-
}
66-
}]
56+
"conditions": [
57+
['OS=="win"', {
58+
"link_settings": {
59+
"libraries": [
60+
"-lgit2.lib",
6761
]
68-
}
69-
]
62+
},
63+
"configurations": {
64+
"Release": {
65+
"msvs_settings": {
66+
"VCCLCompilerTool": {
67+
"RuntimeLibrary": 0,
68+
"Optimization": 3,
69+
"FavorSizeOrSpeed": 1,
70+
"InlineFunctionExpansion": 2,
71+
"WholeProgramOptimization": "true",
72+
"OmitFramePointers": "true",
73+
"EnableFunctionLevelLinking": "true",
74+
"EnableIntrinsicFunctions": "true",
75+
"RuntimeTypeInfo": "false",
76+
"ExceptionHandling": "0",
77+
"GenerateDebugInformation": "true",
78+
"AdditionalOptions": [
79+
"/MP /EHsc"
80+
]
81+
},
82+
"VCLibrarianTool": {
83+
"AdditionalOptions": [
84+
"/LTCG"
85+
]
86+
},
87+
"VCLinkerTool": {
88+
"LinkTimeCodeGeneration": 1,
89+
"OptimizeReferences": 2,
90+
"EnableCOMDATFolding": 2,
91+
"LinkIncremental": 1,
92+
"AdditionalLibraryDirectories": [
93+
"../vendor/libgit2/build/debug"
94+
]
95+
}
96+
}
97+
}
98+
}
99+
}, { # Not Windows.
100+
"libraries": [
101+
"-L<!(pwd)/vendor/libgit2/build",
102+
"-lgit2"
103+
]
104+
}],
105+
106+
['OS=="mac"', {
107+
"xcode_settings": {
108+
"GCC_ENABLE_CPP_EXCEPTIONS": "YES"
109+
}
110+
}]
111+
]
112+
}
113+
]
70114
}

0 commit comments

Comments
 (0)