From d687fbb19463c129c326b5d692b36d448f9fa2cf Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Mon, 15 Jun 2015 15:34:22 -0700
Subject: [PATCH] refs #1650: beginnings of publish process without debug
 symbols

---
 Makefile               |  3 +++
 scripts/ios/package.sh | 13 ++++++++++---
 scripts/ios/publish.sh |  3 ++-
 scripts/ios/run.sh     |  4 +++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 748105102a6..b81915da132 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index e4bba0e9f68..649b676056a 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -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"; }
@@ -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 \
@@ -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 \
diff --git a/scripts/ios/publish.sh b/scripts/ios/publish.sh
index f65f3e56092..92756db2fad 100755
--- a/scripts/ios/publish.sh
+++ b/scripts/ios/publish.sh
@@ -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} *
 #
diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh
index dbf785081b5..25a708a7798 100755
--- a/scripts/ios/run.sh
+++ b/scripts/ios/run.sh
@@ -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" \