aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2020-04-19 15:34:53 +0200
committerGitHub <noreply@github.com>2020-04-19 15:34:53 +0200
commitc0f579864bc00cf20c6cccbaa389a100858d20bc (patch)
tree5047e9dab89f54107d7b2c9efb985b7a2afde05d
parentbba8f4f1c079055af0398c9b820fbfae44b653a6 (diff)
parent8bc7915f17396f93c1fd5146e1c3ff7a70145471 (diff)
Merge pull request #144 from AttorneyOnline/deploy_mac
Deploy mac
-rw-r--r--.travis.yml4
-rwxr-xr-xscripts/macos_post_build.sh2
-rwxr-xr-xscripts/release_macos.sh22
3 files changed, 5 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index 5d384b0c..dbd19cdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ deploy:
provider: releases
api_key:
secure: mZCNwnqKeqJP5CqgYOanYnr/KHydxueGPRhvGLpY0Pop7MiH3CIHMN5dhHbtgJvE5GGMR4xUIEhPpmkCEJw7YiPREMqT4mkV4DR531ZLB3t/FizyvIwXuP6jFwzTofZ51qHfBpcurVc9sMFeD9Pw+rLTTgIiXL2sZxUUXc8U+ZZug1lYndgcO6P00fUJd6V9lyFQUGmbSca97YbG6KuCym0fEpyRnMqzKLjYsUUo8UKRBADtmD822O6z2FSldNZDn45Mkx0MYfHWyT5hzTb7WGa+DrTB/0un1HqqsNPlb/ahjrFQQNR2qd7HNGZa+Mvwi6egTDug+k15x8lbkacUoi34U1eFq9LSTYm8dSO5g23I1OvGvjTCkDj1jOLPqB99XlbAJ0E/9Jzw7wtlLaAzvFzTj/B63TQnO3IsgHBWR14CZlf05WMOFf2irwl+kL6ktspIHnlGgaiWYYrKeAt7QJAXiQOdYDz6SaWVC6TyOE/SszXRU6xFotmCjkP2irM5yGE8SUw2uIzKjD9uG0ZXtbLcdQEFD316+qglqFTCjnKsRfbtQs2u5spZPsZSdsOZCbLfNIn0GSTFRymFsK6gsvji8AD8AZo0zcOZ/7NMVC6A8RnF3Ve+vU/xljhsIOxoLZDvZPia7WozdV99xmnepWBwkuoQs/K0xmWcnLZDcb0=
- file: "../bin/Attorney_Online.app"
+ file: "../bin/Attorney_Online_mac_x86_64.zip"
+ draft: true
on:
+ tags: true
repo: AttorneyOnline/AO2-Client
diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
index 25400bf5..df1475c4 100755
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -20,3 +20,5 @@ cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks
# libbass has a funny path for some reason, just use rpath
install_name_tool -change @loader_path/libbass.dylib @rpath/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online
+
+zip -r -9 ../bin/Attorney_Online_mac_x86_64.zip ../bin/ \ No newline at end of file
diff --git a/scripts/release_macos.sh b/scripts/release_macos.sh
deleted file mode 100755
index 50acb408..00000000
--- a/scripts/release_macos.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script prepares the compiled bundle for shipping as a standalone release
-# Assumes the Qt bin folder is in PATH
-# Should be used on a "Release" build from QT creator
-# Note that this DOES NOT add the base/ folder
-
-# Exit on errors and unset variables
-set -eu
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
-
-cd ${ROOT_DIR}
-
-# This thing basically does all the work
-macdeployqt ../bin/Attorney_Online.app
-
-# Need to add the dependencies
-cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks
-
-# libbass has a funny path for some reason, just use rpath
-install_name_tool -change @loader_path/libbass.dylib @rpath/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online