Skip to content

Fix the iOS build scripts for Xcode 6 building #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 28, 2014
Merged

Fix the iOS build scripts for Xcode 6 building #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f889faf
OpenSSL -> 1.0.1j
alanjrogers Oct 28, 2014
c32fe34
Skip installing man pages to avoid too many symlink errors.
alanjrogers Oct 28, 2014
af576d4
Compile EXTScope.
alanjrogers Oct 28, 2014
82fc85c
Link lib and libiconv.
alanjrogers Oct 28, 2014
1e02f02
Remove set -e because lol.
alanjrogers Oct 28, 2014
f8ff8a6
Don't try and link .a's in the External folder.
alanjrogers Oct 28, 2014
e9d2500
Don't copy this in resources.
alanjrogers Oct 28, 2014
1c83da1
Add git2 folder and git2.h to public headers.
alanjrogers Oct 28, 2014
af254df
Move libiconv and libz iOS references.
alanjrogers Oct 28, 2014
c989dae
Xcode seems to need this duplicate reference. :rage:
alanjrogers Oct 28, 2014
8274e20
Make sure libgit2 is in the header paths for iOS
jspahrsummers Oct 28, 2014
25421f7
Fix some warnings in specs
jspahrsummers Oct 28, 2014
3de6412
I have had it with these motherfucking deprecations in this motherfuc…
jspahrsummers Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion External/openssl
Open in desktop
Submodule openssl updated 378 files
55 changes: 40 additions & 15 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,17 @@
88328128173D8A64006D7DCF /* GTTreeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88328127173D8A64006D7DCF /* GTTreeSpec.m */; };
883CD6AB1600EBC600F57354 /* GTRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 883CD6A91600EBC600F57354 /* GTRemote.h */; settings = {ATTRIBUTES = (Public, ); }; };
883CD6AC1600EBC600F57354 /* GTRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 883CD6AA1600EBC600F57354 /* GTRemote.m */; };
884C8A3719FF4B4D0017E98D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 884C8A3619FF4B4D0017E98D /* libz.dylib */; };
884C8A3919FF4B6D0017E98D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 884C8A3819FF4B6D0017E98D /* libiconv.dylib */; };
884C8A3A19FF4B890017E98D /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = 306123AA17EA5261006591D4 /* EXTScope.m */; };
886E622A18AEBF75000611A0 /* GTFilterSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 886E622818AEBF75000611A0 /* GTFilterSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
886E622C18AEBF75000611A0 /* GTFilterSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 886E622918AEBF75000611A0 /* GTFilterSource.m */; };
886E623718AECD86000611A0 /* GTFilterSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 886E623618AECD86000611A0 /* GTFilterSpec.m */; };
8870390B1975E3F2004118D7 /* GTDiffDeltaSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8870390A1975E3F2004118D7 /* GTDiffDeltaSpec.m */; };
88746CC417FA1C950005888A /* GTRepository+Committing.h in Headers */ = {isa = PBXBuildFile; fileRef = 88746CC217FA1C950005888A /* GTRepository+Committing.h */; settings = {ATTRIBUTES = (Public, ); }; };
88746CC617FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; };
88948AC91779243600809CDA /* GTObjectDatabaseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */; };
889923FB19FF5DD40092A9A6 /* git2 in Headers */ = {isa = PBXBuildFile; fileRef = 889923F919FF5DD40092A9A6 /* git2 */; settings = {ATTRIBUTES = (Public, ); }; };
88A994BA16FCE7D400402C7B /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; };
88A994CB16FCED1D00402C7B /* QuickSpec+GTFixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */; };
88BC0E5018EF4F3600C7D0E6 /* GTRepository+Reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 88BC0E4E18EF4F3600C7D0E6 /* GTRepository+Reset.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -211,7 +215,6 @@
D01B6F0D19F82F2600D411BC /* GTRepositoryAttributesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E353051982EA6B0051001F /* GTRepositoryAttributesSpec.m */; };
D01B6F0E19F82F2B00D411BC /* QuickSpec+GTFixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */; };
D01B6F1219F82F3F00D411BC /* fixtures.zip in Resources */ = {isa = PBXBuildFile; fileRef = D09C2E50175602A500065E36 /* fixtures.zip */; };
D01B6F1319F82F5D00D411BC /* git2 in Resources */ = {isa = PBXBuildFile; fileRef = 79262F0E13C697BE00A4B1EA /* git2 */; };
D01B6F1419F82F6000D411BC /* git2.h in Headers */ = {isa = PBXBuildFile; fileRef = 79262F8A13C69B1600A4B1EA /* git2.h */; settings = {ATTRIBUTES = (Public, ); }; };
D01B6F1519F82F7B00D411BC /* NSData+Git.h in Headers */ = {isa = PBXBuildFile; fileRef = BD6C2266131459E700992935 /* NSData+Git.h */; settings = {ATTRIBUTES = (Public, ); }; };
D01B6F1619F82F7B00D411BC /* NSData+Git.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6C2267131459E700992935 /* NSData+Git.m */; };
Expand Down Expand Up @@ -485,6 +488,8 @@
883CD6A91600EBC600F57354 /* GTRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTRemote.h; sourceTree = "<group>"; };
883CD6AA1600EBC600F57354 /* GTRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemote.m; sourceTree = "<group>"; };
883CD6AE1600F01000F57354 /* GTConfiguration+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GTConfiguration+Private.h"; sourceTree = "<group>"; };
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; };
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; };
886E622818AEBF75000611A0 /* GTFilterSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTFilterSource.h; sourceTree = "<group>"; };
886E622918AEBF75000611A0 /* GTFilterSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTFilterSource.m; sourceTree = "<group>"; };
886E623618AECD86000611A0 /* GTFilterSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTFilterSpec.m; sourceTree = "<group>"; };
Expand All @@ -493,6 +498,7 @@
88746CC317FA1C950005888A /* GTRepository+Committing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Committing.m"; 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>"; };
88A994B916FCE7D400402C7B /* GTBranchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBranchSpec.m; sourceTree = "<group>"; };
88A994C916FCED1D00402C7B /* QuickSpec+GTFixtures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "QuickSpec+GTFixtures.h"; sourceTree = "<group>"; };
88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "QuickSpec+GTFixtures.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -621,6 +627,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
884C8A3919FF4B6D0017E98D /* libiconv.dylib in Frameworks */,
884C8A3719FF4B4D0017E98D /* libz.dylib in Frameworks */,
D05FC5E319FAD03C008C9348 /* libssl.a in Frameworks */,
D05FC5E219FAD039008C9348 /* libcrypto.a in Frameworks */,
D05FC5E419FAD040008C9348 /* libssh2-ios.a in Frameworks */,
Expand Down Expand Up @@ -675,13 +683,17 @@
306123A817EA5261006591D4 /* extobjc */,
4D103ADC1819CFAA0029DB24 /* libiconv.dylib */,
8803DA861313145700E6E818 /* libz.dylib */,
884C8A3619FF4B4D0017E98D /* libz.dylib */,
884C8A3819FF4B6D0017E98D /* libiconv.dylib */,
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
6A502B8617D6892D00BAF4A5 /* libssh2-ios.a */,
887DAFF615CB1C8000F30D0D /* Security.framework */,
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
D0A0128819F98475007F1914 /* Quick.framework */,
D0A0128B19F9853D007F1914 /* Nimble.framework */,
889923F919FF5DD40092A9A6 /* git2 */,
889923FA19FF5DD40092A9A6 /* git2.h */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
Expand Down Expand Up @@ -1054,7 +1066,6 @@
D01B6F3119F82F8700D411BC /* GTCommit.h in Headers */,
D01B6F2519F82F8700D411BC /* GTStatusDelta.h in Headers */,
D01B6F6519F82FA600D411BC /* GTRepository+Attributes.h in Headers */,
D01B6F1419F82F6000D411BC /* git2.h in Headers */,
D01B6F2919F82F8700D411BC /* GTRepository+Committing.h in Headers */,
D01B6F4F19F82FA600D411BC /* GTRepository+Blame.h in Headers */,
D01B6F1719F82F7B00D411BC /* NSError+Git.h in Headers */,
Expand Down Expand Up @@ -1084,6 +1095,8 @@
D01B6F3B19F82F8700D411BC /* GTTreeBuilder.h in Headers */,
D01B6F1B19F82F7B00D411BC /* NSDate+GTTimeAdditions.h in Headers */,
D01B6F6319F82FA600D411BC /* GTFilterList.h in Headers */,
889923FB19FF5DD40092A9A6 /* git2 in Headers */,
D01B6F1419F82F6000D411BC /* git2.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1136,7 +1149,6 @@
D01B6ECE19F82E2000D411BC /* Sources */,
D01B6ECF19F82E2000D411BC /* Frameworks */,
D01B6ED019F82E2000D411BC /* Headers */,
D01B6ED119F82E2000D411BC /* Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -1229,14 +1241,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D01B6ED119F82E2000D411BC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D01B6F1319F82F5D00D411BC /* git2 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D01B6EDB19F82E2000D411BC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1415,6 +1419,7 @@
D01B6F3219F82F8700D411BC /* GTCommit.m in Sources */,
D01B6F3819F82F8700D411BC /* GTTree.m in Sources */,
D01B6F6C19F82FB300D411BC /* GTDiff.m in Sources */,
884C8A3A19FF4B890017E98D /* EXTScope.m in Sources */,
D01B6F4E19F82F8700D411BC /* GTRemote.m in Sources */,
D01B6F3019F82F8700D411BC /* GTObject.m in Sources */,
D01B6F4619F82F8700D411BC /* GTBranch.m in Sources */,
Expand Down Expand Up @@ -1807,12 +1812,13 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"External/libssh2-ios/include/libssh2",
External/libgit2/include,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"External/ios-openssl/lib",
"External/libssh2-ios/lib",
"External/libgit2-ios",
);
OTHER_LDFLAGS = (
"-lgit2-ios",
Expand All @@ -1833,6 +1839,10 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"$(OBJROOT)/UninstalledProducts/include",
External/libgit2/include,
);
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1884,12 +1894,13 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"External/libssh2-ios/include/libssh2",
External/libgit2/include,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"External/ios-openssl/lib",
"External/libssh2-ios/lib",
"External/libgit2-ios",
);
OTHER_LDFLAGS = (
"-lgit2-ios",
Expand All @@ -1913,12 +1924,13 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"External/libssh2-ios/include/libssh2",
External/libgit2/include,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"External/ios-openssl/lib",
"External/libssh2-ios/lib",
"External/libgit2-ios",
);
OTHER_LDFLAGS = (
"-lgit2-ios",
Expand All @@ -1942,12 +1954,13 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"External/libssh2-ios/include/libssh2",
External/libgit2/include,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"External/ios-openssl/lib",
"External/libssh2-ios/lib",
"External/libgit2-ios",
);
OTHER_LDFLAGS = (
"-lgit2-ios",
Expand All @@ -1968,6 +1981,10 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"$(OBJROOT)/UninstalledProducts/include",
External/libgit2/include,
);
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1984,6 +2001,10 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"$(OBJROOT)/UninstalledProducts/include",
External/libgit2/include,
);
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1999,6 +2020,10 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"$(OBJROOT)/UninstalledProducts/include",
External/libgit2/include,
);
INFOPLIST_FILE = ObjectiveGitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
1 change: 0 additions & 1 deletion ObjectiveGitTests/GTObjectSpec.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
GTOdbObject *rawObj = [obj odbObjectWithError:&error];
XCTAssertNotNil(rawObj);
XCTAssertNil(error, @"%@", error.localizedDescription);
NSLog(@"rawObj len = %ld", [rawObj.data length]);
});

QuickSpecEnd
14 changes: 2 additions & 12 deletions ObjectiveGitTests/GTTimeAdditionsSpec.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
NSDate *date = [NSDate gt_dateFromGitTime:time];
expect(date).notTo(beNil());

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

expect(@(components.day)).to(equal(@5));
Expand All @@ -43,16 +43,6 @@
expect(timeZone).notTo(beNil());
expect(@(timeZone.gt_gitTimeOffset)).to(equal(@180));
});

it(@"should return a correct git_time for an NSDate", ^{
NSDate *date = [NSDate dateWithString:@"2010-05-12 18:29:13 +0000"];
expect(date).notTo(beNil());

NSTimeZone *twoHoursAheadOfGMT = [NSTimeZone timeZoneForSecondsFromGMT:120 * 60];
git_time time = [date gt_gitTimeUsingTimeZone:twoHoursAheadOfGMT];
expect(@(time.time)).to(equal(@1273688953));
expect(@(time.offset)).to(equal(@120));
});
});

afterEach(^{
Expand Down
4 changes: 2 additions & 2 deletions script/update_libgit2_ios
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source "${SCRIPT_DIR}/ios_build_functions.sh"

function setup ()
{
if [ "${ROOT_PATH}/External/libgit2-ios.a" -nt "${ROOT_PATH}/External/libgit2" ]
if [ "${ROOT_PATH}/External/libgit2-ios/libgit2-ios.a" -nt "${ROOT_PATH}/External/libgit2" ]
then
echo "No update needed."
exit 0
Expand Down Expand Up @@ -68,7 +68,7 @@ function fat_binary ()
{
echo "Building fat binary..."

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

echo "Building done."

Expand Down
4 changes: 1 addition & 3 deletions script/update_libssl_ios
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

set -e

# source the common build functions
SCRIPT_DIR=$(dirname "$0")
source "${SCRIPT_DIR}/ios_build_functions.sh"
Expand Down Expand Up @@ -49,7 +47,7 @@ function build_ssl ()
perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDKROOT} \$1|g" Makefile >> "${LOG}" 2>&1
make >> "${LOG}" 2>&1

make install >> "${LOG}" 2>&1
make install_sw >> "${LOG}" 2>&1
popd > /dev/null
rm -rf "/tmp/openssl"

Expand Down