Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
a8b8c037
Commit
a8b8c037
authored
Jun 06, 2019
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Xcode 11 support to the script.
parent
1c8a7a10
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
5 deletions
+31
-5
full_mac_build.sh
objectivec/DevTools/full_mac_build.sh
+31
-5
No files found.
objectivec/DevTools/full_mac_build.sh
View file @
a8b8c037
...
@@ -41,7 +41,7 @@ OPTIONS:
...
@@ -41,7 +41,7 @@ OPTIONS:
Skip the Xcode Debug configuration.
Skip the Xcode Debug configuration.
--skip-xcode-release
--skip-xcode-release
Skip the Xcode Release configuration.
Skip the Xcode Release configuration.
--skip-xcode-osx
--skip-xcode-osx
| --skip-xcode-macos
Skip the invoke of Xcode to test the runtime on OS X.
Skip the invoke of Xcode to test the runtime on OS X.
--skip-xcode-tvos
--skip-xcode-tvos
Skip the invoke of Xcode to test the runtime on tvOS.
Skip the invoke of Xcode to test the runtime on tvOS.
...
@@ -119,7 +119,7 @@ while [[ $# != 0 ]]; do
...
@@ -119,7 +119,7 @@ while [[ $# != 0 ]]; do
--skip-xcode-ios
)
--skip-xcode-ios
)
DO_XCODE_IOS_TESTS
=
no
DO_XCODE_IOS_TESTS
=
no
;;
;;
--skip-xcode-osx
)
--skip-xcode-osx
|
--skip-xcode-macos
)
DO_XCODE_OSX_TESTS
=
no
DO_XCODE_OSX_TESTS
=
no
;;
;;
--skip-xcode-tvos
)
--skip-xcode-tvos
)
...
@@ -280,7 +280,16 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
...
@@ -280,7 +280,16 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing
-disable-concurrent-testing
)
)
;;
;;
10.[0-1]
*
)
10.
*
)
XCODEBUILD_TEST_BASE_IOS+
=(
-destination
"platform=iOS Simulator,name=iPhone 4s,OS=8.1"
# 32bit
-destination
"platform=iOS Simulator,name=iPhone 7,OS=latest"
# 64bit
# 10.x also seems to often fail running destinations in parallel (with
# 32bit one include atleast)
-disable-concurrent-destination-testing
)
;;
11.0
*
)
XCODEBUILD_TEST_BASE_IOS+
=(
XCODEBUILD_TEST_BASE_IOS+
=(
-destination
"platform=iOS Simulator,name=iPhone 4s,OS=8.1"
# 32bit
-destination
"platform=iOS Simulator,name=iPhone 4s,OS=8.1"
# 32bit
-destination
"platform=iOS Simulator,name=iPhone 7,OS=latest"
# 64bit
-destination
"platform=iOS Simulator,name=iPhone 7,OS=latest"
# 64bit
...
@@ -340,10 +349,27 @@ if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
...
@@ -340,10 +349,27 @@ if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
xcodebuild
xcodebuild
-project
objectivec/ProtocolBuffers_tvOS.xcodeproj
-project
objectivec/ProtocolBuffers_tvOS.xcodeproj
-scheme
ProtocolBuffers
-scheme
ProtocolBuffers
)
case
"
${
XCODE_VERSION
}
"
in
[
6-9].
*
)
echo
"ERROR: Xcode 10.0 or higher is required to build the test suite."
1>&2
exit
11
;;
10.
*
|
11.
*
)
XCODEBUILD_TEST_BASE_TVOS+
=(
# Test on the oldest and current.
# Test on the oldest and current.
-destination
"platform=tvOS Simulator,name=Apple TV 1080p,OS=9
.0"
-destination
"platform=tvOS Simulator,name=Apple TV,OS=11
.0"
-destination
"platform=tvOS Simulator,name=Apple TV
,OS=latest"
-destination
"platform=tvOS Simulator,name=Apple TV 4K
,OS=latest"
)
)
;;
*
)
echo
""
echo
"ATTENTION: Time to update the simulator targets for Xcode
${
XCODE_VERSION
}
"
echo
""
echo
"ERROR: Build aborted!"
exit
2
;;
esac
if
[[
"
${
XCODE_QUIET
}
"
==
"yes"
]]
;
then
if
[[
"
${
XCODE_QUIET
}
"
==
"yes"
]]
;
then
XCODEBUILD_TEST_BASE_TVOS+
=(
-quiet
)
XCODEBUILD_TEST_BASE_TVOS+
=(
-quiet
)
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment