diff --git a/build.gradle b/build.gradle index a0e3c900b1..85f4e052b6 100644 --- a/build.gradle +++ b/build.gradle @@ -13,12 +13,10 @@ buildscript{ google() maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url 'https://jitpack.io' } - maven{ url "http://artifactory.nimblygames.com/artifactory/ng-public/" } //packr } dependencies{ classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.11' - classpath "com.badlogicgames.packr:packr-all:4.0.0" classpath "com.github.Anuken.Arc:packer:$arcHash" classpath "com.github.Anuken.Arc:arc-core:$arcHash" } diff --git a/desktop/build.gradle b/desktop/build.gradle index 872b8a5891..7cd4befa2a 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,7 +1,4 @@ -import com.badlogicgames.packr.Packr -import com.badlogicgames.packr.PackrConfig - -sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.java.srcDirs = ["src/" ] project.ext.mainClassName = "mindustry.desktop.DesktopLauncher" project.ext.assetsDir = new File("../core/assets") @@ -9,6 +6,7 @@ project.ext.assetsDir = new File("../core/assets") def enableTemplates = true def JDK_DIR = "$System.env.JDK_DIR" def ICON_DIR = new File("$rootDir/core/assets/icons/icon.icns") +def platforms = ["Linux64", "Windows64", "Windows32", "MacOS"] task run(dependsOn: classes, type: JavaExec){ main = project.mainClassName @@ -36,7 +34,6 @@ task run(dependsOn: classes, type: JavaExec){ } } - task dist(type: Jar, dependsOn: configurations.runtimeClasspath){ from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) @@ -74,11 +71,11 @@ task steamtest(dependsOn: dist){ //required templates: //- Windows64 +//- Windows32 (not provided by Packr!) //required JDKs: -//- Windows32 //- Linux64 //- Mac -PackrConfig.Platform.values().each{ platform -> +platforms.each{ platform -> task "packr${platform.toString()}"{ dependsOn dist @@ -93,7 +90,8 @@ PackrConfig.Platform.values().each{ platform -> delete "build/packr/output/" } - if(enableTemplates && (platform == PackrConfig.Platform.Windows64)){ + //the Windows32 version uses an old java-8 based template, because packr and jpackage don't support win32 + if(enableTemplates && (platform == "Windows32")){ copy{ into "build/packr/output" from "${JDK_DIR}/templates/${platform.toString().toLowerCase()}" @@ -105,30 +103,35 @@ PackrConfig.Platform.values().each{ platform -> from "build/libs/${appName}.jar" } }else{ - def config = new PackrConfig() - config.with{ - //TODO consider useZgcIfSupportedOs = true - config.executable = appName - config.platform = platform - verbose = true - bundleIdentifier = getPackage() + ".mac" - iconResource = ICON_DIR - outDir = file("$rootDir/desktop/build/packr/output") - mainClass = project.ext.mainClassName - classpath = ["$rootDir/desktop/build/packr/desktop.jar".toString()] - removePlatformLibs = ["$rootDir/desktop/build/packr/desktop.jar".toString()] + def jarPath = JDK_DIR + "packr.jar" + def args = ["java", "-jar", jarPath] as String[] - vmArgs = ["XX:+ShowCodeDetailsInExceptionMessages"] - jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip" + 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() + ] - if(platform == PackrConfig.Platform.MacOS){ - vmArgs += "XstartOnFirstThread" - } + if(platform == "MacOS"){ + args += ["--vmargs", "XstartOnFirstThread"] as String[] + }else{ + //TODO unneeded for windows? + args += ["--vmargs", "Dhttps.protocols=TLSv1.2,TLSv1.1,TLSv1"] } - new Packr().pack(config) + exec{ + commandLine args.toList() + standardOutput = System.out + } - if(platform != PackrConfig.Platform.MacOS){ + if(platform != "MacOS"){ copy{ into "build/packr/output/jre/" from "build/packr/output/desktop.jar" @@ -138,10 +141,8 @@ PackrConfig.Platform.values().each{ platform -> 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){ + file("build/packr/output/Mindustry.json").text = file("build/packr/output/Mindustry.json").text.replace("desktop.jar", "jre/desktop.jar") + }else{ copy{ into "build/packr/output/${appName}.app/Contents/" from "build/packr/output/Contents/" @@ -153,7 +154,7 @@ PackrConfig.Platform.values().each{ platform -> } } - if((platform == PackrConfig.Platform.Windows64 || platform == PackrConfig.Platform.Windows32)){ + if((platform == "Windows64" || platform == "Windows32")){ copy{ from "build/packr/output/jre/bin/msvcr100.dll" into "build/packr/output/" @@ -163,12 +164,12 @@ PackrConfig.Platform.values().each{ platform -> if(versionModifier.contains("steam")){ copy{ - def lib = platform == PackrConfig.Platform.MacOS || platform == PackrConfig.Platform.Linux64 ? "lib" : "" - from zipTree(platform == PackrConfig.Platform.MacOS ? "build/packr/output/${appName}.app/Contents/Resources/desktop.jar" : "build/packr/output/jre/desktop.jar").matching{ - include "${lib}steamworks4j${platform == PackrConfig.Platform.Windows64 ? '64.dll' : platform == PackrConfig.Platform.Windows32 ? '.dll' : platform == PackrConfig.Platform.Linux64 ? '.so' : '.dylib'}" - include "${lib}steam_api${platform == PackrConfig.Platform.Windows64 ? '64.dll' : platform == PackrConfig.Platform.Windows32 ? '.dll' : platform == PackrConfig.Platform.Linux64 ? '.so' : '.dylib'}" + def lib = platform == "MacOS" || platform == "Linux64" ? "lib" : "" + from zipTree(platform == "MacOS" ? "build/packr/output/${appName}.app/Contents/Resources/desktop.jar" : "build/packr/output/jre/desktop.jar").matching{ + include "${lib}steamworks4j${platform == "Windows64" ? '64.dll' : platform == "Windows32" ? '.dll' : platform == "Linux64" ? '.so' : '.dylib'}" + include "${lib}steam_api${platform == "Windows64" ? '64.dll' : platform == "Windows32" ? '.dll' : platform == "Linux64" ? '.so' : '.dylib'}" } - into platform != PackrConfig.Platform.MacOS ? "build/packr/output/" : "build/packr/output/${appName}.app/Contents/Resources" + into platform != "MacOS" ? "build/packr/output/" : "build/packr/output/${appName}.app/Contents/Resources" } } diff --git a/gradle.properties b/gradle.properties index edd4da555a..cf506d1790 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ kapt.use.worker.api=true kapt.include.compile.classpath=false # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues kotlin.stdlib.default.dependency=false -archash=423d5bb934a66c0ba0f68906b45d7e514342d5c5 +archash=759b136340ea98d4cb9881e340fb219c6d602a66 diff --git a/tools/build.gradle b/tools/build.gradle index 3a1141fb1f..c98a6c8525 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -1,7 +1,5 @@ sourceSets.main.java.srcDirs = ["src/"] - - import arc.files.Fi import arc.graphics.Color import arc.graphics.Pixmap