Skip to content

WIP New installer. #140

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 9 commits into from
Apr 30, 2014
Merged

WIP New installer. #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bae2093
New installer.
tbranyen Sep 2, 2013
5e679b4
Moved the test installer to main install.
tbranyen Mar 23, 2014
d902363
Added async to devDependencies so tests can run.
tbranyen Mar 23, 2014
ee646e3
Remove python from build command.
tbranyen Mar 23, 2014
35be88f
Revert changing the libgit2 library path.
tbranyen Mar 23, 2014
7f6f64d
Updated the license date and binding to latest.
tbranyen Apr 30, 2014
c7c961f
Unrelated commit: Updated the git_profanity_check app.
tbranyen Apr 30, 2014
c093d1e
Finally, Windows support!
tbranyen Apr 30, 2014
334d3e4
Add an appveyor configuration.
tbranyen Apr 30, 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
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@tbranyen
tbranyen committed Apr 30, 2014
commit 7f6f64d6ab0b8871ec33d0fa2dae66856c954ed8
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013 Tim Branyen
Copyright (c) 2014 Tim Branyen

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
168 changes: 106 additions & 62 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,114 @@
{
'targets': [
{
'target_name': 'nodegit',
'sources': [
'src/base.cc',
'src/blob.cc',
'src/commit.cc',
'src/oid.cc',
'src/reference.cc',
'src/object.cc',
'src/repo.cc',
'src/index.cc',
'src/index_entry.cc',
'src/index_time.cc',
'src/tag.cc',
'src/revwalk.cc',
'src/signature.cc',
'src/time.cc',
'src/tree.cc',
'src/tree_builder.cc',
'src/tree_entry.cc',
'src/diff_find_options.cc',
'src/diff_options.cc',
'src/diff_list.cc',
'src/patch.cc',
'src/delta.cc',
'src/diff_file.cc',
'src/diff_range.cc',
'src/threads.cc',
'src/wrapper.cc',
'src/refdb.cc',
'src/odb_object.cc',
'src/odb.cc',
'src/submodule.cc',
'src/remote.cc',
'src/clone_options.cc',
'src/functions/copy.cc',
"targets": [
{
"target_name": "nodegit",

],
"sources": [
"src/base.cc",
"src/blob.cc",
"src/commit.cc",
"src/oid.cc",
"src/reference.cc",
"src/object.cc",
"src/repo.cc",
"src/index.cc",
"src/index_entry.cc",
"src/index_time.cc",
"src/tag.cc",
"src/revwalk.cc",
"src/signature.cc",
"src/time.cc",
"src/tree.cc",
"src/tree_builder.cc",
"src/tree_entry.cc",
"src/diff_find_options.cc",
"src/diff_options.cc",
"src/diff_list.cc",
"src/patch.cc",
"src/delta.cc",
"src/diff_file.cc",
"src/diff_range.cc",
"src/threads.cc",
"src/wrapper.cc",
"src/refdb.cc",
"src/odb_object.cc",
"src/odb.cc",
"src/submodule.cc",
"src/remote.cc",
"src/clone_options.cc",
"src/functions/copy.cc",
],

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

'libraries': [
'-L<!(pwd)/vendor/libgit2/build',
'-lgit2'
],
"cflags": [
"-Wall"
],

'cflags': [
'-Wall'
],
"ldflags": [
"-Wl,-rpath,\$$ORIGIN/../../vendor/libgit2/build"
],

'ldflags': [
'-Wl,-rpath,\$$ORIGIN/../../vendor/libgit2/build'
],

'conditions': [
['OS=="mac"', {
'xcode_settings': {
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
}
}]
"conditions": [
['OS=="win"', {
"link_settings": {
"libraries": [
"-lgit2.lib",
]
}
]
},
"configurations": {
"Release": {
"msvs_settings": {
"VCCLCompilerTool": {
"RuntimeLibrary": 0,
"Optimization": 3,
"FavorSizeOrSpeed": 1,
"InlineFunctionExpansion": 2,
"WholeProgramOptimization": "true",
"OmitFramePointers": "true",
"EnableFunctionLevelLinking": "true",
"EnableIntrinsicFunctions": "true",
"RuntimeTypeInfo": "false",
"ExceptionHandling": "0",
"GenerateDebugInformation": "true",
"AdditionalOptions": [
"/MP /EHsc"
]
},
"VCLibrarianTool": {
"AdditionalOptions": [
"/LTCG"
]
},
"VCLinkerTool": {
"LinkTimeCodeGeneration": 1,
"OptimizeReferences": 2,
"EnableCOMDATFolding": 2,
"LinkIncremental": 1,
"AdditionalLibraryDirectories": [
"../vendor/libgit2/build/debug"
]
}
}
}
}
}, { # Not Windows.
"libraries": [
"-L<!(pwd)/vendor/libgit2/build",
"-lgit2"
]
}],

['OS=="mac"', {
"xcode_settings": {
"GCC_ENABLE_CPP_EXCEPTIONS": "YES"
}
}]
]
}
]
}