Skip to content

Commit ed4682d

Browse files
tbranyentbranyen
committed
Merge pull request #184 from deepak1556/gyp-clean
moved libgit2 gyp to separate dir
2 parents 071b8d4 + 2516888 commit ed4682d

File tree

2 files changed

+357
-354
lines changed

2 files changed

+357
-354
lines changed

‎binding.gyp‎

Lines changed: 1 addition & 354 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"target_name": "nodegit",
55

66
"dependencies": [
7-
"libgit2"
7+
"<(module_root_dir)/vendor/libgit2.gyp:libgit2"
88
],
99

1010
"sources": [
@@ -45,7 +45,6 @@
4545

4646
"include_dirs": [
4747
"vendor/libv8-convert",
48-
"vendor/libgit2/include",
4948
"<!(node -e \"require('nan')\")"
5049
],
5150

@@ -67,357 +66,5 @@
6766
]
6867
]
6968
},
70-
{
71-
"target_name": "libgit2",
72-
"type": "static_library",
73-
"defines": [
74-
"GIT_THREADS",
75-
# Node's util.h may be accidentally included so use this to guard
76-
# against compilation error.
77-
"SRC_UTIL_H_",
78-
],
79-
"dependencies": [
80-
"zlib",
81-
"http_parser",
82-
],
83-
"sources": [
84-
"vendor/libgit2/src/attr.c",
85-
"vendor/libgit2/src/attr.h",
86-
"vendor/libgit2/src/attr_file.c",
87-
"vendor/libgit2/src/attr_file.h",
88-
"vendor/libgit2/src/blob.c",
89-
"vendor/libgit2/src/blob.h",
90-
"vendor/libgit2/src/branch.c",
91-
"vendor/libgit2/src/branch.h",
92-
"vendor/libgit2/src/bswap.h",
93-
"vendor/libgit2/src/buf_text.c",
94-
"vendor/libgit2/src/buf_text.h",
95-
"vendor/libgit2/src/buffer.c",
96-
"vendor/libgit2/src/buffer.h",
97-
"vendor/libgit2/src/cache.c",
98-
"vendor/libgit2/src/cache.h",
99-
"vendor/libgit2/src/cc-compat.h",
100-
"vendor/libgit2/src/checkout.c",
101-
"vendor/libgit2/src/checkout.h",
102-
"vendor/libgit2/src/clone.c",
103-
"vendor/libgit2/src/commit.c",
104-
"vendor/libgit2/src/commit.h",
105-
"vendor/libgit2/src/commit_list.c",
106-
"vendor/libgit2/src/commit_list.h",
107-
"vendor/libgit2/src/common.h",
108-
"vendor/libgit2/src/compress.c",
109-
"vendor/libgit2/src/compress.h",
110-
"vendor/libgit2/src/config.c",
111-
"vendor/libgit2/src/config.h",
112-
"vendor/libgit2/src/config_cache.c",
113-
"vendor/libgit2/src/config_file.c",
114-
"vendor/libgit2/src/config_file.h",
115-
"vendor/libgit2/src/crlf.c",
116-
"vendor/libgit2/src/date.c",
117-
"vendor/libgit2/src/delta-apply.c",
118-
"vendor/libgit2/src/delta-apply.h",
119-
"vendor/libgit2/src/delta.c",
120-
"vendor/libgit2/src/delta.h",
121-
"vendor/libgit2/src/diff.c",
122-
"vendor/libgit2/src/diff.h",
123-
"vendor/libgit2/src/diff_output.c",
124-
"vendor/libgit2/src/diff_output.h",
125-
"vendor/libgit2/src/diff_tform.c",
126-
"vendor/libgit2/src/errors.c",
127-
"vendor/libgit2/src/fetch.c",
128-
"vendor/libgit2/src/fetch.h",
129-
"vendor/libgit2/src/fetchhead.c",
130-
"vendor/libgit2/src/fetchhead.h",
131-
"vendor/libgit2/src/filebuf.c",
132-
"vendor/libgit2/src/filebuf.h",
133-
"vendor/libgit2/src/fileops.c",
134-
"vendor/libgit2/src/fileops.h",
135-
"vendor/libgit2/src/filter.c",
136-
"vendor/libgit2/src/filter.h",
137-
"vendor/libgit2/src/fnmatch.c",
138-
"vendor/libgit2/src/fnmatch.h",
139-
"vendor/libgit2/src/global.c",
140-
"vendor/libgit2/src/global.h",
141-
"vendor/libgit2/src/graph.c",
142-
"vendor/libgit2/src/hash.c",
143-
"vendor/libgit2/src/hash.h",
144-
"vendor/libgit2/src/hashsig.c",
145-
"vendor/libgit2/src/hashsig.h",
146-
"vendor/libgit2/src/ignore.c",
147-
"vendor/libgit2/src/ignore.h",
148-
"vendor/libgit2/src/index.c",
149-
"vendor/libgit2/src/index.h",
150-
"vendor/libgit2/src/indexer.c",
151-
"vendor/libgit2/src/iterator.c",
152-
"vendor/libgit2/src/iterator.h",
153-
"vendor/libgit2/src/khash.h",
154-
"vendor/libgit2/src/map.h",
155-
"vendor/libgit2/src/merge.c",
156-
"vendor/libgit2/src/merge.h",
157-
"vendor/libgit2/src/message.c",
158-
"vendor/libgit2/src/message.h",
159-
"vendor/libgit2/src/mwindow.c",
160-
"vendor/libgit2/src/mwindow.h",
161-
"vendor/libgit2/src/netops.c",
162-
"vendor/libgit2/src/netops.h",
163-
"vendor/libgit2/src/notes.c",
164-
"vendor/libgit2/src/notes.h",
165-
"vendor/libgit2/src/object.c",
166-
"vendor/libgit2/src/object.h",
167-
"vendor/libgit2/src/odb.c",
168-
"vendor/libgit2/src/odb.h",
169-
"vendor/libgit2/src/odb_loose.c",
170-
"vendor/libgit2/src/odb_pack.c",
171-
"vendor/libgit2/src/offmap.h",
172-
"vendor/libgit2/src/oid.c",
173-
"vendor/libgit2/src/oidmap.h",
174-
"vendor/libgit2/src/pack-objects.c",
175-
"vendor/libgit2/src/pack-objects.h",
176-
"vendor/libgit2/src/pack.c",
177-
"vendor/libgit2/src/pack.h",
178-
"vendor/libgit2/src/path.c",
179-
"vendor/libgit2/src/path.h",
180-
"vendor/libgit2/src/pathspec.c",
181-
"vendor/libgit2/src/pathspec.h",
182-
"vendor/libgit2/src/pool.c",
183-
"vendor/libgit2/src/pool.h",
184-
"vendor/libgit2/src/posix.c",
185-
"vendor/libgit2/src/posix.h",
186-
"vendor/libgit2/src/pqueue.c",
187-
"vendor/libgit2/src/pqueue.h",
188-
"vendor/libgit2/src/push.c",
189-
"vendor/libgit2/src/push.h",
190-
"vendor/libgit2/src/refdb.c",
191-
"vendor/libgit2/src/refdb.h",
192-
"vendor/libgit2/src/refdb_fs.c",
193-
"vendor/libgit2/src/refdb_fs.h",
194-
"vendor/libgit2/src/reflog.c",
195-
"vendor/libgit2/src/reflog.h",
196-
"vendor/libgit2/src/refs.c",
197-
"vendor/libgit2/src/refs.h",
198-
"vendor/libgit2/src/refspec.c",
199-
"vendor/libgit2/src/refspec.h",
200-
"vendor/libgit2/src/remote.c",
201-
"vendor/libgit2/src/remote.h",
202-
"vendor/libgit2/src/repo_template.h",
203-
"vendor/libgit2/src/repository.c",
204-
"vendor/libgit2/src/repository.h",
205-
"vendor/libgit2/src/reset.c",
206-
"vendor/libgit2/src/revparse.c",
207-
"vendor/libgit2/src/revwalk.c",
208-
"vendor/libgit2/src/revwalk.h",
209-
"vendor/libgit2/src/sha1_lookup.c",
210-
"vendor/libgit2/src/sha1_lookup.h",
211-
"vendor/libgit2/src/signature.c",
212-
"vendor/libgit2/src/signature.h",
213-
"vendor/libgit2/src/stash.c",
214-
"vendor/libgit2/src/status.c",
215-
"vendor/libgit2/src/strmap.h",
216-
"vendor/libgit2/src/submodule.c",
217-
"vendor/libgit2/src/submodule.h",
218-
"vendor/libgit2/src/tag.c",
219-
"vendor/libgit2/src/tag.h",
220-
"vendor/libgit2/src/thread-utils.c",
221-
"vendor/libgit2/src/thread-utils.h",
222-
"vendor/libgit2/src/trace.c",
223-
"vendor/libgit2/src/trace.h",
224-
"vendor/libgit2/src/transport.c",
225-
"vendor/libgit2/src/tree-cache.c",
226-
"vendor/libgit2/src/tree-cache.h",
227-
"vendor/libgit2/src/tree.c",
228-
"vendor/libgit2/src/tree.h",
229-
"vendor/libgit2/src/tsort.c",
230-
"vendor/libgit2/src/util.c",
231-
"vendor/libgit2/src/util.h",
232-
"vendor/libgit2/src/vector.c",
233-
"vendor/libgit2/src/vector.h",
234-
"vendor/libgit2/src/transports/cred.c",
235-
"vendor/libgit2/src/transports/cred_helpers.c",
236-
"vendor/libgit2/src/transports/git.c",
237-
"vendor/libgit2/src/transports/http.c",
238-
"vendor/libgit2/src/transports/local.c",
239-
"vendor/libgit2/src/transports/smart.c",
240-
"vendor/libgit2/src/transports/smart.h",
241-
"vendor/libgit2/src/transports/smart_pkt.c",
242-
"vendor/libgit2/src/transports/smart_protocol.c",
243-
"vendor/libgit2/src/xdiff/xdiff.h",
244-
"vendor/libgit2/src/xdiff/xdiffi.c",
245-
"vendor/libgit2/src/xdiff/xdiffi.h",
246-
"vendor/libgit2/src/xdiff/xemit.c",
247-
"vendor/libgit2/src/xdiff/xemit.h",
248-
"vendor/libgit2/src/xdiff/xhistogram.c",
249-
"vendor/libgit2/src/xdiff/xinclude.h",
250-
"vendor/libgit2/src/xdiff/xmacros.h",
251-
"vendor/libgit2/src/xdiff/xmerge.c",
252-
"vendor/libgit2/src/xdiff/xpatience.c",
253-
"vendor/libgit2/src/xdiff/xprepare.c",
254-
"vendor/libgit2/src/xdiff/xprepare.h",
255-
"vendor/libgit2/src/xdiff/xtypes.h",
256-
"vendor/libgit2/src/xdiff/xutils.c",
257-
"vendor/libgit2/src/xdiff/xutils.h",
258-
"vendor/libgit2/src/hash/hash_generic.c",
259-
"vendor/libgit2/src/hash/hash_generic.h",
260-
"vendor/libgit2/src/hash/hash_openssl.h",
261-
],
262-
"conditions": [
263-
["OS=='linux'", {
264-
"cflags": [
265-
"-w",
266-
],
267-
}],
268-
["OS=='win'", {
269-
"msvs_settings": {
270-
"VCLinkerTool": {
271-
"AdditionalDependencies": [
272-
"ws2_32.lib",
273-
],
274-
},
275-
# Workaround of a strange bug:
276-
# TargetMachine + static_library + x64 = nothing.
277-
"conditions": [
278-
["target_arch=='x64'", {
279-
"VCLibrarianTool": {
280-
"AdditionalOptions": [
281-
"/MACHINE:X64",
282-
],
283-
},
284-
}, {
285-
"VCLibrarianTool": {
286-
"AdditionalOptions": [
287-
"/MACHINE:x86",
288-
],
289-
},
290-
}],
291-
],
292-
},
293-
"msvs_disabled_warnings": [
294-
# Conversion from 'ssize_t' to 'int32_t', possible loss of data.
295-
4244,
296-
# Conversion from 'size_t' to 'int', possible loss of data.
297-
4267,
298-
# Different 'volatile' qualifiers.
299-
4090,
300-
# 'volatile void *' differs in levels of indirection from 'int'.
301-
4047,
302-
# 'InterlockedDecrement' undefined; assuming extern returning int.
303-
4013,
304-
],
305-
"sources": [
306-
"vendor/libgit2/src/win32/dir.c",
307-
"vendor/libgit2/src/win32/dir.h",
308-
"vendor/libgit2/src/win32/error.c",
309-
"vendor/libgit2/src/win32/error.h",
310-
"vendor/libgit2/src/win32/findfile.c",
311-
"vendor/libgit2/src/win32/findfile.h",
312-
"vendor/libgit2/src/win32/git2.rc",
313-
"vendor/libgit2/src/win32/map.c",
314-
"vendor/libgit2/src/win32/mingw-compat.h",
315-
"vendor/libgit2/src/win32/msvc-compat.h",
316-
"vendor/libgit2/src/win32/posix.h",
317-
"vendor/libgit2/src/win32/posix_w32.c",
318-
"vendor/libgit2/src/win32/precompiled.c",
319-
"vendor/libgit2/src/win32/precompiled.h",
320-
"vendor/libgit2/src/win32/pthread.c",
321-
"vendor/libgit2/src/win32/pthread.h",
322-
"vendor/libgit2/src/win32/utf-conv.c",
323-
"vendor/libgit2/src/win32/utf-conv.h",
324-
"vendor/libgit2/src/win32/version.h",
325-
"vendor/libgit2/deps/regex/regex.c",
326-
],
327-
}, {
328-
"libraries": [
329-
"-lpthread",
330-
],
331-
"sources": [
332-
"vendor/libgit2/src/unix/map.c",
333-
"vendor/libgit2/src/unix/posix.h",
334-
"vendor/libgit2/src/unix/realpath.c",
335-
],
336-
"cflags": [
337-
"-Wno-missing-field-initializers",
338-
"-Wno-unused-variable",
339-
"-Wno-deprecated-declarations",
340-
],
341-
"xcode_settings": {
342-
"WARNING_CFLAGS": [
343-
"-Wno-missing-field-initializers",
344-
"-Wno-unused-variable",
345-
"-Wno-deprecated-declarations",
346-
"-Wno-uninitialized",
347-
],
348-
},
349-
},
350-
]
351-
],
352-
"include_dirs": [
353-
"vendor/libgit2/include",
354-
"vendor/libgit2/src",
355-
"vendor/libgit2/deps/regex",
356-
],
357-
"direct_dependent_settings": {
358-
"include_dirs": [
359-
"vendor/libgit2/include",
360-
],
361-
},
362-
},
363-
{
364-
"target_name": "zlib",
365-
"type": "static_library",
366-
"sources": [
367-
"vendor/libgit2/deps/zlib/adler32.c",
368-
"vendor/libgit2/deps/zlib/crc32.c",
369-
"vendor/libgit2/deps/zlib/crc32.h",
370-
"vendor/libgit2/deps/zlib/deflate.c",
371-
"vendor/libgit2/deps/zlib/deflate.h",
372-
"vendor/libgit2/deps/zlib/inffast.c",
373-
"vendor/libgit2/deps/zlib/inffast.h",
374-
"vendor/libgit2/deps/zlib/inffixed.h",
375-
"vendor/libgit2/deps/zlib/inflate.c",
376-
"vendor/libgit2/deps/zlib/inflate.h",
377-
"vendor/libgit2/deps/zlib/inftrees.c",
378-
"vendor/libgit2/deps/zlib/inftrees.h",
379-
"vendor/libgit2/deps/zlib/trees.c",
380-
"vendor/libgit2/deps/zlib/trees.h",
381-
"vendor/libgit2/deps/zlib/zconf.h",
382-
"vendor/libgit2/deps/zlib/zlib.h",
383-
"vendor/libgit2/deps/zlib/zutil.c",
384-
"vendor/libgit2/deps/zlib/zutil.h",
385-
],
386-
"defines": [
387-
"NO_VIZ",
388-
"STDC",
389-
"NO_GZIP",
390-
],
391-
"include_dirs": [
392-
"vendor/libgit2/include",
393-
"vendor/libgit2/deps/regex",
394-
],
395-
"direct_dependent_settings": {
396-
"include_dirs": [
397-
"vendor/libgit2/deps/zlib",
398-
],
399-
},
400-
},
401-
{
402-
"target_name": "http_parser",
403-
"type": "static_library",
404-
"sources": [
405-
"vendor/libgit2/deps/http-parser/http_parser.c",
406-
"vendor/libgit2/deps/http-parser/http_parser.h",
407-
],
408-
"direct_dependent_settings": {
409-
"include_dirs": [
410-
"vendor/libgit2/deps/http-parser",
411-
],
412-
},
413-
"conditions": [
414-
["OS=='win'", {
415-
"msvs_disabled_warnings": [
416-
# Conversion from 'ssize_t' to 'int32_t', possible loss of data.
417-
4244,
418-
],
419-
}],
420-
],
421-
},
42269
]
42370
}

0 commit comments

Comments
 (0)