[ios] Updated scripts and podspecs

5 files changed, 26 insertions, 10 deletions

diff --git a/platform/ios/Mapbox-iOS-SDK-symbols.podspec b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
index 75e0f3ffee..6dacd98e21 100644
--- a/platform/ios/Mapbox-iOS-SDK-symbols.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
@@ -1,8 +1,8 @@
 Pod::Spec.new do |m|
 
-  version = '4.5.0'
+  version = '4.5.0-cn.1'
 
-  m.name    = 'Mapbox-iOS-SDK-symbols'
+  m.name    = 'Mapbox-iOS-SDK-symbols-cn'
   m.version = "#{version}-symbols"
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
index fd7dca1d2e..5ff7800ad5 100644
--- a/platform/ios/Mapbox-iOS-SDK.podspec
+++ b/platform/ios/Mapbox-iOS-SDK.podspec
@@ -1,8 +1,8 @@
 Pod::Spec.new do |m|
 
-  version = '4.5.0'
+  version = '4.5.0-cn.1'
 
-  m.name    = 'Mapbox-iOS-SDK'
+  m.name    = 'Mapbox-iOS-SDK-cn'
   m.version = version
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
diff --git a/platform/ios/Release-CN.md b/platform/ios/Release-CN.md
new file mode 100644
index 0000000000..1907b39a19
--- /dev/null
+++ b/platform/ios/Release-CN.md
@@ -0,0 +1,14 @@
+### Release `ios8-release-gazpacho`
+
+This branch is intended to exist as a branch off of of the main Maps SDK. There are no plans to bring this branch back into `master`. If this branch is updated to incorporate new release branches in the future, please update the branch name.
+
+Before running this script, please check that you are authorized to upload to S3 in China. 
+
+1. Update the `IOS_SDK_VERSION` value in the `platform/ios/scripts/package.sh` file. Versioning will follow: `vX.X.X-cn.X` in order to keep this distinct from the main Maps SDK.
+
+2. Update the SDK version in the podspec files.
+
+3. Run `platform/ios/scripts/publish-cn.sh`. This:
+  - Builds `Mapbox.framework` and a companion dSYM file.
+  - Generates documentation.
+  - Uploads a .zip file containing the framework and documentation to S3 China.
\ No newline at end of file
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 2506540910..eba7e86722 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
+set -eu
 set -o pipefail
-set -u
 
 NAME=Mapbox
 OUTPUT=build/ios/pkg
@@ -29,7 +28,7 @@ SDK=iphonesimulator
 if [[ ${BUILD_FOR_DEVICE} == true ]]; then
     SDK=iphoneos
 fi
-IOS_SDK_VERSION=`xcrun --sdk ${SDK} --show-sdk-version`
+IOS_SDK_VERSION='v4.5.0-cn.1'
 
 function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
diff --git a/platform/ios/scripts/publish-cn.sh b/platform/ios/scripts/publish-cn.sh
index 3714f4429c..2d2982459c 100755
--- a/platform/ios/scripts/publish-cn.sh
+++ b/platform/ios/scripts/publish-cn.sh
@@ -8,10 +8,13 @@ set -u
 function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
 trap finish EXIT
+
 #
 # make the framework
 #
-
+  
+step "Make the framework"
+export BUILDTYPE=Release
 ./platform/ios/scripts/package.sh
 echo "making package"
 wait
@@ -46,5 +49,5 @@ step "Uploading ${ZIP} to s3…"
 
 # Since this build is primarily for .CN customers, it will be hosted on .cn. 
 
-# aws s3 cp ../${ZIP} s3://binary.mapbox.cn/ios/builds/maps-sdk/ --acl public-read ${PROGRESS}
-echo "URL: s3://binary.mapbox.cn/ios/builds/maps-sdk/${ZIP}"
+aws s3 cp ../${ZIP} s3://binary.mapbox.cn/ios/builds/maps-sdk/ --acl public-read ${PROGRESS}
+echo "URL:  https://s3.cn-north-1.amazonaws.com.cn/binary.mapbox.cn/${ZIP}"