From 5e0c7d3c9ddadc3d40062964b4d5034a4991cf6c Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Mon, 17 May 2021 23:28:23 +0430 Subject: [PATCH] ditch packr because it can't load extension jars --- scripts/resources/Tachidesk.bat | 1 + scripts/windows-bundler.sh | 21 +++++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) create mode 100644 scripts/resources/Tachidesk.bat diff --git a/scripts/resources/Tachidesk.bat b/scripts/resources/Tachidesk.bat new file mode 100644 index 0000000..76b616a --- /dev/null +++ b/scripts/resources/Tachidesk.bat @@ -0,0 +1 @@ +start "" "jre/bin/javaw -jar Tachidesk.jar" \ No newline at end of file diff --git a/scripts/windows-bundler.sh b/scripts/windows-bundler.sh index 7029289..9cf395a 100755 --- a/scripts/windows-bundler.sh +++ b/scripts/windows-bundler.sh @@ -6,11 +6,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -echo "Downloading packr jar..." - -packr="packr-all-4.0.0.jar" -curl -L "https://github.com/libgdx/packr/releases/download/4.0.0/packr-all-4.0.0.jar" -o $packr - echo "Downloading jre..." jre="OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip" @@ -22,17 +17,15 @@ jar=$(ls ../server/build/Tachidesk-*.jar) jar_name=$(echo $jar | cut -d'/' -f4) release_name=$(echo $jar_name | cut -d'.' -f4 --complement)-win64 -cp $jar "Tachidesk.jar" +# make release dir +mkdir $release_name -java -jar $packr \ - --platform windows64 \ - --jdk $jre \ - --executable Tachidesk \ - --classpath Tachidesk.jar \ - --mainclass ir.armor.tachidesk.MainKt \ - --vmargs Xmx4G \ - --output $release_name +# move jre +mv jdk8u292-b10-jre $release_name/jre +cp $jar $release_name/Tachidesk.jar + +cp resources/Tachidesk.bat $release_name cp resources/Tachidesk-debug.bat $release_name zip_name=$release_name.zip