From 0553fb6b7972cc3f906870308678d13dccda1a46 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 21 Aug 2019 15:34:01 -0400
Subject: [PATCH] Finalized build scripts

---
 build.gradle             |  2 +-
 desktop-sdl/build.gradle | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1da7711583..3d1909bff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -318,7 +318,7 @@ project(":net"){
 task deployAll{
     task cleanDeployOutput{
         doFirst{
-            if("${getBuildVersion()}" == "custom build") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----")
+            if("${getBuildVersion()}" == "custom build" || "${getBuildVersion()}" == "") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----")
             if(!project.hasProperty("release")) throw new IllegalArgumentException("----\n\nSET THE RELEASE PROJECT PROPERTY FIRST!\n\n----")
 
             delete{
diff --git a/desktop-sdl/build.gradle b/desktop-sdl/build.gradle
index a0b37f4579..66052c51bd 100644
--- a/desktop-sdl/build.gradle
+++ b/desktop-sdl/build.gradle
@@ -118,7 +118,7 @@ PackrConfig.Platform.values().each{ platform ->
                 }
 
                 copy{
-                    into "build/packr/output"
+                    into "build/packr/output/jre"
                     rename("$appName-${platformName}.jar", "desktop.jar")
                     from "build/libs/$appName-${platformName}.jar"
                 }
@@ -136,7 +136,7 @@ PackrConfig.Platform.values().each{ platform ->
                     removePlatformLibs = ["desktop-sdl/build/packr/desktop.jar"]
 
                     vmArgs = ["Djava.net.preferIPv4Stack=true"]
-                    minimizeJre = "../desktop/packr_minimize.json"
+                    minimizeJre = "desktop/packr_minimize.json"
                     jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip"
 
                     if(platform == PackrConfig.Platform.MacOS){
@@ -146,9 +146,22 @@ PackrConfig.Platform.values().each{ platform ->
 
                 new Packr().pack(config)
 
+                if(platform == PackrConfig.Platform.Linux64){
+                    copy{
+                        into "build/packr/output/jre/"
+                        from "build/packr/output/desktop.jar"
+                    }
+
+                    delete{
+                        delete "build/packr/output/desktop.jar"
+                    }
+
+                    file("build/packr/output/config.json").text = file("build/packr/output/config.json").text.replace("desktop.jar", "jre/desktop.jar")
+                }
+
                 if(platform == PackrConfig.Platform.MacOS){
                     copy{
-                        into "build/packr/" + appName + ".app/Contents/"
+                        into "build/packr/${appName}.app/Contents/"
                         from "build/packr/Contents/"
                     }