From c2f304d3bae7909677ff72c50f5c925670b5954d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Aug 2024 22:30:51 -0400 Subject: [PATCH] test build trigger (2) --- desktop/build.gradle | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index 6dfafb65fe..a5e3f60d2b 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -68,7 +68,6 @@ if(!project.ext.hasSprites() && System.getenv("JITPACK") != "true"){ //this is only for local testing //add -Prelease -PversionModifier=steam as build properties task steamtest(dependsOn: dist){ - println new File("../JDKs").absolutePath doLast{ copy{ from "build/libs/Mindustry.jar" @@ -94,6 +93,8 @@ platforms.each{ platform -> task "packr${platform.toString()}"{ dependsOn dist + println "JDK dir: " + new File("${JDK_DIR}").getAbsolutePath() + doLast{ copy{ into "build/packr/" @@ -119,20 +120,20 @@ platforms.each{ platform -> } }else{ def jarPath = JDK_DIR + "packr.jar" - def args = ["java", "-jar", jarPath] as String[] + def args = new String[]{"java", "-jar", jarPath} - args += [ - "--platform", platform == "MacOS" ? "Mac" : platform.toString(), - "--jdk", JDK_DIR + "jre-${platform.toString().toLowerCase()}", - "--executable", appName, - "--classpath", "$rootDir/desktop/build/packr/desktop.jar".toString(), - "--mainclass", project.ext.mainClassName, - "--verbose", - "--bundle", getPackage() + ".mac", - "--icon", ICON_DIR, - "--output", "$rootDir/desktop/build/packr/output".toString(), - "--removelibs", "$rootDir/desktop/build/packr/desktop.jar".toString() - ] + args += new String[]{ + "--platform", platform == "MacOS" ? "Mac" : platform.toString(), + "--jdk", JDK_DIR + "jre-${platform.toString().toLowerCase()}", + "--executable", appName, + "--classpath", "$rootDir/desktop/build/packr/desktop.jar".toString(), + "--mainclass", project.ext.mainClassName, + "--verbose", + "--bundle", getPackage() + ".mac", + "--icon", ICON_DIR, + "--output", "$rootDir/desktop/build/packr/output".toString(), + "--removelibs", "$rootDir/desktop/build/packr/desktop.jar".toString() + } args += "--vmargs"