Skip to content

Commit 82cb22b

Browse files
rowanjrowanj
committed
Change to an Xcode workspace and add the objective-c bindings for libgit2 as a submodule
1 parent 186f60a commit 82cb22b

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "libgit2"]
22
path = libgit2
33
url = https://github.com/libgit2/libgit2.git
4+
[submodule "objective-git"]
5+
path = objective-git
6+
url = https://github.com/libgit2/objective-git.git

‎GitX.xcodeproj/project.pbxproj

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
4A4015701406758D00DB9C07 /* vector.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A4013FE1406758C00DB9C07 /* vector.c */; };
110110
4A40159714067B6300DB9C07 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A40159614067B6300DB9C07 /* CoreFoundation.framework */; };
111111
4A40159914067B7A00DB9C07 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A40159814067B7A00DB9C07 /* AppKit.framework */; };
112+
4A476AA5141B05010080A85F /* ObjectiveGit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A476AA4141B05010080A85F /* ObjectiveGit.framework */; };
112113
4A5D15DC140668C6002ED242 /* PBGitSidebarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */; };
113114
551BF11E112F376C00265053 /* gitx_askpasswd_main.m in Sources */ = {isa = PBXBuildFile; fileRef = 551BF11D112F376C00265053 /* gitx_askpasswd_main.m */; };
114115
551BF176112F3F4B00265053 /* gitx_askpasswd in Resources */ = {isa = PBXBuildFile; fileRef = 551BF111112F371800265053 /* gitx_askpasswd */; };
@@ -206,7 +207,6 @@
206207
F567CC68106E6BD00059BB9D /* PBGitBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = F53C4DF50E97FC630022AD59 /* PBGitBinary.h */; };
207208
F567CC69106E6BD00059BB9D /* PBGitConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D2DC850EA401A80034AD24 /* PBGitConfig.h */; };
208209
F567CC7B106E6BF70059BB9D /* PBGitRef.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C007730E731B48007B84B2 /* PBGitRef.h */; };
209-
F567CC7F106E6C470059BB9D /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C580E40EDA250900995434 /* libgit2.a */; };
210210
F567CC8E106E6FC40059BB9D /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
211211
F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = F569AE920F2CBD7C00C2FFA7 /* Credits.html */; };
212212
F56ADDD90ED19F9E002AC78F /* AddBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */; };
@@ -229,7 +229,6 @@
229229
F5AD56790E79B78100EDAAFE /* PBCommitList.m in Sources */ = {isa = PBXBuildFile; fileRef = F5AD56780E79B78100EDAAFE /* PBCommitList.m */; };
230230
F5B721C40E05CF7E00AF29DC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5B721C20E05CF7E00AF29DC /* MainMenu.xib */; };
231231
F5C007750E731B48007B84B2 /* PBGitRef.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C007740E731B48007B84B2 /* PBGitRef.m */; };
232-
F5C580E50EDA250900995434 /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C580E40EDA250900995434 /* libgit2.a */; };
233232
F5C6F68D0E65FF9300478D97 /* PBGitLane.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5C6F68C0E65FF9300478D97 /* PBGitLane.mm */; };
234233
F5D376B9107511C500AAAC80 /* PBGitIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = F59F1DD4105C4FF300115F88 /* PBGitIndex.m */; };
235234
F5D376C91075134D00AAAC80 /* PBGitRevList.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E170E0829C20006317A /* PBGitRevList.mm */; };
@@ -292,13 +291,6 @@
292291
remoteGlobalIDString = 551BF110112F371800265053;
293292
remoteInfo = gitx_askpasswd;
294293
};
295-
913D5E590E5564F400CECEA2 /* PBXContainerItemProxy */ = {
296-
isa = PBXContainerItemProxy;
297-
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
298-
proxyType = 1;
299-
remoteGlobalIDString = 913D5E480E55644600CECEA2;
300-
remoteInfo = "cli tool";
301-
};
302294
/* End PBXContainerItemProxy section */
303295

304296
/* Begin PBXCopyFilesBuildPhase section */
@@ -486,6 +478,7 @@
486478
4A4013FF1406758C00DB9C07 /* vector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vector.h; sourceTree = "<group>"; };
487479
4A40159614067B6300DB9C07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
488480
4A40159814067B7A00DB9C07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
481+
4A476AA4141B05010080A85F /* ObjectiveGit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjectiveGit.framework; path = "objective-git/build/Release/ObjectiveGit.framework"; sourceTree = "<group>"; };
489482
4A5D15F714066E2B002ED242 /* libgit2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgit2.a; sourceTree = BUILT_PRODUCTS_DIR; };
490483
551BF111112F371800265053 /* gitx_askpasswd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gitx_askpasswd; sourceTree = BUILT_PRODUCTS_DIR; };
491484
551BF11D112F376C00265053 /* gitx_askpasswd_main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gitx_askpasswd_main.m; sourceTree = "<group>"; };
@@ -664,7 +657,6 @@
664657
F5B721C30E05CF7E00AF29DC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
665658
F5C007730E731B48007B84B2 /* PBGitRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRef.h; sourceTree = "<group>"; };
666659
F5C007740E731B48007B84B2 /* PBGitRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRef.m; sourceTree = "<group>"; };
667-
F5C580E40EDA250900995434 /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = libgit2/libgit2.a; sourceTree = "<group>"; };
668660
F5C6F68B0E65FF9300478D97 /* PBGitLane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitLane.h; sourceTree = "<group>"; };
669661
F5C6F68C0E65FF9300478D97 /* PBGitLane.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitLane.mm; sourceTree = "<group>"; };
670662
F5D2DC850EA401A80034AD24 /* PBGitConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitConfig.h; sourceTree = "<group>"; };
@@ -720,12 +712,12 @@
720712
isa = PBXFrameworksBuildPhase;
721713
buildActionMask = 2147483647;
722714
files = (
715+
4A476AA5141B05010080A85F /* ObjectiveGit.framework in Frameworks */,
723716
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
724717
F56526240E03D85900F03B52 /* WebKit.framework in Frameworks */,
725718
911112370E5A097800BF76B4 /* Security.framework in Frameworks */,
726719
F580E6AE0E733276009E2D3F /* Sparkle.framework in Frameworks */,
727720
F5E4DBFB0EAB58D90013FAFC /* SystemConfiguration.framework in Frameworks */,
728-
F5C580E50EDA250900995434 /* libgit2.a in Frameworks */,
729721
D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */,
730722
D87127011229A21C00012334 /* QuartzCore.framework in Frameworks */,
731723
0A6858C711F7EA8A00AC2BE4 /* CoreServices.framework in Frameworks */,
@@ -746,7 +738,6 @@
746738
isa = PBXFrameworksBuildPhase;
747739
buildActionMask = 2147483647;
748740
files = (
749-
F567CC7F106E6C470059BB9D /* libgit2.a in Frameworks */,
750741
);
751742
runOnlyForDeploymentPostprocessing = 0;
752743
};
@@ -878,7 +869,7 @@
878869
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
879870
isa = PBXGroup;
880871
children = (
881-
F5C580E40EDA250900995434 /* libgit2.a */,
872+
4A476AA4141B05010080A85F /* ObjectiveGit.framework */,
882873
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
883874
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
884875
0A6858C611F7EA8A00AC2BE4 /* CoreServices.framework */,
@@ -1487,7 +1478,6 @@
14871478
4A5D16B314066EB4002ED242 /* PBXTargetDependency */,
14881479
4A5D15DE14066973002ED242 /* PBXTargetDependency */,
14891480
551BF175112F3F3500265053 /* PBXTargetDependency */,
1490-
913D5E5A0E5564F400CECEA2 /* PBXTargetDependency */,
14911481
);
14921482
name = GitX;
14931483
productInstallPath = "$(HOME)/Applications";
@@ -1905,11 +1895,6 @@
19051895
target = 551BF110112F371800265053 /* gitx_askpasswd */;
19061896
targetProxy = 551BF174112F3F3500265053 /* PBXContainerItemProxy */;
19071897
};
1908-
913D5E5A0E5564F400CECEA2 /* PBXTargetDependency */ = {
1909-
isa = PBXTargetDependency;
1910-
target = 913D5E480E55644600CECEA2 /* cli tool */;
1911-
targetProxy = 913D5E590E5564F400CECEA2 /* PBXContainerItemProxy */;
1912-
};
19131898
/* End PBXTargetDependency section */
19141899

19151900
/* Begin PBXVariantGroup section */

‎GitX.xcworkspace/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xcuserdata

‎GitX.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objective-git

Submodule objective-git added at a431968

0 commit comments

Comments
 (0)