From df8f19320b3a37521a7f93a578bf31c81f885238 Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 22 May 2020 19:35:49 -0500
Subject: Bring back CI changes and macOS support

---
 scripts/configure_ubuntu.sh |  6 ++++--
 scripts/macos_build.sh      |  2 +-
 scripts/macos_post_build.sh |  4 +++-
 scripts/wasabi_program.sh   |  2 +-
 scripts/windows/Dockerfile  | 11 +++++++++--
 5 files changed, 18 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 scripts/macos_post_build.sh

(limited to 'scripts')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 1f9b8e83..280dfdf9 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -7,11 +7,13 @@ set -eu
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
 
-cd ${ROOT_DIR}
+cd "${ROOT_DIR}"
+
 
 #need some openGL stuff
 sudo apt install libgl1-mesa-dev
-
+#install curl incase of fresh vm
+sudo apt install curl
 mkdir tmp
 
 cd tmp
diff --git a/scripts/macos_build.sh b/scripts/macos_build.sh
index 22e2d457..efb7653f 100755
--- a/scripts/macos_build.sh
+++ b/scripts/macos_build.sh
@@ -30,4 +30,4 @@ tar -xvf apng.tar.xz
 cp clang_64/plugins/imageformats/libqapng.dylib ../lib
 cd ..
 
-qmake && make -j2
+/usr/local/opt/qt/bin/qmake && make -j2
diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
old mode 100644
new mode 100755
index 50acb408..df1475c4
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -13,10 +13,12 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
 cd ${ROOT_DIR}
 
 # This thing basically does all the work
-macdeployqt ../bin/Attorney_Online.app
+/usr/local/opt/qt/bin/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
+
+zip -r -9 ../bin/Attorney_Online_mac_x86_64.zip ../bin/
\ No newline at end of file
diff --git a/scripts/wasabi_program.sh b/scripts/wasabi_program.sh
index 41e2e352..37feac6e 100755
--- a/scripts/wasabi_program.sh
+++ b/scripts/wasabi_program.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Updates the specified program manifest to a new archive and version
 # and uploads the new archive and manifest to S3/Wasabi.
 #
diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile
index f4f1a836..b9a12d66 100644
--- a/scripts/windows/Dockerfile
+++ b/scripts/windows/Dockerfile
@@ -10,5 +10,12 @@ RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake .. -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr
 RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake --build . --config Release --target install
 WORKDIR ../..
 
-# NOTE: Do not build QtApng statically! libpng contains a self-test entry point that
-# takes precedence for some reason over the final build's entry point.
+# Build QtApng statically
+RUN git clone https://github.com/Skycoder42/QtApng
+WORKDIR QtApng
+# libpng contains a self-test entry point that takes precedence for some reason
+# over the final build's entry point.
+RUN sed -i "s/^main(/libpng_main(/g" src/3rdparty/libpng/src/pngtest.c
+RUN /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake
+RUN make && make install
+WORKDIR ..
\ No newline at end of file
-- 
cgit