Copy running JDK rather than download

Author: Stefterv

app/build.gradle.kts

@@ -1,9 +1,7 @@
-import org.gradle.kotlin.dsl.support.zipTo
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.gradle.internal.jvm.Jvm
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Download
-import org.jetbrains.kotlin.fir.scopes.impl.overrides
 import java.io.FileOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
@@ -335,41 +333,6 @@ tasks.register<Copy>("includeJavaMode") {
     into(composeResources("modes/java/mode"))
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
-tasks.register<Download>("includeJdk") {
-    val os = DefaultNativePlatform.getCurrentOperatingSystem()
-    val arch = when (System.getProperty("os.arch")) {
-        "amd64", "x86_64" -> "x64"
-        else -> System.getProperty("os.arch")
-    }
-    val platform = when {
-        os.isWindows -> "windows"
-        os.isMacOsX -> "mac"
-        else -> "linux"
-    }
-
-    val javaVersion = System.getProperty("java.version").split(".")[0]
-    val imageType = "jdk"
-
-    src("https://api.adoptium.net/v3/binary/latest/" +
-            "$javaVersion/ga/" +
-            "$platform/" +
-            "$arch/" +
-            "$imageType/" +
-            "hotspot/normal/eclipse?project=jdk")
-
-    val extension = if (os.isWindows) "zip" else "tar.gz"
-    val jdk = layout.buildDirectory.file("tmp/jdk-$platform-$arch.$extension")
-    dest(jdk)
-    overwrite(false)
-    doLast {
-        copy {
-            val archive = if (os.isWindows) { zipTree(jdk) } else { tarTree(jdk) }
-            from(archive){ eachFile{ permissions{ unix("755") } } }
-            into(composeResources(""))
-        }
-    }
-    finalizedBy("prepareAppResources")
-}
 tasks.register<Copy>("includeSharedAssets"){
     from("../build/shared/")
     into(composeResources(""))
@@ -414,21 +377,26 @@ tasks.register<Copy>("includeJavaModeResources") {
     from(java.layout.buildDirectory.dir("resources-bundled"))
     into(composeResources("../"))
 }
-tasks.register<Copy>("renameWindres") {
-    dependsOn("includeSharedAssets","includeJavaModeResources")
-    val dir = composeResources("modes/java/application/launch4j/bin/")
-    val os = DefaultNativePlatform.getCurrentOperatingSystem()
-    val platform = when {
-        os.isWindows -> "windows"
-        os.isMacOsX -> "macos"
-        else -> "linux"
-    }
-    from(dir) {
-        include("*-$platform*")
-        rename("(.*)-$platform(.*)", "$1$2")
+tasks.register("includeJdk") {
+    dependsOn("createDistributable")
+    doFirst {
+        val jdk = Jvm.current().javaHome.absolutePath
+        val target = layout.buildDirectory.dir("compose/binaries").get().asFileTree.matching { include("**/include.jdk") }
+            .files
+            .firstOrNull()
+            ?.parentFile
+            ?.resolve("jdk")
+            ?.absolutePath
+            ?: error("Could not find include.jdk")
+
+        val isWindows = System.getProperty("os.name").lowercase().contains("win")
+        val command = if (isWindows) {
+            listOf("xcopy", "/E", "/I", "/Q", jdk, target)
+        } else {
+            listOf("cp", "-a", jdk, target)
+        }
+        ProcessBuilder(command).inheritIO().start().waitFor()
     }
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    into(dir)
 }
 tasks.register("signResources"){
     onlyIf {
@@ -440,19 +408,15 @@ tasks.register("signResources"){
     dependsOn(
         "includeCore",
         "includeJavaMode",
-        "includeJdk",
         "includeSharedAssets",
         "includeProcessingExamples",
         "includeProcessingWebsiteExamples",
         "includeJavaModeResources",
-        "renameWindres"
     )
     finalizedBy("prepareAppResources")
 
     val resourcesPath = composeResources("")
 
-
-
     // find jars in the resources directory
     val jars = mutableListOf<File>()
     doFirst{
@@ -529,31 +493,11 @@ afterEvaluate {
             "includeSharedAssets",
             "includeProcessingExamples",
             "includeProcessingWebsiteExamples",
-            "includeJavaModeResources",
-            "renameWindres"
+            "includeJavaModeResources"
         )
     }
-    tasks.register("setExecutablePermissions") {
-        description = "Sets executable permissions on binaries in Processing.app resources"
-        group = "compose desktop"
-
-        doLast {
-            val resourcesPath = layout.buildDirectory.dir("compose/binaries")
-            fileTree(resourcesPath) {
-                include("**/resources/**/bin/**")
-                include("**/resources/**/*.sh")
-                include("**/resources/**/*.dylib")
-                include("**/resources/**/*.so")
-                include("**/resources/**/*.exe")
-            }.forEach { file ->
-                if (file.isFile) {
-                    file.setExecutable(true, false)
-                }
-            }
-        }
-    }
     tasks.named("createDistributable").configure {
-        dependsOn("signResources", "includeJdk")
-        finalizedBy("setExecutablePermissions")
+        dependsOn("signResources")
+        finalizedBy("includeJdk")
     }
 }

app/src/processing/app/Platform.java

@@ -391,13 +391,10 @@ static public File getContentFile(String name) {
   static public File getJavaHome() {
     var resourcesDir = System.getProperty("compose.application.resources.dir");
     if(resourcesDir != null) {
-        var jdkFolder = Arrays.stream(new File(resourcesDir).listFiles((dir, name) -> dir.isDirectory() && name.startsWith("jdk-")))
-                .findFirst()
-                .orElse(null);
-        if(Platform.isMacOS()){
-            return new File(jdkFolder, "Contents/Home");
+        var jdkFolder = new File(resourcesDir,"jdk");
+        if(jdkFolder.exists()){
+          return jdkFolder;
         }
-        return jdkFolder;
     }
 
     var home = System.getProperty("java.home");

app/src/processing/app/gradle/GradleService.kt

@@ -11,6 +11,8 @@ import org.gradle.tooling.BuildLauncher
 import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.events.ProgressListener
+import org.gradle.tooling.events.problems.ProblemEvent
+import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
 import org.gradle.tooling.events.task.TaskFinishEvent
 import org.gradle.tooling.events.task.TaskStartEvent
 import processing.app.Base
@@ -30,6 +32,7 @@ class GradleService(val editor: Editor) {
     val running = mutableStateOf(false)
     var vm: VirtualMachine? = null
     val debugPort = (30000..60000).random()
+    val problems = mutableStateListOf<ProblemEvent>()
 
     private var connection: ProjectConnection? = null
     private var preparation: Job? = null
@@ -176,6 +179,9 @@ class GradleService(val editor: Editor) {
             if(event is TaskFinishEvent){
                 finishedTasks.add(name)
             }
+            if(event is DefaultSingleProblemEvent){
+                Messages.log("")
+            }
         })
         return this
     }
@@ -255,6 +261,7 @@ class GradleService(val editor: Editor) {
         }
 
         return this.newBuild()
+//            .addJvmArguments("-Xmx2g")
             .setJavaHome(Platform.getJavaHome())
             .withArguments(
                 "--init-script", initGradle.toAbsolutePath().toString(),

build/shared/include.jdk

@@ -0,0 +1 @@
+This file is used by gradle to determine where it should copy the jdk

java/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 plugins {
     id("java")
 }
@@ -53,7 +55,7 @@ tasks.register<Copy>("extraResources"){
     include("keywords.txt")
     include("theme/**/*")
     include("application/**/*")
-    into( layout.buildDirectory.dir("resources-bundled/common/modes/java"))
+    into(layout.buildDirectory.dir("resources-bundled/common/modes/java"))
 }
 tasks.register<Copy>("copyCore"){
     val coreProject = project(":core")
@@ -64,6 +66,22 @@ tasks.register<Copy>("copyCore"){
     rename("core.+\\.jar", "core.jar")
     into(coreProject.layout.projectDirectory.dir("library"))
 }
+tasks.register<Copy>("renameWindres") {
+    val dir = layout.buildDirectory.dir("resources-bundled/common/modes/java")
+    val os = DefaultNativePlatform.getCurrentOperatingSystem()
+    val platform = when {
+        os.isWindows -> "windows"
+        os.isMacOsX -> "macos"
+        else -> "linux"
+    }
+    from(dir) {
+        include("*-$platform*")
+        rename("(.*)-$platform(.*)", "$1$2")
+    }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    into(dir)
+    tasks.named("extraResources"){ dependsOn(this) }
+}
 
 val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
 libraries.forEach { library ->
@@ -77,7 +95,7 @@ libraries.forEach { library ->
         include("*.properties")
         include("library/**/*")
         include("examples/**/*")
-        into( layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
+        into(layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
     }
     tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
 }

java/gradle/src/main/kotlin/ProcessingPlugin.kt

@@ -118,6 +118,8 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             }
         }
 
+        // TODO: Add support for top level .java files
+
         // Add convenience tasks for running, presenting, and exporting the sketch outside of Processing
         if(!isProcessing) {
             project.tasks.create("sketch").apply {