summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-11-11 11:01:47 -0800
committerMinh Nguyễn <mxn@1ec5.org>2015-11-11 11:01:47 -0800
commit57574badb0bc8b6c019a84cb69ac224d7f70a1e7 (patch)
tree6c7878ac452125c9e9e185f294d098ae11058a47 /scripts
parente31c96d885f07fc70dbbc10322c1cdc9d678e992 (diff)
downloadqtlocation-mapboxgl-57574badb0bc8b6c019a84cb69ac224d7f70a1e7.tar.gz
Publish Bitcode-less build for Xcode 6.4
Publish a Release-configuration, symbol-laden, Bitcode-less build in tandem with the other builds. Fixes #2332.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ios/package.sh8
-rwxr-xr-xscripts/ios/run.sh7
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index 3c684612ff..1208700698 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -8,11 +8,17 @@ NAME=Mapbox
OUTPUT=build/ios/pkg
IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
LIBUV_VERSION=1.7.5
+ENABLE_BITCODE=YES
if [[ ${#} -eq 0 ]]; then # e.g. "make ipackage"
BUILDTYPE="Release"
BUILD_FOR_DEVICE=true
GCC_GENERATE_DEBUGGING_SYMBOLS="YES"
+elif [[ ${1} == "no-bitcode" ]]; then # e.g. "make ipackage-no-bitcode"
+ BUILDTYPE="Release"
+ BUILD_FOR_DEVICE=true
+ GCC_GENERATE_DEBUGGING_SYMBOLS="YES"
+ ENABLE_BITCODE=NO
elif [[ ${1} == "sim" ]]; then # e.g. "make ipackage-sim"
BUILDTYPE="Debug"
BUILD_FOR_DEVICE=false
@@ -53,7 +59,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
ARCHS="arm64 armv7 armv7s" \
ONLY_ACTIVE_ARCH=NO \
GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
- ENABLE_BITCODE=YES \
+ ENABLE_BITCODE=${ENABLE_BITCODE} \
DEPLOYMENT_POSTPROCESSING=YES \
-project ./build/ios-all/gyp/mbgl.xcodeproj \
-configuration ${BUILDTYPE} \
diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh
index c23b485e26..d74daec699 100755
--- a/scripts/ios/run.sh
+++ b/scripts/ios/run.sh
@@ -31,6 +31,13 @@ if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then
mapbox_time "deploy_ios_stripped"
./scripts/ios/publish.sh "${PUBLISH_VERSION}"
+
+ # debug symbols but no Bitcode
+ mapbox_time "package_ios_no_bitcode" \
+ make ipackage-no-bitcode
+
+ mapbox_time "deploy_ios_no_bitcode"
+ ./scripts/ios/publish.sh "${PUBLISH_VERSION}" no-bitcode
else
# build & test iOS
mapbox_time "run_ios_tests" \