Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
refs #1650: beginnings of publish process without debug symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
incanus committed Jun 15, 2015
1 parent a08bcb6 commit d687fbb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ isim: Xcode/ios
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

Expand Down
13 changes: 10 additions & 3 deletions scripts/ios/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ OUTPUT=build/ios/pkg
IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
LIBUV_VERSION=0.10.28

if [[ ${#} -eq 0 ]]; then
if [[ ${#} -eq 0 ]]; then # e.g. "make ipackage"
BUILD_FOR_DEVICE=true
else
GCC_GENERATE_DEBUGGING_SYMBOLS=true
else if [[ ${1} -eq "sim" ]]; then # e.g. "make ipackage-sim"
BUILD_FOR_DEVICE=false
GCC_GENERATE_DEBUGGING_SYMBOLS=true
else # e.g. "make ipackage-strip"
BUILD_FOR_DEVICE=true
GCC_GENERATE_DEBUGGING_SYMBOLS=false
fi

function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
Expand Down Expand Up @@ -43,7 +48,8 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
step "Building iOS device targets..."
xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
ARCHS="arm64 armv7 armv7s" \
ONLY_ACTIVE_ARCH=NO \
ONLY_ACTIVE_ARCH=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
GCC_GENERATE_DEBUGGING_SYMBOLS=NO \
-project ./build/ios/mbgl.xcodeproj \
-configuration ${BUILDTYPE} \
-target everything \
Expand All @@ -54,6 +60,7 @@ step "Building iOS Simulator targets..."
xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \
ARCHS="x86_64 i386" \
ONLY_ACTIVE_ARCH=NO \
GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
-project ./build/ios/mbgl.xcodeproj \
-configuration ${BUILDTYPE} \
-target everything \
Expand Down
3 changes: 2 additions & 1 deletion scripts/ios/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ set -u
# iOS release tag format is `ios-vX.Y.Z`; `X.Y.Z` gets passed in
#
PUBLISH_VERSION="$1"
PUBLISH_STYLE="$2"

#
# zip
#
cd build/ios/pkg/static
ZIP=mapbox-gl-ios-${PUBLISH_VERSION}.zip
ZIP=mapbox-gl-ios-${PUBLISH_VERSION}-${PUBLISH_STYLE}.zip
rm -f ../${ZIP}
zip -r ../${ZIP} *
#
Expand Down
4 changes: 3 additions & 1 deletion scripts/ios/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then
# build & package iOS
mapbox_time "package_ios" \
make ipackage
make ipackage-strip

# publish iOS build
mapbox_time "deploy_ios" \
./scripts/ios/publish.sh "${PUBLISH_VERSION}"
./scripts/ios/publish.sh "${PUBLISH_VERSION}" nosymbols
./scripts/ios/publish.sh "${PUBLISH_VERSION}" symbols
else
# build & test iOS
mapbox_time "run_ios_tests" \
Expand Down

0 comments on commit d687fbb

Please sign in to comment.