Skip to content

Commit ff891ea

Browse files
jspahrsummersjspahrsummers
committed
Merge pull request libgit2#342 from libgit2/flatten-dependencies
Flatten dependencies
2 parents 842d52d + 46ddec0 commit ff891ea

File tree

4 files changed

+24
-181
lines changed

4 files changed

+24
-181
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ External/libgit2-ios
2121

2222
project.xcworkspace
2323
*/xcuserdata/
24+
*.xccheckout
2425

2526
ObjectiveGitTests/fixtures/Fixtures/*
2627

‎ObjectiveGitFramework.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@
223223
88F05AC61601209A00B7AD1D /* ObjectiveGit.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F05AC51601209A00B7AD1D /* ObjectiveGit.m */; };
224224
88F05AC716012CE500B7AD1D /* NSString+Git.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8057313874CDF004DCB0F /* NSString+Git.m */; };
225225
88F05AC816012CEE00B7AD1D /* NSData+Git.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6C2267131459E700992935 /* NSData+Git.m */; };
226-
88F05AF11601338B00B7AD1D /* libSpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88F05AD41601335C00B7AD1D /* libSpecta.a */; };
227-
88F05AF21601338F00B7AD1D /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88F05AE61601336B00B7AD1D /* libExpecta.a */; };
228226
88F50F59132054D800584FBE /* GTBranch.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F50F56132054D800584FBE /* GTBranch.h */; settings = {ATTRIBUTES = (Public, ); }; };
229227
88F50F5A132054D800584FBE /* GTBranch.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F50F57132054D800584FBE /* GTBranch.m */; };
230228
88F6D9D91320451F00CC0BA8 /* ObjectiveGit.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F6D9D81320451F00CC0BA8 /* ObjectiveGit.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -289,6 +287,8 @@
289287
D0CE552318B6C58F008EB8E0 /* GTFilterList.m in Sources */ = {isa = PBXBuildFile; fileRef = D0CE551F18B6C58F008EB8E0 /* GTFilterList.m */; };
290288
D0CE552418B6C58F008EB8E0 /* GTFilterList.m in Sources */ = {isa = PBXBuildFile; fileRef = D0CE551F18B6C58F008EB8E0 /* GTFilterList.m */; };
291289
D0F4E28A17C7F24200BBDE30 /* NSErrorGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */; };
290+
D4ACA56118DBA88E00EBD899 /* libSpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA56018DBA88E00EBD899 /* libSpecta.a */; };
291+
D4ACA56318DBA89300EBD899 /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA56218DBA89300EBD899 /* libExpecta.a */; };
292292
DD3D9512182A81E1004AF532 /* GTBlame.h in Headers */ = {isa = PBXBuildFile; fileRef = DD3D9510182A81E1004AF532 /* GTBlame.h */; settings = {ATTRIBUTES = (Public, ); }; };
293293
DD3D9513182A81E1004AF532 /* GTBlame.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3D9511182A81E1004AF532 /* GTBlame.m */; };
294294
DD3D951C182AB25C004AF532 /* GTBlameHunk.h in Headers */ = {isa = PBXBuildFile; fileRef = DD3D951A182AB25C004AF532 /* GTBlameHunk.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -329,76 +329,6 @@
329329
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
330330
remoteInfo = ObjectiveGit;
331331
};
332-
88F05AD31601335C00B7AD1D /* PBXContainerItemProxy */ = {
333-
isa = PBXContainerItemProxy;
334-
containerPortal = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
335-
proxyType = 2;
336-
remoteGlobalIDString = E9D96A2614B6B8AB007D9521;
337-
remoteInfo = Specta;
338-
};
339-
88F05AD51601335C00B7AD1D /* PBXContainerItemProxy */ = {
340-
isa = PBXContainerItemProxy;
341-
containerPortal = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
342-
proxyType = 2;
343-
remoteGlobalIDString = E9B777A414BA294B00D8DC76;
344-
remoteInfo = "Specta-iOS";
345-
};
346-
88F05AD71601335C00B7AD1D /* PBXContainerItemProxy */ = {
347-
isa = PBXContainerItemProxy;
348-
containerPortal = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
349-
proxyType = 2;
350-
remoteGlobalIDString = E9D96A3A14B6B8AB007D9521;
351-
remoteInfo = SpectaTests;
352-
};
353-
88F05AD91601335C00B7AD1D /* PBXContainerItemProxy */ = {
354-
isa = PBXContainerItemProxy;
355-
containerPortal = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
356-
proxyType = 2;
357-
remoteGlobalIDString = E9B777B314BA294C00D8DC76;
358-
remoteInfo = "Specta-iOSTests";
359-
};
360-
88F05AE51601336B00B7AD1D /* PBXContainerItemProxy */ = {
361-
isa = PBXContainerItemProxy;
362-
containerPortal = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
363-
proxyType = 2;
364-
remoteGlobalIDString = E9ACDF0C13B2DD520010F4D7;
365-
remoteInfo = Expecta;
366-
};
367-
88F05AE71601336B00B7AD1D /* PBXContainerItemProxy */ = {
368-
isa = PBXContainerItemProxy;
369-
containerPortal = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
370-
proxyType = 2;
371-
remoteGlobalIDString = E93067CE13B2E6D100EA26FF;
372-
remoteInfo = "Expecta-iOS";
373-
};
374-
88F05AE91601336B00B7AD1D /* PBXContainerItemProxy */ = {
375-
isa = PBXContainerItemProxy;
376-
containerPortal = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
377-
proxyType = 2;
378-
remoteGlobalIDString = E9ACDF1D13B2DD520010F4D7;
379-
remoteInfo = ExpectaTests;
380-
};
381-
88F05AEB1601336B00B7AD1D /* PBXContainerItemProxy */ = {
382-
isa = PBXContainerItemProxy;
383-
containerPortal = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
384-
proxyType = 2;
385-
remoteGlobalIDString = E93067DA13B2E6D100EA26FF;
386-
remoteInfo = "Expecta-iOSTests";
387-
};
388-
88F05AED1601337D00B7AD1D /* PBXContainerItemProxy */ = {
389-
isa = PBXContainerItemProxy;
390-
containerPortal = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
391-
proxyType = 1;
392-
remoteGlobalIDString = E9D96A2514B6B8AB007D9521;
393-
remoteInfo = Specta;
394-
};
395-
88F05AEF1601338400B7AD1D /* PBXContainerItemProxy */ = {
396-
isa = PBXContainerItemProxy;
397-
containerPortal = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
398-
proxyType = 1;
399-
remoteGlobalIDString = E9ACDF0B13B2DD520010F4D7;
400-
remoteInfo = Expecta;
401-
};
402332
D0A330F716027F4900A616FA /* PBXContainerItemProxy */ = {
403333
isa = PBXContainerItemProxy;
404334
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -529,8 +459,6 @@
529459
88F05AA816011FFD00B7AD1D /* GTObjectTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTObjectTest.m; sourceTree = "<group>"; };
530460
88F05AAF16011FFD00B7AD1D /* ObjectiveGitTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ObjectiveGitTests-Info.plist"; sourceTree = "<group>"; };
531461
88F05AC51601209A00B7AD1D /* ObjectiveGit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjectiveGit.m; path = Classes/ObjectiveGit.m; sourceTree = "<group>"; };
532-
88F05AC91601335C00B7AD1D /* Specta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Specta.xcodeproj; path = specta/Specta.xcodeproj; sourceTree = "<group>"; };
533-
88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Expecta.xcodeproj; path = expecta/Expecta.xcodeproj; sourceTree = "<group>"; };
534462
88F50F56132054D800584FBE /* GTBranch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBranch.h; sourceTree = "<group>"; };
535463
88F50F57132054D800584FBE /* GTBranch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GTBranch.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
536464
88F6D9D81320451F00CC0BA8 /* ObjectiveGit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = ObjectiveGit.h; path = Classes/ObjectiveGit.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -605,6 +533,8 @@
605533
D0D8186C174421EB00995A2E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
606534
D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSErrorGitSpec.m; sourceTree = "<group>"; };
607535
D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
536+
D4ACA56018DBA88E00EBD899 /* libSpecta.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSpecta.a; path = specta/build/Debug/libSpecta.a; sourceTree = "<group>"; };
537+
D4ACA56218DBA89300EBD899 /* libExpecta.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libExpecta.a; path = expecta/build/Debug/libExpecta.a; sourceTree = "<group>"; };
608538
DD3D9510182A81E1004AF532 /* GTBlame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBlame.h; sourceTree = "<group>"; };
609539
DD3D9511182A81E1004AF532 /* GTBlame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlame.m; sourceTree = "<group>"; };
610540
DD3D951A182AB25C004AF532 /* GTBlameHunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBlameHunk.h; sourceTree = "<group>"; };
@@ -629,10 +559,10 @@
629559
isa = PBXFrameworksBuildPhase;
630560
buildActionMask = 2147483647;
631561
files = (
632-
88F05AF21601338F00B7AD1D /* libExpecta.a in Frameworks */,
633-
88F05AF11601338B00B7AD1D /* libSpecta.a in Frameworks */,
634562
88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */,
635563
88F05A9D16011F6A00B7AD1D /* SenTestingKit.framework in Frameworks */,
564+
D4ACA56118DBA88E00EBD899 /* libSpecta.a in Frameworks */,
565+
D4ACA56318DBA89300EBD899 /* libExpecta.a in Frameworks */,
636566
);
637567
runOnlyForDeploymentPostprocessing = 0;
638568
};
@@ -814,8 +744,8 @@
814744
88A994CA16FCED1D00402C7B /* GTTestCase.m */,
815745
D09C2E50175602A500065E36 /* fixtures.zip */,
816746
88F05A9C16011F6A00B7AD1D /* SenTestingKit.framework */,
817-
88F05AC91601335C00B7AD1D /* Specta.xcodeproj */,
818-
88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */,
747+
D4ACA56218DBA89300EBD899 /* libExpecta.a */,
748+
D4ACA56018DBA88E00EBD899 /* libSpecta.a */,
819749
88F05A7716011E5400B7AD1D /* ObjectiveGitTests-Info.plist */,
820750
88F05A7816011E5400B7AD1D /* InfoPlist.strings */,
821751
88F05A7E16011E5400B7AD1D /* ObjectiveGitTests-Prefix.pch */,
@@ -824,28 +754,6 @@
824754
name = "Supporting Files";
825755
sourceTree = "<group>";
826756
};
827-
88F05ACA1601335C00B7AD1D /* Products */ = {
828-
isa = PBXGroup;
829-
children = (
830-
88F05AD41601335C00B7AD1D /* libSpecta.a */,
831-
88F05AD61601335C00B7AD1D /* libSpecta-iOS.a */,
832-
88F05AD81601335C00B7AD1D /* SpectaTests.octest */,
833-
88F05ADA1601335C00B7AD1D /* Specta-iOSTests.octest */,
834-
);
835-
name = Products;
836-
sourceTree = "<group>";
837-
};
838-
88F05ADC1601336B00B7AD1D /* Products */ = {
839-
isa = PBXGroup;
840-
children = (
841-
88F05AE61601336B00B7AD1D /* libExpecta.a */,
842-
88F05AE81601336B00B7AD1D /* libExpecta-iOS.a */,
843-
88F05AEA1601336B00B7AD1D /* ExpectaTests.octest */,
844-
88F05AEC1601336B00B7AD1D /* Expecta-iOSTests.octest */,
845-
);
846-
name = Products;
847-
sourceTree = "<group>";
848-
};
849757
BDE4C05E130EFE2C00851650 /* Classes */ = {
850758
isa = PBXGroup;
851759
children = (
@@ -1165,8 +1073,6 @@
11651073
buildRules = (
11661074
);
11671075
dependencies = (
1168-
88F05AF01601338400B7AD1D /* PBXTargetDependency */,
1169-
88F05AEE1601337D00B7AD1D /* PBXTargetDependency */,
11701076
88F05AA016011F9000B7AD1D /* PBXTargetDependency */,
11711077
);
11721078
name = ObjectiveGitTests;
@@ -1219,16 +1125,6 @@
12191125
mainGroup = 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */;
12201126
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
12211127
projectDirPath = "";
1222-
projectReferences = (
1223-
{
1224-
ProductGroup = 88F05ADC1601336B00B7AD1D /* Products */;
1225-
ProjectRef = 88F05ADB1601336B00B7AD1D /* Expecta.xcodeproj */;
1226-
},
1227-
{
1228-
ProductGroup = 88F05ACA1601335C00B7AD1D /* Products */;
1229-
ProjectRef = 88F05AC91601335C00B7AD1D /* Specta.xcodeproj */;
1230-
},
1231-
);
12321128
projectRoot = "";
12331129
targets = (
12341130
8DC2EF4F0486A6940098B216 /* ObjectiveGit */,
@@ -1242,65 +1138,6 @@
12421138
};
12431139
/* End PBXProject section */
12441140

1245-
/* Begin PBXReferenceProxy section */
1246-
88F05AD41601335C00B7AD1D /* libSpecta.a */ = {
1247-
isa = PBXReferenceProxy;
1248-
fileType = archive.ar;
1249-
path = libSpecta.a;
1250-
remoteRef = 88F05AD31601335C00B7AD1D /* PBXContainerItemProxy */;
1251-
sourceTree = BUILT_PRODUCTS_DIR;
1252-
};
1253-
88F05AD61601335C00B7AD1D /* libSpecta-iOS.a */ = {
1254-
isa = PBXReferenceProxy;
1255-
fileType = archive.ar;
1256-
path = "libSpecta-iOS.a";
1257-
remoteRef = 88F05AD51601335C00B7AD1D /* PBXContainerItemProxy */;
1258-
sourceTree = BUILT_PRODUCTS_DIR;
1259-
};
1260-
88F05AD81601335C00B7AD1D /* SpectaTests.octest */ = {
1261-
isa = PBXReferenceProxy;
1262-
fileType = wrapper.cfbundle;
1263-
path = SpectaTests.octest;
1264-
remoteRef = 88F05AD71601335C00B7AD1D /* PBXContainerItemProxy */;
1265-
sourceTree = BUILT_PRODUCTS_DIR;
1266-
};
1267-
88F05ADA1601335C00B7AD1D /* Specta-iOSTests.octest */ = {
1268-
isa = PBXReferenceProxy;
1269-
fileType = wrapper.cfbundle;
1270-
path = "Specta-iOSTests.octest";
1271-
remoteRef = 88F05AD91601335C00B7AD1D /* PBXContainerItemProxy */;
1272-
sourceTree = BUILT_PRODUCTS_DIR;
1273-
};
1274-
88F05AE61601336B00B7AD1D /* libExpecta.a */ = {
1275-
isa = PBXReferenceProxy;
1276-
fileType = archive.ar;
1277-
path = libExpecta.a;
1278-
remoteRef = 88F05AE51601336B00B7AD1D /* PBXContainerItemProxy */;
1279-
sourceTree = BUILT_PRODUCTS_DIR;
1280-
};
1281-
88F05AE81601336B00B7AD1D /* libExpecta-iOS.a */ = {
1282-
isa = PBXReferenceProxy;
1283-
fileType = archive.ar;
1284-
path = "libExpecta-iOS.a";
1285-
remoteRef = 88F05AE71601336B00B7AD1D /* PBXContainerItemProxy */;
1286-
sourceTree = BUILT_PRODUCTS_DIR;
1287-
};
1288-
88F05AEA1601336B00B7AD1D /* ExpectaTests.octest */ = {
1289-
isa = PBXReferenceProxy;
1290-
fileType = wrapper.cfbundle;
1291-
path = ExpectaTests.octest;
1292-
remoteRef = 88F05AE91601336B00B7AD1D /* PBXContainerItemProxy */;
1293-
sourceTree = BUILT_PRODUCTS_DIR;
1294-
};
1295-
88F05AEC1601336B00B7AD1D /* Expecta-iOSTests.octest */ = {
1296-
isa = PBXReferenceProxy;
1297-
fileType = wrapper.cfbundle;
1298-
path = "Expecta-iOSTests.octest";
1299-
remoteRef = 88F05AEB1601336B00B7AD1D /* PBXContainerItemProxy */;
1300-
sourceTree = BUILT_PRODUCTS_DIR;
1301-
};
1302-
/* End PBXReferenceProxy section */
1303-
13041141
/* Begin PBXResourcesBuildPhase section */
13051142
88F05A6816011E5400B7AD1D /* Resources */ = {
13061143
isa = PBXResourcesBuildPhase;
@@ -1547,16 +1384,6 @@
15471384
target = 8DC2EF4F0486A6940098B216 /* ObjectiveGit */;
15481385
targetProxy = 88F05A9F16011F9000B7AD1D /* PBXContainerItemProxy */;
15491386
};
1550-
88F05AEE1601337D00B7AD1D /* PBXTargetDependency */ = {
1551-
isa = PBXTargetDependency;
1552-
name = Specta;
1553-
targetProxy = 88F05AED1601337D00B7AD1D /* PBXContainerItemProxy */;
1554-
};
1555-
88F05AF01601338400B7AD1D /* PBXTargetDependency */ = {
1556-
isa = PBXTargetDependency;
1557-
name = Expecta;
1558-
targetProxy = 88F05AEF1601338400B7AD1D /* PBXContainerItemProxy */;
1559-
};
15601387
D0A330F816027F4900A616FA /* PBXTargetDependency */ = {
15611388
isa = PBXTargetDependency;
15621389
target = D0A330ED16027F1E00A616FA /* libgit2 */;

‎ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata‎

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

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Note that the `bootstrap` script automatically installs some libraries that
2121
ObjectiveGit relies upon, using Homebrew. If you want this behavior, please
2222
make sure you have Homebrew installed.
2323

24+
To develop ObjectiveGit on its own, open the `ObjectiveGitFramework.xcworkspace` file.
25+
2426
## Importing ObjectiveGit on OS X
2527

2628
It is simple enough to add the ObjectiveGit framework to a desktop application

0 commit comments

Comments
 (0)