Skip to content

Commit 0dadd24

Browse files
jspahrsummersjspahrsummers
committed
Merge pull request #416 from libgit2/fix-ios-buildscripts
Fix the iOS build scripts for Xcode 6 building
2 parents 34ee652 + 3de6412 commit 0dadd24

File tree

6 files changed

+46
-34
lines changed

6 files changed

+46
-34
lines changed

‎External/openssl‎

Submodule openssl updated 378 files

‎ObjectiveGitFramework.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,17 @@
116116
88328128173D8A64006D7DCF /* GTTreeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88328127173D8A64006D7DCF /* GTTreeSpec.m */; };
117117
883CD6AB1600EBC600F57354 /* GTRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 883CD6A91600EBC600F57354 /* GTRemote.h */; settings = {ATTRIBUTES = (Public, ); }; };
118118
883CD6AC1600EBC600F57354 /* GTRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 883CD6AA1600EBC600F57354 /* GTRemote.m */; };
119+
884C8A3719FF4B4D0017E98D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 884C8A3619FF4B4D0017E98D /* libz.dylib */; };
120+
884C8A3919FF4B6D0017E98D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 884C8A3819FF4B6D0017E98D /* libiconv.dylib */; };
121+
884C8A3A19FF4B890017E98D /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = 306123AA17EA5261006591D4 /* EXTScope.m */; };
119122
886E622A18AEBF75000611A0 /* GTFilterSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 886E622818AEBF75000611A0 /* GTFilterSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
120123
886E622C18AEBF75000611A0 /* GTFilterSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 886E622918AEBF75000611A0 /* GTFilterSource.m */; };
121124
886E623718AECD86000611A0 /* GTFilterSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 886E623618AECD86000611A0 /* GTFilterSpec.m */; };
122125
8870390B1975E3F2004118D7 /* GTDiffDeltaSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8870390A1975E3F2004118D7 /* GTDiffDeltaSpec.m */; };
123126
88746CC417FA1C950005888A /* GTRepository+Committing.h in Headers */ = {isa = PBXBuildFile; fileRef = 88746CC217FA1C950005888A /* GTRepository+Committing.h */; settings = {ATTRIBUTES = (Public, ); }; };
124127
88746CC617FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; };
125128
88948AC91779243600809CDA /* GTObjectDatabaseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */; };
129+
889923FB19FF5DD40092A9A6 /* git2 in Headers */ = {isa = PBXBuildFile; fileRef = 889923F919FF5DD40092A9A6 /* git2 */; settings = {ATTRIBUTES = (Public, ); }; };
126130
88A994BA16FCE7D400402C7B /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; };
127131
88A994CB16FCED1D00402C7B /* QuickSpec+GTFixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */; };
128132
88BC0E5018EF4F3600C7D0E6 /* GTRepository+Reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 88BC0E4E18EF4F3600C7D0E6 /* GTRepository+Reset.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -211,7 +215,6 @@
211215
D01B6F0D19F82F2600D411BC /* GTRepositoryAttributesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E353051982EA6B0051001F /* GTRepositoryAttributesSpec.m */; };
212216
D01B6F0E19F82F2B00D411BC /* QuickSpec+GTFixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */; };
213217
D01B6F1219F82F3F00D411BC /* fixtures.zip in Resources */ = {isa = PBXBuildFile; fileRef = D09C2E50175602A500065E36 /* fixtures.zip */; };
214-
D01B6F1319F82F5D00D411BC /* git2 in Resources */ = {isa = PBXBuildFile; fileRef = 79262F0E13C697BE00A4B1EA /* git2 */; };
215218
D01B6F1419F82F6000D411BC /* git2.h in Headers */ = {isa = PBXBuildFile; fileRef = 79262F8A13C69B1600A4B1EA /* git2.h */; settings = {ATTRIBUTES = (Public, ); }; };
216219
D01B6F1519F82F7B00D411BC /* NSData+Git.h in Headers */ = {isa = PBXBuildFile; fileRef = BD6C2266131459E700992935 /* NSData+Git.h */; settings = {ATTRIBUTES = (Public, ); }; };
217220
D01B6F1619F82F7B00D411BC /* NSData+Git.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6C2267131459E700992935 /* NSData+Git.m */; };
@@ -485,6 +488,8 @@
485488
883CD6A91600EBC600F57354 /* GTRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTRemote.h; sourceTree = "<group>"; };
486489
883CD6AA1600EBC600F57354 /* GTRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemote.m; sourceTree = "<group>"; };
487490
883CD6AE1600F01000F57354 /* GTConfiguration+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GTConfiguration+Private.h"; sourceTree = "<group>"; };
491+
884C8A3619FF4B4D0017E98D /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
492+
884C8A3819FF4B6D0017E98D /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/usr/lib/libiconv.dylib; sourceTree = DEVELOPER_DIR; };
488493
886E622818AEBF75000611A0 /* GTFilterSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTFilterSource.h; sourceTree = "<group>"; };
489494
886E622918AEBF75000611A0 /* GTFilterSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTFilterSource.m; sourceTree = "<group>"; };
490495
886E623618AECD86000611A0 /* GTFilterSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTFilterSpec.m; sourceTree = "<group>"; };
@@ -493,6 +498,7 @@
493498
88746CC317FA1C950005888A /* GTRepository+Committing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Committing.m"; sourceTree = "<group>"; };
494499
887DAFF615CB1C8000F30D0D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
495500
88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTObjectDatabaseSpec.m; sourceTree = "<group>"; };
501+
889923F919FF5DD40092A9A6 /* git2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = git2; path = External/libgit2/include/git2; sourceTree = "<group>"; };
496502
88A994B916FCE7D400402C7B /* GTBranchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBranchSpec.m; sourceTree = "<group>"; };
497503
88A994C916FCED1D00402C7B /* QuickSpec+GTFixtures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "QuickSpec+GTFixtures.h"; sourceTree = "<group>"; };
498504
88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "QuickSpec+GTFixtures.m"; sourceTree = "<group>"; };
@@ -621,6 +627,8 @@
621627
isa = PBXFrameworksBuildPhase;
622628
buildActionMask = 2147483647;
623629
files = (
630+
884C8A3919FF4B6D0017E98D /* libiconv.dylib in Frameworks */,
631+
884C8A3719FF4B4D0017E98D /* libz.dylib in Frameworks */,
624632
D05FC5E319FAD03C008C9348 /* libssl.a in Frameworks */,
625633
D05FC5E219FAD039008C9348 /* libcrypto.a in Frameworks */,
626634
D05FC5E419FAD040008C9348 /* libssh2-ios.a in Frameworks */,
@@ -675,13 +683,17 @@
675683
306123A817EA5261006591D4 /* extobjc */,
676684
4D103ADC1819CFAA0029DB24 /* libiconv.dylib */,
677685
8803DA861313145700E6E818 /* libz.dylib */,
686+
884C8A3619FF4B4D0017E98D /* libz.dylib */,
687+
884C8A3819FF4B6D0017E98D /* libiconv.dylib */,
678688
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
679689
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
680690
6A502B8617D6892D00BAF4A5 /* libssh2-ios.a */,
681691
887DAFF615CB1C8000F30D0D /* Security.framework */,
682692
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
683693
D0A0128819F98475007F1914 /* Quick.framework */,
684694
D0A0128B19F9853D007F1914 /* Nimble.framework */,
695+
889923F919FF5DD40092A9A6 /* git2 */,
696+
889923FA19FF5DD40092A9A6 /* git2.h */,
685697
);
686698
name = "External Frameworks and Libraries";
687699
sourceTree = "<group>";
@@ -1054,7 +1066,6 @@
10541066
D01B6F3119F82F8700D411BC /* GTCommit.h in Headers */,
10551067
D01B6F2519F82F8700D411BC /* GTStatusDelta.h in Headers */,
10561068
D01B6F6519F82FA600D411BC /* GTRepository+Attributes.h in Headers */,
1057-
D01B6F1419F82F6000D411BC /* git2.h in Headers */,
10581069
D01B6F2919F82F8700D411BC /* GTRepository+Committing.h in Headers */,
10591070
D01B6F4F19F82FA600D411BC /* GTRepository+Blame.h in Headers */,
10601071
D01B6F1719F82F7B00D411BC /* NSError+Git.h in Headers */,
@@ -1084,6 +1095,8 @@
10841095
D01B6F3B19F82F8700D411BC /* GTTreeBuilder.h in Headers */,
10851096
D01B6F1B19F82F7B00D411BC /* NSDate+GTTimeAdditions.h in Headers */,
10861097
D01B6F6319F82FA600D411BC /* GTFilterList.h in Headers */,
1098+
889923FB19FF5DD40092A9A6 /* git2 in Headers */,
1099+
D01B6F1419F82F6000D411BC /* git2.h in Headers */,
10871100
);
10881101
runOnlyForDeploymentPostprocessing = 0;
10891102
};
@@ -1136,7 +1149,6 @@
11361149
D01B6ECE19F82E2000D411BC /* Sources */,
11371150
D01B6ECF19F82E2000D411BC /* Frameworks */,
11381151
D01B6ED019F82E2000D411BC /* Headers */,
1139-
D01B6ED119F82E2000D411BC /* Resources */,
11401152
);
11411153
buildRules = (
11421154
);
@@ -1229,14 +1241,6 @@
12291241
);
12301242
runOnlyForDeploymentPostprocessing = 0;
12311243
};
1232-
D01B6ED119F82E2000D411BC /* Resources */ = {
1233-
isa = PBXResourcesBuildPhase;
1234-
buildActionMask = 2147483647;
1235-
files = (
1236-
D01B6F1319F82F5D00D411BC /* git2 in Resources */,
1237-
);
1238-
runOnlyForDeploymentPostprocessing = 0;
1239-
};
12401244
D01B6EDB19F82E2000D411BC /* Resources */ = {
12411245
isa = PBXResourcesBuildPhase;
12421246
buildActionMask = 2147483647;
@@ -1415,6 +1419,7 @@
14151419
D01B6F3219F82F8700D411BC /* GTCommit.m in Sources */,
14161420
D01B6F3819F82F8700D411BC /* GTTree.m in Sources */,
14171421
D01B6F6C19F82FB300D411BC /* GTDiff.m in Sources */,
1422+
884C8A3A19FF4B890017E98D /* EXTScope.m in Sources */,
14181423
D01B6F4E19F82F8700D411BC /* GTRemote.m in Sources */,
14191424
D01B6F3019F82F8700D411BC /* GTObject.m in Sources */,
14201425
D01B6F4619F82F8700D411BC /* GTBranch.m in Sources */,
@@ -1807,12 +1812,13 @@
18071812
HEADER_SEARCH_PATHS = (
18081813
"$(inherited)",
18091814
"External/libssh2-ios/include/libssh2",
1815+
External/libgit2/include,
18101816
);
18111817
INFOPLIST_FILE = Info.plist;
18121818
LIBRARY_SEARCH_PATHS = (
1813-
"$(inherited)",
18141819
"External/ios-openssl/lib",
18151820
"External/libssh2-ios/lib",
1821+
"External/libgit2-ios",
18161822
);
18171823
OTHER_LDFLAGS = (
18181824
"-lgit2-ios",
@@ -1833,6 +1839,10 @@
18331839
"$(SDKROOT)/Developer/Library/Frameworks",
18341840
"$(inherited)",
18351841
);
1842+
HEADER_SEARCH_PATHS = (
1843+
"$(OBJROOT)/UninstalledProducts/include",
1844+
External/libgit2/include,
1845+
);
18361846
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
18371847
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
18381848
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1884,12 +1894,13 @@
18841894
HEADER_SEARCH_PATHS = (
18851895
"$(inherited)",
18861896
"External/libssh2-ios/include/libssh2",
1897+
External/libgit2/include,
18871898
);
18881899
INFOPLIST_FILE = Info.plist;
18891900
LIBRARY_SEARCH_PATHS = (
1890-
"$(inherited)",
18911901
"External/ios-openssl/lib",
18921902
"External/libssh2-ios/lib",
1903+
"External/libgit2-ios",
18931904
);
18941905
OTHER_LDFLAGS = (
18951906
"-lgit2-ios",
@@ -1913,12 +1924,13 @@
19131924
HEADER_SEARCH_PATHS = (
19141925
"$(inherited)",
19151926
"External/libssh2-ios/include/libssh2",
1927+
External/libgit2/include,
19161928
);
19171929
INFOPLIST_FILE = Info.plist;
19181930
LIBRARY_SEARCH_PATHS = (
1919-
"$(inherited)",
19201931
"External/ios-openssl/lib",
19211932
"External/libssh2-ios/lib",
1933+
"External/libgit2-ios",
19221934
);
19231935
OTHER_LDFLAGS = (
19241936
"-lgit2-ios",
@@ -1942,12 +1954,13 @@
19421954
HEADER_SEARCH_PATHS = (
19431955
"$(inherited)",
19441956
"External/libssh2-ios/include/libssh2",
1957+
External/libgit2/include,
19451958
);
19461959
INFOPLIST_FILE = Info.plist;
19471960
LIBRARY_SEARCH_PATHS = (
1948-
"$(inherited)",
19491961
"External/ios-openssl/lib",
19501962
"External/libssh2-ios/lib",
1963+
"External/libgit2-ios",
19511964
);
19521965
OTHER_LDFLAGS = (
19531966
"-lgit2-ios",
@@ -1968,6 +1981,10 @@
19681981
"$(SDKROOT)/Developer/Library/Frameworks",
19691982
"$(inherited)",
19701983
);
1984+
HEADER_SEARCH_PATHS = (
1985+
"$(OBJROOT)/UninstalledProducts/include",
1986+
External/libgit2/include,
1987+
);
19711988
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
19721989
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
19731990
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1984,6 +2001,10 @@
19842001
"$(SDKROOT)/Developer/Library/Frameworks",
19852002
"$(inherited)",
19862003
);
2004+
HEADER_SEARCH_PATHS = (
2005+
"$(OBJROOT)/UninstalledProducts/include",
2006+
External/libgit2/include,
2007+
);
19872008
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
19882009
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
19892010
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1999,6 +2020,10 @@
19992020
"$(SDKROOT)/Developer/Library/Frameworks",
20002021
"$(inherited)",
20012022
);
2023+
HEADER_SEARCH_PATHS = (
2024+
"$(OBJROOT)/UninstalledProducts/include",
2025+
External/libgit2/include,
2026+
);
20022027
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
20032028
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
20042029
PRODUCT_NAME = "$(TARGET_NAME)";

‎ObjectiveGitTests/GTObjectSpec.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
GTOdbObject *rawObj = [obj odbObjectWithError:&error];
8888
XCTAssertNotNil(rawObj);
8989
XCTAssertNil(error, @"%@", error.localizedDescription);
90-
NSLog(@"rawObj len = %ld", [rawObj.data length]);
9190
});
9291

9392
QuickSpecEnd

‎ObjectiveGitTests/GTTimeAdditionsSpec.m‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
NSDate *date = [NSDate gt_dateFromGitTime:time];
2323
expect(date).notTo(beNil());
2424

25-
NSCalendar *gregorianCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
25+
NSCalendar *gregorianCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
2626
gregorianCalendar.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
27-
NSDateComponents *components = [gregorianCalendar components:NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit | NSHourCalendarUnit fromDate:date];
27+
NSDateComponents *components = [gregorianCalendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitHour fromDate:date];
2828
expect(components).notTo(beNil());
2929

3030
expect(@(components.day)).to(equal(@5));
@@ -43,16 +43,6 @@
4343
expect(timeZone).notTo(beNil());
4444
expect(@(timeZone.gt_gitTimeOffset)).to(equal(@180));
4545
});
46-
47-
it(@"should return a correct git_time for an NSDate", ^{
48-
NSDate *date = [NSDate dateWithString:@"2010-05-12 18:29:13 +0000"];
49-
expect(date).notTo(beNil());
50-
51-
NSTimeZone *twoHoursAheadOfGMT = [NSTimeZone timeZoneForSecondsFromGMT:120 * 60];
52-
git_time time = [date gt_gitTimeUsingTimeZone:twoHoursAheadOfGMT];
53-
expect(@(time.time)).to(equal(@1273688953));
54-
expect(@(time.offset)).to(equal(@120));
55-
});
5646
});
5747

5848
afterEach(^{

‎script/update_libgit2_ios‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source "${SCRIPT_DIR}/ios_build_functions.sh"
88

99
function setup ()
1010
{
11-
if [ "${ROOT_PATH}/External/libgit2-ios.a" -nt "${ROOT_PATH}/External/libgit2" ]
11+
if [ "${ROOT_PATH}/External/libgit2-ios/libgit2-ios.a" -nt "${ROOT_PATH}/External/libgit2" ]
1212
then
1313
echo "No update needed."
1414
exit 0
@@ -68,7 +68,7 @@ function fat_binary ()
6868
{
6969
echo "Building fat binary..."
7070

71-
lipo -create "${BUILT_LIB_PATHS[@]}" -output "${ROOT_PATH}/External/libgit2-ios.a"
71+
lipo -create "${BUILT_LIB_PATHS[@]}" -output "${ROOT_PATH}/External/libgit2-ios/libgit2-ios.a"
7272

7373
echo "Building done."
7474

‎script/update_libssl_ios‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
set -e
4-
53
# source the common build functions
64
SCRIPT_DIR=$(dirname "$0")
75
source "${SCRIPT_DIR}/ios_build_functions.sh"
@@ -49,7 +47,7 @@ function build_ssl ()
4947
perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDKROOT} \$1|g" Makefile >> "${LOG}" 2>&1
5048
make >> "${LOG}" 2>&1
5149

52-
make install >> "${LOG}" 2>&1
50+
make install_sw >> "${LOG}" 2>&1
5351
popd > /dev/null
5452
rm -rf "/tmp/openssl"
5553

0 commit comments

Comments
 (0)