Skip to content

Commit 9cb184d

Browse files
muizidnmuizidn
committed
Change directory libgit2 to Clibgit2
Move Clibgit2 files to include to match SwiftPM rule. Update Xcodeproj searchpath Move SwiftGit2 *.swift files to Swift directory. SwiftPM doesn't support mixed source package.
1 parent c5cbf4c commit 9cb184d

18 files changed

+30
-22
lines changed

‎Clibgit2/include/git2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../External/libgit2/include/git2

‎Clibgit2/include/git2.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../External/libgit2/include/git2.h

‎libgit2/module.modulemap renamed to ‎Clibgit2/include/module.modulemap

File renamed without changes.

‎SwiftGit2.xcodeproj/project.pbxproj

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -303,18 +303,7 @@
303303
children = (
304304
BEB31F281A0D6F7A00F525B9 /* SwiftGit2.h */,
305305
BE14AA4F1A1974010015B439 /* SwiftGit2.m */,
306-
BE276B281ACCD3CF00D6DAD7 /* CheckoutStrategy.swift */,
307-
622726331C84E52500C53D17 /* Credentials.swift */,
308-
DA5914751A94579000AED74C /* Errors.swift */,
309-
BE36354B1A632C9700D37EC8 /* Libgit2.swift */,
310-
BE2E3BE51A31261300C67092 /* Objects.swift */,
311-
232861421F4A3A2E00276D65 /* Diffs.swift */,
312-
BE70B3E41A1ACB1A002C3F4E /* OID.swift */,
313-
BE7A753E1A4A2BCC002DA7E3 /* Pointers.swift */,
314-
BEB31F6C1A0D78F300F525B9 /* Repository.swift */,
315-
BECB5F691A56F19900999413 /* References.swift */,
316-
BECB5F6D1A57284700999413 /* Remotes.swift */,
317-
25499A996CA7BD416620A397 /* CommitIterator.swift */,
306+
EF1BA5D522E7C9BC001AB761 /* Swift */,
318307
);
319308
path = SwiftGit2;
320309
sourceTree = "<group>";
@@ -430,6 +419,25 @@
430419
name = Libraries;
431420
sourceTree = "<group>";
432421
};
422+
EF1BA5D522E7C9BC001AB761 /* Swift */ = {
423+
isa = PBXGroup;
424+
children = (
425+
BE276B281ACCD3CF00D6DAD7 /* CheckoutStrategy.swift */,
426+
622726331C84E52500C53D17 /* Credentials.swift */,
427+
DA5914751A94579000AED74C /* Errors.swift */,
428+
BE36354B1A632C9700D37EC8 /* Libgit2.swift */,
429+
BE2E3BE51A31261300C67092 /* Objects.swift */,
430+
232861421F4A3A2E00276D65 /* Diffs.swift */,
431+
BE70B3E41A1ACB1A002C3F4E /* OID.swift */,
432+
BE7A753E1A4A2BCC002DA7E3 /* Pointers.swift */,
433+
BEB31F6C1A0D78F300F525B9 /* Repository.swift */,
434+
BECB5F691A56F19900999413 /* References.swift */,
435+
BECB5F6D1A57284700999413 /* Remotes.swift */,
436+
25499A996CA7BD416620A397 /* CommitIterator.swift */,
437+
);
438+
path = Swift;
439+
sourceTree = "<group>";
440+
};
433441
/* End PBXGroup section */
434442

435443
/* Begin PBXHeadersBuildPhase section */
@@ -851,7 +859,7 @@
851859
baseConfigurationReference = BEB31F501A0D75EE00F525B9 /* iOS-Framework.xcconfig */;
852860
buildSettings = {
853861
HEADER_SEARCH_PATHS = (
854-
"$(SRCROOT)/External/libgit2/include",
862+
"$(SRCROOT)/Clibgit2/include",
855863
"$(inherited)",
856864
);
857865
INFOPLIST_FILE = SwiftGit2/Info.plist;
@@ -871,7 +879,7 @@
871879
);
872880
PRODUCT_BUNDLE_IDENTIFIER = org.libgit2.SwiftGit2;
873881
PRODUCT_NAME = SwiftGit2;
874-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
882+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Clibgit2/include";
875883
};
876884
name = Debug;
877885
};
@@ -880,7 +888,7 @@
880888
baseConfigurationReference = BEB31F501A0D75EE00F525B9 /* iOS-Framework.xcconfig */;
881889
buildSettings = {
882890
HEADER_SEARCH_PATHS = (
883-
"$(SRCROOT)/External/libgit2/include",
891+
"$(SRCROOT)/Clibgit2/include",
884892
"$(inherited)",
885893
);
886894
INFOPLIST_FILE = SwiftGit2/Info.plist;
@@ -900,7 +908,7 @@
900908
);
901909
PRODUCT_BUNDLE_IDENTIFIER = org.libgit2.SwiftGit2;
902910
PRODUCT_NAME = SwiftGit2;
903-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
911+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Clibgit2/include";
904912
};
905913
name = Release;
906914
};
@@ -1006,7 +1014,7 @@
10061014
baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */;
10071015
buildSettings = {
10081016
HEADER_SEARCH_PATHS = (
1009-
"$(SRCROOT)/External/libgit2/include",
1017+
"$(SRCROOT)/Clibgit2/include",
10101018
"$(inherited)",
10111019
);
10121020
INFOPLIST_FILE = SwiftGit2/Info.plist;
@@ -1025,7 +1033,7 @@
10251033
);
10261034
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
10271035
PRODUCT_NAME = SwiftGit2;
1028-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
1036+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Clibgit2/include";
10291037
};
10301038
name = Debug;
10311039
};
@@ -1034,7 +1042,7 @@
10341042
baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */;
10351043
buildSettings = {
10361044
HEADER_SEARCH_PATHS = (
1037-
"$(SRCROOT)/External/libgit2/include",
1045+
"$(SRCROOT)/Clibgit2/include",
10381046
"$(inherited)",
10391047
);
10401048
INFOPLIST_FILE = SwiftGit2/Info.plist;
@@ -1053,7 +1061,7 @@
10531061
);
10541062
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
10551063
PRODUCT_NAME = SwiftGit2;
1056-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
1064+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Clibgit2/include";
10571065
};
10581066
name = Release;
10591067
};

‎SwiftGit2/CheckoutStrategy.swift renamed to ‎SwiftGit2/Swift/CheckoutStrategy.swift

File renamed without changes.

‎SwiftGit2/CommitIterator.swift renamed to ‎SwiftGit2/Swift/CommitIterator.swift

File renamed without changes.

‎SwiftGit2/Credentials.swift renamed to ‎SwiftGit2/Swift/Credentials.swift

File renamed without changes.

‎SwiftGit2/Diffs.swift renamed to ‎SwiftGit2/Swift/Diffs.swift

File renamed without changes.

‎SwiftGit2/Errors.swift renamed to ‎SwiftGit2/Swift/Errors.swift

File renamed without changes.

‎SwiftGit2/Libgit2.swift renamed to ‎SwiftGit2/Swift/Libgit2.swift

File renamed without changes.

0 commit comments

Comments
 (0)