From 156a760ebab6839c53f9c613881f0937e814414a Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 22 May 2020 17:02:32 -0500
Subject: Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
---
 scripts/configure_ubuntu.sh |  6 ++----
 scripts/macos_build.sh      |  2 +-
 scripts/macos_post_build.sh |  4 +---
 scripts/release_macos.sh    | 22 ++++++++++++++++++++++
 scripts/wasabi_program.sh   |  2 +-
 scripts/windows/Dockerfile  | 11 ++---------
 6 files changed, 29 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 scripts/macos_post_build.sh
 create mode 100755 scripts/release_macos.sh

(limited to 'scripts')

diff --git a/scripts/configure_ubuntu.sh b/scripts/configure_ubuntu.sh
index 280dfdf..1f9b8e8 100755
--- a/scripts/configure_ubuntu.sh
+++ b/scripts/configure_ubuntu.sh
@@ -7,13 +7,11 @@ 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 efb7653..22e2d45 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 ..
 
-/usr/local/opt/qt/bin/qmake && make -j2
+qmake && make -j2
diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh
old mode 100755
new mode 100644
index df1475c..50acb40
--- a/scripts/macos_post_build.sh
+++ b/scripts/macos_post_build.sh
@@ -13,12 +13,10 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
 cd ${ROOT_DIR}
 
 # This thing basically does all the work
-/usr/local/opt/qt/bin/macdeployqt ../bin/Attorney_Online.app
+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/release_macos.sh b/scripts/release_macos.sh
new file mode 100755
index 0000000..50acb40
--- /dev/null
+++ b/scripts/release_macos.sh
@@ -0,0 +1,22 @@
+#!/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
diff --git a/scripts/wasabi_program.sh b/scripts/wasabi_program.sh
index 37feac6..41e2e35 100755
--- a/scripts/wasabi_program.sh
+++ b/scripts/wasabi_program.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 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 b9a12d6..f4f1a83 100644
--- a/scripts/windows/Dockerfile
+++ b/scripts/windows/Dockerfile
@@ -10,12 +10,5 @@ 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 ../..
 
-# 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
+# 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.
-- 
cgit