From ca12a7b79a80a312246d31fb483ca2eb6e6f3210 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Latour <pol@mac.com>
Date: Sun, 1 Jan 2017 22:06:03 +0900
Subject: [PATCH] Updated build script

[ci skip]
---
 .gitignore                 |  1 +
 GitUp/Export-Options.plist |  8 +++++
 continuous-build.sh        | 51 +++++++++++++++++++++++++++++++
 jenkins-build.sh           | 62 --------------------------------------
 4 files changed, 60 insertions(+), 62 deletions(-)
 create mode 100644 GitUp/Export-Options.plist
 create mode 100755 continuous-build.sh
 delete mode 100755 jenkins-build.sh

diff --git a/.gitignore b/.gitignore
index 35cfb4d3..ffc1191d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 xcuserdata
 project.xcworkspace
+build
diff --git a/GitUp/Export-Options.plist b/GitUp/Export-Options.plist
new file mode 100644
index 00000000..055f67c2
--- /dev/null
+++ b/GitUp/Export-Options.plist
@@ -0,0 +1,8 @@
+<?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>
+</dict>
+</plist>
diff --git a/continuous-build.sh b/continuous-build.sh
new file mode 100755
index 00000000..9d2e0e5c
--- /dev/null
+++ b/continuous-build.sh
@@ -0,0 +1,51 @@
+#!/bin/sh -ex
+
+CHANNEL="continuous"
+
+PRODUCT_NAME="GitUp"
+APPCAST_NAME="appcast.xml"
+
+MAX_VERSION=`git tag -l "b*" | sed 's/b//g' | sort -nr | head -n 1`
+VERSION=$((MAX_VERSION + 1))
+
+##### Archive and export app
+
+rm -rf "build"
+pushd "GitUp"
+xcodebuild archive -scheme "Application" -archivePath "../build/$PRODUCT_NAME.xcarchive" "BUNDLE_VERSION=$VERSION"
+xcodebuild -exportArchive -exportOptionsPlist "Export-Options.plist" -archivePath "../build/$PRODUCT_NAME.xcarchive" -exportPath "../build/$PRODUCT_NAME"
+popd
+
+##### Tag build
+
+git tag -f "b$VERSION"
+git push -f origin "b$VERSION"
+
+##### Upload to S3 and update Appcast
+
+FULL_PRODUCT_NAME="$PRODUCT_NAME.app"
+PRODUCT_PATH="`pwd`/build/$PRODUCT_NAME/$FULL_PRODUCT_NAME"  # Must be absolute path
+INFO_PLIST_PATH="$PRODUCT_PATH/Contents/Info.plist"
+VERSION_ID=`defaults read "$INFO_PLIST_PATH" "CFBundleVersion"`
+VERSION_STRING=`defaults read "$INFO_PLIST_PATH" "CFBundleShortVersionString"`
+MIN_OS=`defaults read "$INFO_PLIST_PATH" "LSMinimumSystemVersion"`
+
+ARCHIVE_NAME="$PRODUCT_NAME.zip"
+BACKUP_ARCHIVE_NAME="$PRODUCT_NAME-$VERSION_ID.zip"
+APPCAST_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$APPCAST_NAME"
+ARCHIVE_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$ARCHIVE_NAME"
+BACKUP_ARCHIVE_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME"
+
+ARCHIVE_PATH="build/$ARCHIVE_NAME"
+APPCAST_PATH="GitUp/SparkleAppcast.xml"
+
+ditto -c -k --keepParent "$PRODUCT_PATH" "$ARCHIVE_PATH"
+
+ARCHIVE_SIZE=`stat -f "%z" "$ARCHIVE_PATH"`
+
+EDITED_APPCAST_PATH="build/appcast.xml"
+perl -p -e "s|__APPCAST_TITLE__|$PRODUCT_NAME|g;s|__APPCAST_URL__|$APPCAST_URL|g;s|__VERSION_ID__|$VERSION_ID|g;s|__VERSION_STRING__|$VERSION_STRING|g;s|__ARCHIVE_URL__|$ARCHIVE_URL|g;s|__ARCHIVE_SIZE__|$ARCHIVE_SIZE|g;s|__MIN_OS__|$MIN_OS|g" "$APPCAST_PATH" > "$EDITED_APPCAST_PATH"
+
+aws s3 cp "$ARCHIVE_PATH" "s3://gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME"
+aws s3 cp "s3://gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME" "s3://gitup-builds/$CHANNEL/$ARCHIVE_NAME"
+aws s3 cp "$EDITED_APPCAST_PATH" "s3://gitup-builds/$CHANNEL/$APPCAST_NAME"
diff --git a/jenkins-build.sh b/jenkins-build.sh
deleted file mode 100755
index 8331baf8..00000000
--- a/jenkins-build.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-set -ex
-
-PRODUCT_NAME="GitUp"
-APPCAST_NAME="appcast.xml"
-XCODE_SYMROOT="/tmp/$PRODUCT_NAME"
-
-MAX_VERSION=`git tag -l "b*" | sed 's/b//g' | sort -nr | head -n 1`
-VERSION=$((MAX_VERSION + 1))
-
-##### Count LOC
-
-$CLOC_PATH --by-file --xml --out=cloc.xml "GitUp/Application" "GitUpKit/Components" "GitUpKit/Core" "GitUpKit/Extensions" "GitUpKit/Interface" "GitUpKit/Utilities" "GitUpKit/Views"
-
-##### Run unit tests
-
-# pushd "GitUpKit"
-# rm -rf "$XCODE_SYMROOT"
-# xcodebuild test -scheme "GitUpKit (OSX)" "SYMROOT=$XCODE_SYMROOT"
-# popd
-
-##### Archive and export app
-
-pushd "GitUp"
-xcodebuild archive -scheme "Application" -archivePath "../build/$PRODUCT_NAME.xcarchive" "BUNDLE_VERSION=$VERSION" # SYMROOT is ignored?
-xcodebuild -exportArchive -archivePath "../build/$PRODUCT_NAME.xcarchive" -exportPath "../build/$PRODUCT_NAME"  # SYMROOT is ignored?
-ditto -c -k --keepParent "../build/$PRODUCT_NAME.xcarchive" "../build/$PRODUCT_NAME.xcarchive.zip"
-popd "GitUp"
-
-##### Tag build
-
-git tag -f "b$VERSION"
-git push -f origin "b$VERSION"
-
-##### Upload to S3 and update Appcast
-
-FULL_PRODUCT_NAME="$PRODUCT_NAME.app"
-PRODUCT_PATH="$WORKSPACE/build/$PRODUCT_NAME.xcarchive/Products/Applications/$FULL_PRODUCT_NAME"
-INFO_PLIST_PATH="$PRODUCT_PATH/Contents/Info.plist"
-VERSION_ID=`defaults read "$INFO_PLIST_PATH" "CFBundleVersion"`  # Must be full path
-VERSION_STRING=`defaults read "$INFO_PLIST_PATH" "CFBundleShortVersionString"`
-MIN_OS=`defaults read "$INFO_PLIST_PATH" "LSMinimumSystemVersion"`
-
-ARCHIVE_NAME="$PRODUCT_NAME.zip"
-BACKUP_ARCHIVE_NAME="$PRODUCT_NAME-$VERSION_ID.zip"
-APPCAST_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$APPCAST_NAME"
-ARCHIVE_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$ARCHIVE_NAME"
-BACKUP_ARCHIVE_URL="https://s3-us-west-2.amazonaws.com/gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME"
-
-ARCHIVE_PATH="$TMPDIR/$ARCHIVE_NAME"
-APPCAST_PATH="$WORKSPACE/GitUp/SparkleAppcast.xml"
-
-/usr/bin/ditto -c -k --keepParent "$PRODUCT_PATH" "$ARCHIVE_PATH"
-
-ARCHIVE_SIZE=`stat -f "%z" "$ARCHIVE_PATH"`
-
-EDITED_APPCAST_PATH="$TMPDIR/appcast.xml"
-/usr/bin/perl -p -e "s|__APPCAST_TITLE__|$PRODUCT_NAME|g;s|__APPCAST_URL__|$APPCAST_URL|g;s|__VERSION_ID__|$VERSION_ID|g;s|__VERSION_STRING__|$VERSION_STRING|g;s|__ARCHIVE_URL__|$ARCHIVE_URL|g;s|__ARCHIVE_SIZE__|$ARCHIVE_SIZE|g;s|__MIN_OS__|$MIN_OS|g" "$APPCAST_PATH" > "$EDITED_APPCAST_PATH"
-
-/usr/local/bin/aws s3 cp "$ARCHIVE_PATH" "s3://gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME"
-/usr/local/bin/aws s3 cp "s3://gitup-builds/$CHANNEL/$BACKUP_ARCHIVE_NAME" "s3://gitup-builds/$CHANNEL/$ARCHIVE_NAME"
-/usr/local/bin/aws s3 cp "$EDITED_APPCAST_PATH" "s3://gitup-builds/$CHANNEL/$APPCAST_NAME"