From 720c03c100d18b00944f1943167ebe09af0da581 Mon Sep 17 00:00:00 2001 From: joshaber Date: Thu, 25 Jun 2015 11:03:06 -0400 Subject: [PATCH 1/4] Alot of headers. --- ObjectiveGit.modulemap | 72 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index 9507228b9..d275d0507 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -31,7 +31,6 @@ framework module ObjectiveGit { header "git2/pack.h" header "git2/patch.h" header "git2/pathspec.h" - header "git2/push.h" header "git2/refdb.h" header "git2/reflog.h" header "git2/refs.h" @@ -64,6 +63,77 @@ framework module ObjectiveGit { header "git2/sys/refs.h" header "git2/sys/repository.h" header "git2/sys/transport.h" + header "git2/cred_helpers.h" + header "git2/inttypes.h" + header "git2/stdint" + header "git2/sys/git2/annotated_commit" + header "git2/sys/git2/attr" + header "git2/sys/git2/blame" + header "git2/sys/git2/blob" + header "git2/sys/git2/branch" + header "git2/sys/git2/buffer" + header "git2/sys/git2/checkout" + header "git2/sys/git2/cherrypick" + header "git2/sys/git2/clone" + header "git2/sys/git2/commit" + header "git2/sys/git2/cred_helpers" + header "git2/sys/git2/describe" + header "git2/sys/git2/errors" + header "git2/sys/git2/global" + header "git2/sys/git2/graph" + header "git2/sys/git2/ignore" + header "git2/sys/git2/index" + header "git2/sys/git2/indexer" + header "git2/sys/git2/inttypes" + header "git2/sys/git2/merge" + header "git2/sys/git2/message" + header "git2/sys/git2/notes" + header "git2/sys/git2/object" + header "git2/sys/git2/odb_backend" + header "git2/sys/git2/oidarray" + header "git2/sys/git2/pack" + header "git2/sys/git2/patch" + header "git2/sys/git2/pathspec" + header "git2/sys/git2/rebase" + header "git2/sys/git2/refdb" + header "git2/sys/git2/reflog" + header "git2/sys/git2/refs" + header "git2/sys/git2/refspec" + header "git2/sys/git2/remote" + header "git2/sys/git2/repository" + header "git2/sys/git2/reset" + header "git2/sys/git2/revert" + header "git2/sys/git2/revparse" + header "git2/sys/git2/revwalk" + header "git2/sys/git2/signature" + header "git2/sys/git2/stash" + header "git2/sys/git2/stdint" + header "git2/sys/git2/strarray" + header "git2/sys/git2/submodule" + header "git2/sys/git2/sys/commit" + header "git2/sys/git2/sys/config" + header "git2/sys/git2/sys/diff" + header "git2/sys/git2/sys/filter" + header "git2/sys/git2/sys/hashsig" + header "git2/sys/git2/sys/index" + header "git2/sys/git2/sys/mempack" + header "git2/sys/git2/sys/odb_backend" + header "git2/sys/git2/sys/openssl" + header "git2/sys/git2/sys/refdb_backend" + header "git2/sys/git2/sys/reflog" + header "git2/sys/git2/sys/refs" + header "git2/sys/git2/sys/repository" + header "git2/sys/git2/sys/stream" + header "git2/sys/git2/sys/transport" + header "git2/sys/git2/tag" + header "git2/sys/git2/trace" + header "git2/sys/git2/transaction" + header "git2/sys/git2/transport" + header "git2/sys/git2/tree" + header "git2/sys/git2/version" + header "git2/sys/openssl" + header "git2/sys/stream" + header "git2/trace" export * module * { export * } From 5d2d2f17d3b6335f562721e6807b6335ce57e509 Mon Sep 17 00:00:00 2001 From: joshaber Date: Thu, 25 Jun 2015 11:14:50 -0400 Subject: [PATCH 2/4] Hwhoops. --- ObjectiveGit.modulemap | 136 ++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 70 deletions(-) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index d275d0507..e5452b42f 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -64,76 +64,72 @@ framework module ObjectiveGit { header "git2/sys/repository.h" header "git2/sys/transport.h" header "git2/cred_helpers.h" - header "git2/inttypes.h" - header "git2/stdint" - header "git2/sys/git2/annotated_commit" - header "git2/sys/git2/attr" - header "git2/sys/git2/blame" - header "git2/sys/git2/blob" - header "git2/sys/git2/branch" - header "git2/sys/git2/buffer" - header "git2/sys/git2/checkout" - header "git2/sys/git2/cherrypick" - header "git2/sys/git2/clone" - header "git2/sys/git2/commit" - header "git2/sys/git2/cred_helpers" - header "git2/sys/git2/describe" - header "git2/sys/git2/errors" - header "git2/sys/git2/global" - header "git2/sys/git2/graph" - header "git2/sys/git2/ignore" - header "git2/sys/git2/index" - header "git2/sys/git2/indexer" - header "git2/sys/git2/inttypes" - header "git2/sys/git2/merge" - header "git2/sys/git2/message" - header "git2/sys/git2/notes" - header "git2/sys/git2/object" - header "git2/sys/git2/odb_backend" - header "git2/sys/git2/oidarray" - header "git2/sys/git2/pack" - header "git2/sys/git2/patch" - header "git2/sys/git2/pathspec" - header "git2/sys/git2/rebase" - header "git2/sys/git2/refdb" - header "git2/sys/git2/reflog" - header "git2/sys/git2/refs" - header "git2/sys/git2/refspec" - header "git2/sys/git2/remote" - header "git2/sys/git2/repository" - header "git2/sys/git2/reset" - header "git2/sys/git2/revert" - header "git2/sys/git2/revparse" - header "git2/sys/git2/revwalk" - header "git2/sys/git2/signature" - header "git2/sys/git2/stash" - header "git2/sys/git2/stdint" - header "git2/sys/git2/strarray" - header "git2/sys/git2/submodule" - header "git2/sys/git2/sys/commit" - header "git2/sys/git2/sys/config" - header "git2/sys/git2/sys/diff" - header "git2/sys/git2/sys/filter" - header "git2/sys/git2/sys/hashsig" - header "git2/sys/git2/sys/index" - header "git2/sys/git2/sys/mempack" - header "git2/sys/git2/sys/odb_backend" - header "git2/sys/git2/sys/openssl" - header "git2/sys/git2/sys/refdb_backend" - header "git2/sys/git2/sys/reflog" - header "git2/sys/git2/sys/refs" - header "git2/sys/git2/sys/repository" - header "git2/sys/git2/sys/stream" - header "git2/sys/git2/sys/transport" - header "git2/sys/git2/tag" - header "git2/sys/git2/trace" - header "git2/sys/git2/transaction" - header "git2/sys/git2/transport" - header "git2/sys/git2/tree" - header "git2/sys/git2/version" - header "git2/sys/openssl" - header "git2/sys/stream" - header "git2/trace" + header "git2/sys/git2/annotated_commit.h" + header "git2/sys/git2/attr.h" + header "git2/sys/git2/blame.h" + header "git2/sys/git2/blob.h" + header "git2/sys/git2/branch.h" + header "git2/sys/git2/buffer.h" + header "git2/sys/git2/checkout.h" + header "git2/sys/git2/cherrypick.h" + header "git2/sys/git2/clone.h" + header "git2/sys/git2/commit.h" + header "git2/sys/git2/cred_helpers.h" + header "git2/sys/git2/describe.h" + header "git2/sys/git2/errors.h" + header "git2/sys/git2/global.h" + header "git2/sys/git2/graph.h" + header "git2/sys/git2/ignore.h" + header "git2/sys/git2/index.h" + header "git2/sys/git2/indexer.h" + header "git2/sys/git2/merge.h" + header "git2/sys/git2/message.h" + header "git2/sys/git2/notes.h" + header "git2/sys/git2/object.h" + header "git2/sys/git2/odb_backend.h" + header "git2/sys/git2/oidarray.h" + header "git2/sys/git2/pack.h" + header "git2/sys/git2/patch.h" + header "git2/sys/git2/pathspec.h" + header "git2/sys/git2/rebase.h" + header "git2/sys/git2/refdb.h" + header "git2/sys/git2/reflog.h" + header "git2/sys/git2/refs.h" + header "git2/sys/git2/refspec.h" + header "git2/sys/git2/remote.h" + header "git2/sys/git2/repository.h" + header "git2/sys/git2/reset.h" + header "git2/sys/git2/revert.h" + header "git2/sys/git2/revparse.h" + header "git2/sys/git2/revwalk.h" + header "git2/sys/git2/signature.h" + header "git2/sys/git2/stash.h" + header "git2/sys/git2/strarray.h" + header "git2/sys/git2/submodule.h" + header "git2/sys/git2/sys/commit.h" + header "git2/sys/git2/sys/config.h" + header "git2/sys/git2/sys/diff.h" + header "git2/sys/git2/sys/filter.h" + header "git2/sys/git2/sys/hashsig.h" + header "git2/sys/git2/sys/index.h" + header "git2/sys/git2/sys/mempack.h" + header "git2/sys/git2/sys/odb_backend.h" + header "git2/sys/git2/sys/openssl.h" + header "git2/sys/git2/sys/refdb_backend.h" + header "git2/sys/git2/sys/reflog.h" + header "git2/sys/git2/sys/refs.h" + header "git2/sys/git2/sys/repository.h" + header "git2/sys/git2/sys/stream.h" + header "git2/sys/git2/sys/transport.h" + header "git2/sys/git2/tag.h" + header "git2/sys/git2/trace.h" + header "git2/sys/git2/transaction.h" + header "git2/sys/git2/transport.h" + header "git2/sys/git2/tree.h" + header "git2/sys/git2/version.h" + header "git2/sys/openssl.h" + header "git2/sys/stream.h" + header "git2/trace.h" export * module * { export * } From bb6e893b7f01eb8d45b646862ede33576495eeff Mon Sep 17 00:00:00 2001 From: joshaber Date: Thu, 25 Jun 2015 11:48:26 -0400 Subject: [PATCH 3/4] Don't copy the entirety of libgit2. --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1afc95aab..6105b9d90 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -422,7 +422,6 @@ 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCredential.h; sourceTree = ""; }; 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = ""; }; 4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = ""; }; - 4D8DADBE181A7D9F001B1202 /* libgit2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = libgit2; path = External/libgit2; sourceTree = ""; }; 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = ""; }; 4DE864341794A37E00371A65 /* GTRepository+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Private.h"; sourceTree = ""; }; 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+RemoteOperations.h"; sourceTree = ""; }; @@ -644,7 +643,6 @@ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 4D8DADBE181A7D9F001B1202 /* libgit2 */, 306123A817EA5261006591D4 /* extobjc */, 4D103ADC1819CFAA0029DB24 /* libiconv.dylib */, 8803DA861313145700E6E818 /* libz.dylib */, From 85bb4ed5ef15126a597cb611be2efd67e87737c6 Mon Sep 17 00:00:00 2001 From: joshaber Date: Thu, 25 Jun 2015 11:48:35 -0400 Subject: [PATCH 4/4] Just a few new headers, really. --- ObjectiveGit.modulemap | 63 ------------------------------------------ 1 file changed, 63 deletions(-) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index e5452b42f..5cb6db0a5 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -64,69 +64,6 @@ framework module ObjectiveGit { header "git2/sys/repository.h" header "git2/sys/transport.h" header "git2/cred_helpers.h" - header "git2/sys/git2/annotated_commit.h" - header "git2/sys/git2/attr.h" - header "git2/sys/git2/blame.h" - header "git2/sys/git2/blob.h" - header "git2/sys/git2/branch.h" - header "git2/sys/git2/buffer.h" - header "git2/sys/git2/checkout.h" - header "git2/sys/git2/cherrypick.h" - header "git2/sys/git2/clone.h" - header "git2/sys/git2/commit.h" - header "git2/sys/git2/cred_helpers.h" - header "git2/sys/git2/describe.h" - header "git2/sys/git2/errors.h" - header "git2/sys/git2/global.h" - header "git2/sys/git2/graph.h" - header "git2/sys/git2/ignore.h" - header "git2/sys/git2/index.h" - header "git2/sys/git2/indexer.h" - header "git2/sys/git2/merge.h" - header "git2/sys/git2/message.h" - header "git2/sys/git2/notes.h" - header "git2/sys/git2/object.h" - header "git2/sys/git2/odb_backend.h" - header "git2/sys/git2/oidarray.h" - header "git2/sys/git2/pack.h" - header "git2/sys/git2/patch.h" - header "git2/sys/git2/pathspec.h" - header "git2/sys/git2/rebase.h" - header "git2/sys/git2/refdb.h" - header "git2/sys/git2/reflog.h" - header "git2/sys/git2/refs.h" - header "git2/sys/git2/refspec.h" - header "git2/sys/git2/remote.h" - header "git2/sys/git2/repository.h" - header "git2/sys/git2/reset.h" - header "git2/sys/git2/revert.h" - header "git2/sys/git2/revparse.h" - header "git2/sys/git2/revwalk.h" - header "git2/sys/git2/signature.h" - header "git2/sys/git2/stash.h" - header "git2/sys/git2/strarray.h" - header "git2/sys/git2/submodule.h" - header "git2/sys/git2/sys/commit.h" - header "git2/sys/git2/sys/config.h" - header "git2/sys/git2/sys/diff.h" - header "git2/sys/git2/sys/filter.h" - header "git2/sys/git2/sys/hashsig.h" - header "git2/sys/git2/sys/index.h" - header "git2/sys/git2/sys/mempack.h" - header "git2/sys/git2/sys/odb_backend.h" - header "git2/sys/git2/sys/openssl.h" - header "git2/sys/git2/sys/refdb_backend.h" - header "git2/sys/git2/sys/reflog.h" - header "git2/sys/git2/sys/refs.h" - header "git2/sys/git2/sys/repository.h" - header "git2/sys/git2/sys/stream.h" - header "git2/sys/git2/sys/transport.h" - header "git2/sys/git2/tag.h" - header "git2/sys/git2/trace.h" - header "git2/sys/git2/transaction.h" - header "git2/sys/git2/transport.h" - header "git2/sys/git2/tree.h" - header "git2/sys/git2/version.h" header "git2/sys/openssl.h" header "git2/sys/stream.h" header "git2/trace.h"