diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | scripts/ios/package.sh | 8 | ||||
| -rwxr-xr-x | scripts/ios/run.sh | 7 |
3 files changed, 16 insertions, 2 deletions
@@ -48,10 +48,11 @@ isim: ; $(RUN) HOST=ios Xcode/iosapp ibench: export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64" ibench: ; $(RUN) HOST=ios Xcode/ios-bench -.PHONY: ipackage ipackage-strip ipackage-sim itest +.PHONY: ipackage ipackage-strip ipackage-sim ipackage-no-bitcode itest ipackage: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh strip ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh sim +ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh no-bitcode itest: ipackage-sim ; ./scripts/ios/test.sh endif 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" \ |