[macos] Deploy macosapp as part of releases

Added steps to the packaging script to archive and export macosapp. Upload the exported, compressed application bundle to the GitHub release when deploying a release.

3 files changed, 50 insertions, 2 deletions

diff --git a/platform/macos/ExportOptions.plist b/platform/macos/ExportOptions.plist
new file mode 100644
index 0000000000..21af10c08a
--- /dev/null
+++ b/platform/macos/ExportOptions.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>method</key>
+	<string>developer-id</string>
+	<key>teamID</key>
+	<string>GJZR2MEM28</string>
+</dict>
+</plist>
diff --git a/platform/macos/scripts/deploy-packages.sh b/platform/macos/scripts/deploy-packages.sh
index d9d74b2867..c4207ba421 100755
--- a/platform/macos/scripts/deploy-packages.sh
+++ b/platform/macos/scripts/deploy-packages.sh
@@ -46,6 +46,19 @@ buildPackageStyle() {
             --name ${file_name} \
             --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null
     fi
+    if [[ $2 == true ]]; then
+        cd build/macos/app
+        rm -f 'Mapbox GL.app.zip'
+        zip -yr '../deploy/Mapbox GL.app.zip' 'Mapbox GL.app'
+        cd -
+        if [[ "${GITHUB_RELEASE}" == true ]]; then
+            echo "Uploading ${file_name} to GitHub"
+            github-release upload \
+                --tag "macos-v${PUBLISH_VERSION}" \
+                --name ${file_name} \
+                --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null
+        fi
+    fi
 }
 
 export TRAVIS_REPO_SLUG=mapbox-gl-native
@@ -114,6 +127,6 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then
 fi
 
 buildPackageStyle "xpackage" "symbols"
-buildPackageStyle "xpackage SYMBOLS=NO"
+buildPackageStyle "xpackage SYMBOLS=NO" true
 
 step "Finished deploying ${PUBLISH_VERSION} in $(($SECONDS / 60)) minutes and $(($SECONDS % 60)) seconds"
diff --git a/platform/macos/scripts/package.sh b/platform/macos/scripts/package.sh
index 6ae0cc65cc..5af046c565 100755
--- a/platform/macos/scripts/package.sh
+++ b/platform/macos/scripts/package.sh
@@ -6,6 +6,7 @@ set -u
 
 NAME=Mapbox
 OUTPUT=build/macos/pkg
+APP_OUTPUT=build/macos/app
 DERIVED_DATA=build/macos
 PRODUCTS=${DERIVED_DATA}
 
@@ -16,7 +17,7 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
 trap finish EXIT
 
-rm -rf ${OUTPUT}
+rm -rf ${OUTPUT} ${APP_OUTPUT}
 
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
 PROJ_VERSION=$(git rev-list --count HEAD)
@@ -91,3 +92,27 @@ make xdocument OUTPUT="${OUTPUT}/documentation"
 
 step "Checking that all public symbols are exported…"
 node platform/darwin/scripts/check-public-symbols.js macOS
+
+if [[ ${BUILDTYPE} == Release ]]; then
+    step "Building Mapbox GL.app (build ${PROJ_VERSION}, version ${SEM_VERSION})…"
+    mkdir -p ${APP_OUTPUT}
+    xcodebuild \
+        CURRENT_PROJECT_VERSION=${PROJ_VERSION} \
+        CURRENT_SHORT_VERSION=${SHORT_VERSION} \
+        CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \
+        CURRENT_COMMIT_HASH=${HASH} \
+        -derivedDataPath ${DERIVED_DATA} \
+        -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \
+        -workspace ./platform/macos/macos.xcworkspace \
+        -scheme macosapp \
+        -configuration Release \
+        -jobs ${JOBS} \
+        archive | xcpretty
+    
+    step "Exporting Mapbox GL.app"
+    xcodebuild \
+        -exportArchive \
+        -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \
+        -exportPath "${APP_OUTPUT}" \
+        -exportOptionsPlist platform/macos/ExportOptions.plist
+fi