From 24cb4f4f9b1161ec10472c11b86aee9481124162 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 4 Jul 2025 06:23:00 +0200 Subject: [PATCH 1/2] Improved Error reporting --- app/src/processing/app/gradle/GradleJob.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt index 916c7e83f..a0aed015f 100644 --- a/app/src/processing/app/gradle/GradleJob.kt +++ b/app/src/processing/app/gradle/GradleJob.kt @@ -83,7 +83,7 @@ class GradleJob{ return@launch } - if(state.value != State.BUILDING){ + if(state.value == State.RUNNING){ Messages.log("Gradle job error: $errors") return@launch } @@ -91,7 +91,7 @@ class GradleJob{ // An error occurred during the build process System.err.println(errors) - service?.editor?.statusError(cause?.message) + service?.editor?.statusError(causesList.last().message) }finally { state.value = State.DONE vm.value = null From d7c6aeba90d452727cb970b39cbdcf1b635538e0 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 4 Jul 2025 06:54:50 +0200 Subject: [PATCH 2/2] Also copy Untitled sketches --- app/src/processing/app/gradle/GradleService.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt index 2a9988da3..148846a84 100644 --- a/app/src/processing/app/gradle/GradleService.kt +++ b/app/src/processing/app/gradle/GradleService.kt @@ -84,8 +84,10 @@ class GradleService( private fun setupGradle(): MutableList { val sketch = sketch ?: throw IllegalStateException("Sketch is not set") - val sketchFolder = if(sketch.isReadOnly) workingDir.resolve("sketch").toFile() else sketch.folder - if(sketch.isReadOnly){ + val copy = sketch.isReadOnly || sketch.isUntitled + + val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder + if(copy){ // If the sketch is read-only, we copy it to the working directory // This allows us to run the sketch without modifying the original files sketch.folder.copyRecursively(sketchFolder, overwrite = true) @@ -108,7 +110,7 @@ class GradleService( val variables = mapOf( "group" to System.getProperty("processing.group", "org.processing"), "version" to Base.getVersionName(), - "sketchFolder" to sketch.folder.absolutePath, + "sketchFolder" to sketchFolder, "sketchbook" to Base.getSketchbookFolder(), "workingDir" to workingDir.toAbsolutePath().toString(), "settings" to Platform.getSettingsFolder().absolutePath.toString(), @@ -123,7 +125,6 @@ class GradleService( //"window.color" to "0xFF000000", // TODO: Implement //"stop.color" to "0xFF000000", // TODO: Implement "stop.hide" to false, // TODO: Implement - "sketch.folder" to sketchFolder, ) val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""") @@ -191,7 +192,7 @@ class GradleService( val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString()) if (!Base.DEBUG) arguments.add("--quiet") - if(sketch.isReadOnly){ + if(copy){ arguments += listOf("--project-dir", sketchFolder.absolutePath) } arguments.addAll(variables.entries