Gradle Runner, more variables

Author: Stefterv

app/build.gradle.kts

@@ -482,9 +482,8 @@ tasks.register("signResources"){
         }
         file(composeResources("Info.plist")).delete()
     }
-
-
 }
+
 afterEvaluate {
     tasks.named("prepareAppResources").configure {
         dependsOn(

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

@@ -213,7 +213,19 @@ class GradleService(val editor: Editor) {
             "workingDir" to workingDir.toAbsolutePath().toString(),
             "settings" to Platform.getSettingsFolder().absolutePath.toString(),
             "unsaved" to unsaved.joinToString(","),
-            "debugPort" to debugPort.toString()
+            "debugPort" to debugPort.toString(),
+            "present" to false, // TODO: Implement
+            "fullscreen" to false, // TODO: Implement
+            "display" to 1, // TODO: Implement
+            "external" to true,
+            "editor.location" to editor.location.let { "${it.x},${it.y}" },
+            //"awt.disable" to false,
+            //"window.color" to "0xFF000000", // TODO: Implement
+            //"stop.color" to "0xFF000000", // TODO: Implement
+            "stop.hide" to false, // TODO: Implement
+            "sketch.folder" to folder.absolutePath,
+            //"location" to "0,0",
+            //"ui.scale" to "1.0",
         )
         val repository = Platform.getContentFile("repository").absolutePath
 

core/src/processing/core/PApplet.java

@@ -705,7 +705,7 @@ public class PApplet implements PConstants {
   protected boolean exitCalled;
 
   // ok to be static because it's not possible to mix enabled/disabled
-  static protected boolean disableAWT;
+  static protected boolean disableAWT = System.getProperty("processing.awt.disable", "false").equals("true");;
 
   // messages to send if attached as an external vm
 
@@ -9932,19 +9932,21 @@ static public void runSketch(final String[] args,
       System.exit(1);
     }
 
-    boolean external = false;
-    int[] location = null;
-    int[] editorLocation = null;
+    boolean external = System.getProperty("processing.external", "false").equals("true");;
+    int[] location = System.getProperty("processing.location", null) != null ?
+      parseInt(split(System.getProperty("processing.location"), ',')) : null;
 
+    int[] editorLocation = System.getProperty("processing.editor.location", null) != null ?
+      parseInt(split(System.getProperty("processing.editor.location"), ',')) : null;
     String name = null;
     int windowColor = 0;
     int stopColor = 0xff808080;
-    boolean hideStop = false;
+    boolean hideStop = System.getProperty("processing.stop.hide", "false").equals("true");
 
     int displayNum = -1;  // use default
     boolean present = System.getProperty("processing.present", "false").equals("true");
     boolean fullScreen = System.getProperty("processing.fullscreen", "false").equals("true");
-    float uiScale = 0;
+    float uiScale = parseInt(System.getProperty("processing.uiScale", "0"), 0);
 
     String param, value;
     String folder = calcSketchPath();

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

@@ -142,7 +142,14 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 description = "Creates a distributable version of the Processing sketch"
 
                 dependsOn("createDistributable")
-                doLast {
+
+            }
+        }
+
+        project.afterEvaluate {
+            // Copy the result of create distributable to the project directory
+            project.tasks.named("createDistributable") { task ->
+                task.doLast {
                     project.copy {
                         it.from(project.tasks.named("createDistributable").get().outputs.files)
                         it.into(project.layout.projectDirectory)
@@ -151,6 +158,13 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             }
         }
 
+        // Move the processing variables into javaexec tasks so they can be used in the sketch as well
+        project.tasks.withType(JavaExec::class.java).configureEach { task ->
+            project.properties
+                .filterKeys { it.startsWith("processing") }
+                .forEach { (key, value) -> task.systemProperty(key, value) }
+        }
+
         project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.all { sourceSet ->
             // For each java source set (mostly main) add a new source set for the PDE files
             val pdeSourceSet = objectFactory.newInstance(

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

@@ -57,6 +57,7 @@ abstract class ProcessingTask : SourceTask() {
         javaFile.close()
 
         // Scan all the libaries in the sketchbook
+        // TODO: Move scanning the libraries to a separate task to avoid running this every time
         val libraries = File(sketchBook, "libraries")
             .listFiles { file -> file.isDirectory }
             ?.map { folder ->
@@ -106,6 +107,9 @@ abstract class ProcessingTask : SourceTask() {
         // Write the dependencies to a file
         val deps = File(outputDirectory, "$sketchName.dependencies")
         deps.writeText(dependencies.joinToString("\n") { it.absolutePath })
+
+        // TODO: Add to the dependencies
+        val renderer = meta.sketchRenderer
     }
 
     @get:Inject