Merge pull request #424 from libgit2/module

Include libgit2 headers in our module

Author: joshaber

ObjectiveGit.modulemap

@@ -0,0 +1,71 @@
+framework module ObjectiveGit {
+	umbrella header "ObjectiveGit.h"
+
+	header "git2/attr.h"
+	header "git2/blob.h"
+	header "git2/blame.h"
+	header "git2/branch.h"
+	header "git2/buffer.h"
+	header "git2/checkout.h"
+	header "git2/cherrypick.h"
+	header "git2/clone.h"
+	header "git2/commit.h"
+	header "git2/common.h"
+	header "git2/config.h"
+	header "git2/describe.h"
+	header "git2/diff.h"
+	header "git2/errors.h"
+	header "git2/filter.h"
+	header "git2/graph.h"
+	header "git2/ignore.h"
+	header "git2/index.h"
+	header "git2/indexer.h"
+	header "git2/merge.h"
+	header "git2/message.h"
+	header "git2/net.h"
+	header "git2/notes.h"
+	header "git2/object.h"
+	header "git2/odb.h"
+	header "git2/odb_backend.h"
+	header "git2/oid.h"
+	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"
+	header "git2/refspec.h"
+	header "git2/remote.h"
+	header "git2/repository.h"
+	header "git2/reset.h"
+	header "git2/revert.h"
+	header "git2/revparse.h"
+	header "git2/revwalk.h"
+	header "git2/signature.h"
+	header "git2/stash.h"
+	header "git2/status.h"
+	header "git2/submodule.h"
+	header "git2/tag.h"
+	header "git2/threads.h"
+	header "git2/transport.h"
+	header "git2/tree.h"
+	header "git2/types.h"
+	header "git2/version.h"
+	header "git2/sys/commit.h"
+	header "git2/sys/config.h"
+	header "git2/sys/diff.h"
+	header "git2/sys/filter.h"
+	header "git2/sys/hashsig.h"
+	header "git2/sys/index.h"
+	header "git2/sys/mempack.h"
+	header "git2/sys/odb_backend.h"
+	header "git2/sys/refdb_backend.h"
+	header "git2/sys/reflog.h"
+	header "git2/sys/refs.h"
+	header "git2/sys/repository.h"
+	header "git2/sys/transport.h"
+
+	export *
+	module * { export * }
+}

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -175,6 +175,7 @@
 		BDFAF9C4131C1845000508BC /* GTIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = BDFAF9C2131C1845000508BC /* GTIndex.m */; };
 		BDFAF9C9131C1868000508BC /* GTIndexEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFAF9C7131C1868000508BC /* GTIndexEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BDFAF9CA131C1868000508BC /* GTIndexEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = BDFAF9C8131C1868000508BC /* GTIndexEntry.m */; };
+		BEF7E4E01A3A47690035BB8E /* git2 in Copy git2 Headers again */ = {isa = PBXBuildFile; fileRef = 79262F0E13C697BE00A4B1EA /* git2 */; };
 		D00F6816175D373C004DB9D6 /* GTReferenceSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D00F6815175D373C004DB9D6 /* GTReferenceSpec.m */; };
 		D015F7CA17F695E800AD5E1F /* GTRepository+Stashing.h in Headers */ = {isa = PBXBuildFile; fileRef = D015F7C817F695E800AD5E1F /* GTRepository+Stashing.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D015F7CC17F695E800AD5E1F /* GTRepository+Stashing.m in Sources */ = {isa = PBXBuildFile; fileRef = D015F7C917F695E800AD5E1F /* GTRepository+Stashing.m */; };
@@ -366,6 +367,17 @@
 			name = "Copy git2 Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = Headers/git2/sys;
+			dstSubfolderSpec = 1;
+			files = (
+				BEF7E4E01A3A47690035BB8E /* git2 in Copy git2 Headers again */,
+			);
+			name = "Copy git2 Headers again";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -452,6 +464,7 @@
 		8870390A1975E3F2004118D7 /* GTDiffDeltaSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffDeltaSpec.m; sourceTree = "<group>"; };
 		88746CC217FA1C950005888A /* GTRepository+Committing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Committing.h"; sourceTree = "<group>"; };
 		88746CC317FA1C950005888A /* GTRepository+Committing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Committing.m"; sourceTree = "<group>"; };
+		887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = ObjectiveGit.modulemap; sourceTree = "<group>"; };
 		887DAFF615CB1C8000F30D0D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTObjectDatabaseSpec.m; sourceTree = "<group>"; };
 		889923F919FF5DD40092A9A6 /* git2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = git2; path = External/libgit2/include/git2; sourceTree = "<group>"; };
@@ -608,6 +621,7 @@
 			isa = PBXGroup;
 			children = (
 				BDD8AB01130F01AB00CB5D40 /* README.md */,
+				887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
 				BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
 				88F05A7516011E5400B7AD1D /* ObjectiveGitTests */,
 				32C88DFF0371C24200C91783 /* Other Sources */,
@@ -1074,6 +1088,7 @@
 				8DC2EF520486A6940098B216 /* Resources */,
 				8DC2EF560486A6940098B216 /* Frameworks */,
 				79262F0F13C697BE00A4B1EA /* Copy git2 Headers */,
+				BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */,
 				8DC2EF500486A6940098B216 /* Headers */,
 			);
 			buildRules = (
@@ -1429,10 +1444,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
+				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
 					"-force_load",
@@ -1450,10 +1467,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
+				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
 					"-force_load",
@@ -1631,10 +1650,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
+				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
 					"-force_load",
@@ -1846,10 +1867,12 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
+				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
 					"-force_load",