From 156a760ebab6839c53f9c613881f0937e814414a Mon Sep 17 00:00:00 2001 From: oldmud0 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 280dfdf9..1f9b8e83 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 efb7653f..22e2d457 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 df1475c4..50acb408 --- 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 00000000..50acb408 --- /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 37feac6e..41e2e352 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 b9a12d66..f4f1a836 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 From df8f19320b3a37521a7f93a578bf31c81f885238 Mon Sep 17 00:00:00 2001 From: oldmud0 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 From ec9244809cd09521fd582e5812ac5f0440860677 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 5 Jul 2020 15:29:41 -0500 Subject: Fix Mac build missing audio (#180) --- scripts/macos_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/macos_build.sh b/scripts/macos_build.sh index efb7653f..fb631e9f 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 +/usr/local/opt/qt/bin/qmake "DEFINES += DISCORD QTAUDIO" && make -j2 -- cgit From e827f560f3c7ea3279a81b2737802734e80c431d Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 5 Jul 2020 15:48:24 -0500 Subject: Mac CI: Fix wrong zip name --- scripts/macos_post_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index df1475c4..cdf7514b 100755 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -21,4 +21,4 @@ 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 +zip -r -9 ../bin/Attorney_Online_macOS.zip ../bin/ \ No newline at end of file -- cgit From bcbc48f9b055e7bd6960fdc7b028e8bf6b14863c Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 22 Jul 2020 20:55:08 +0200 Subject: fix mac builds, opus lib path was wrong --- scripts/macos_post_build.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index cdf7514b..2ed73649 100755 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -20,5 +20,6 @@ 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 +install_name_tool -change @loader_path/libbassopus.dylib @rpath/libbassopus.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online zip -r -9 ../bin/Attorney_Online_macOS.zip ../bin/ \ No newline at end of file -- cgit