Skip to content

Commit c5ff513

Browse files
tiennoutiennou
authored
Merge pull request #713 from tiennou/build-it
Build it
2 parents 120623d + 491330c commit c5ff513

File tree

17 files changed

+651
-164
lines changed

17 files changed

+651
-164
lines changed

Diff for: ‎.gitignore

+1-17
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,17 @@
22
*.swp
33
*~.nib
44

5-
build/*
6-
.build/*
7-
build-iPhoneSimulator/*
8-
build-iPhoneOS/*
9-
objective-git.bridgesupport
10-
ObjectiveGitFramework/build/*
11-
ObjectiveGit-iOS.framework/*
12-
External/libgit2*.a
13-
External/libgit2-ios
14-
155
*.pbxuser
166
*.perspective
177
*.perspectivev3
188

199
*.mode1v3
2010
*.mode2v3
2111

22-
project.xcworkspace
2312
*/xcuserdata/
2413
*.xccheckout
2514
*.xcscmblueprint
2615

27-
ObjectiveGitTests/fixtures/Fixtures/*
28-
29-
External/ios-openssl/include
30-
External/ios-openssl/lib
31-
External/libssh2-ios
32-
16+
External/libgit2-mac.a
3317
Carthage/Build
3418

Diff for: ‎.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@
77
#
88
---
99
os: osx
10-
osx_image: xcode9.3
10+
osx_image: xcode12.2
1111
language: objective-c
1212

1313
matrix:
1414
fast_finish: true
1515
include:
16-
- osx_image: xcode9.3
17-
env:
16+
- env:
1817
- SCHEME="ObjectiveGit Mac"
19-
- osx_image: xcode9.3
20-
env:
18+
- env:
2119
- SCHEME="ObjectiveGit iOS"
2220

2321
before_install:

Diff for: ‎Cartfile.private

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "jspahrsummers/xcconfigs" "master"
2-
github "Quick/Quick" ~> 1.3.4
3-
github "Quick/Nimble" ~> 7.3.3
4-
github "ZipArchive/ZipArchive" ~> 2.1.4
2+
github "Quick/Quick" ~> 2.1.0
3+
github "Quick/Nimble" ~> 8.0.1
4+
github "ZipArchive/ZipArchive" ~> 2.2.3

Diff for: ‎Cartfile.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v7.3.3"
2-
github "Quick/Quick" "v1.3.4"
3-
github "ZipArchive/ZipArchive" "v2.1.4"
4-
github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
1+
github "Quick/Nimble" "v8.1.2"
2+
github "Quick/Quick" "v2.2.1"
3+
github "ZipArchive/ZipArchive" "v2.2.3"
4+
github "jspahrsummers/xcconfigs" "4ced0ad5a971220917994a4edfa6abf9702e3818"

Diff for: ‎Carthage/Checkouts/Nimble

Submodule Nimble updated 128 files

Diff for: ‎Carthage/Checkouts/Quick

Submodule Quick updated 96 files

Diff for: ‎Carthage/Checkouts/ZipArchive

Submodule ZipArchive updated 159 files

Diff for: ‎Carthage/Checkouts/xcconfigs

Diff for: ‎ObjectiveGitFramework.xcodeproj/project.pbxproj

+591-89
Large diffs are not rendered by default.

Diff for: ‎ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Diff for: ‎ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme

+9-13
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@
8383
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8484
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8585
shouldUseLaunchSchemeArgsEnv = "YES">
86+
<MacroExpansion>
87+
<BuildableReference
88+
BuildableIdentifier = "primary"
89+
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
90+
BuildableName = "ObjectiveGit.framework"
91+
BlueprintName = "ObjectiveGit-Mac"
92+
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
93+
</BuildableReference>
94+
</MacroExpansion>
8695
<Testables>
8796
<TestableReference
8897
skipped = "NO">
@@ -95,17 +104,6 @@
95104
</BuildableReference>
96105
</TestableReference>
97106
</Testables>
98-
<MacroExpansion>
99-
<BuildableReference
100-
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
102-
BuildableName = "ObjectiveGit.framework"
103-
BlueprintName = "ObjectiveGit-Mac"
104-
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
105-
</BuildableReference>
106-
</MacroExpansion>
107-
<AdditionalOptions>
108-
</AdditionalOptions>
109107
</TestAction>
110108
<LaunchAction
111109
buildConfiguration = "Debug"
@@ -127,8 +125,6 @@
127125
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
128126
</BuildableReference>
129127
</MacroExpansion>
130-
<AdditionalOptions>
131-
</AdditionalOptions>
132128
</LaunchAction>
133129
<ProfileAction
134130
buildConfiguration = "Profile"

Diff for: ‎ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme

+9-13
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@
6969
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7070
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7171
shouldUseLaunchSchemeArgsEnv = "YES">
72+
<MacroExpansion>
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
76+
BuildableName = "ObjectiveGit.framework"
77+
BlueprintName = "ObjectiveGit-iOS"
78+
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
79+
</BuildableReference>
80+
</MacroExpansion>
7281
<Testables>
7382
<TestableReference
7483
skipped = "NO">
@@ -81,17 +90,6 @@
8190
</BuildableReference>
8291
</TestableReference>
8392
</Testables>
84-
<MacroExpansion>
85-
<BuildableReference
86-
BuildableIdentifier = "primary"
87-
BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
88-
BuildableName = "ObjectiveGit.framework"
89-
BlueprintName = "ObjectiveGit-iOS"
90-
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
91-
</BuildableReference>
92-
</MacroExpansion>
93-
<AdditionalOptions>
94-
</AdditionalOptions>
9593
</TestAction>
9694
<LaunchAction
9795
buildConfiguration = "Debug"
@@ -112,8 +110,6 @@
112110
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
113111
</BuildableReference>
114112
</MacroExpansion>
115-
<AdditionalOptions>
116-
</AdditionalOptions>
117113
</LaunchAction>
118114
<ProfileAction
119115
buildConfiguration = "Profile"

Diff for: ‎ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata

-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

Diff for: ‎script/cibuild

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
5959
-scheme "$SCHEME" \
6060
${XCODE_OPTIONS[*]} \
6161
build test \
62-
2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
62+
2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
6363
elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
6464
echo "*** Prebuilding OpenSSL"
6565
"$SCRIPT_DIR/update_libssl_ios"
@@ -69,9 +69,9 @@ elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
6969

7070
xcodebuild -workspace "$XCWORKSPACE" \
7171
-scheme "$SCHEME" \
72-
-destination "platform=iOS Simulator,name=iPhone 5" \
72+
-destination "platform=iOS Simulator,name=iPhone 11" \
7373
-sdk iphonesimulator \
7474
${XCODE_OPTIONS[*]} \
7575
build test \
76-
2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
76+
2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
7777
fi

Diff for: ‎script/update_libgit2

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77
# ~/.MacOSX/environment.plist
88
PATH="/usr/local/bin:$PATH"
99

10-
if [ "External/libgit2.a" -nt "External/libgit2" ]
10+
if [ "External/libgit2-mac.a" -nt "External/libgit2" ]
1111
then
1212
echo "No update needed."
1313
exit 0
@@ -33,9 +33,9 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
3333
cmake --build .
3434

3535
product="libgit2.a"
36-
install_path="../../${product}"
37-
if [ "${product}" -nt "${install_path}" ]; then
38-
cp -v "${product}" "${install_path}"
36+
install_path="../../"
37+
if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then
38+
cp -v "libgit2.a" "${install_path}/libgit2-mac.a"
3939
fi
4040

4141
echo "libgit2 has been updated."

0 commit comments

Comments
 (0)