Merge pull request #1340 from catilac/libprocessing-submodule

libprocessing submodule

Author: tychedelia

.github/workflows/build-gradle.yml

@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -64,6 +66,8 @@ jobs:
 
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -86,4 +90,4 @@ jobs:
         with:
           name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-br_${{ github.ref_name }}
           retention-days: 1
-          path: app/build/compose/binaries/main/${{ matrix.binary }}
+          path: app/build/compose/binaries/main/${{ matrix.binary }}

.github/workflows/pull_request-gradle.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -65,6 +67,8 @@ jobs:
 
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -87,4 +91,4 @@ jobs:
         with:
           name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-pr_${{ github.event.pull_request.number }}
           retention-days: 5
-          path: app/build/compose/binaries/main/${{ matrix.binary }}
+          path: app/build/compose/binaries/main/${{ matrix.binary }}

.gitignore

@@ -125,4 +125,4 @@ generated/
 /java/gradle/build
 /java/gradle/example/.processing
 
-libProcessing/ffi/include/*
+libprocessing/ffi/include/*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libprocessing"]
+	path = libprocessing
+	url = https://github.com/processing/libprocessing

BUILD.md

@@ -42,7 +42,7 @@ If you don't have them installed, you will need to install [Git](https://git-scm
 
 1. **Clone the repository:**
     ```bash
-    git clone https://github.com/processing/processing4.git
+    git clone --recursive https://github.com/processing/processing4.git
     cd processing4
     ```
 

core/build.gradle.kts

@@ -64,25 +64,25 @@ dependencies {
 
 if (enableWebGPU) {
     val currentPlatform = PlatformUtils.detect()
-    val libProcessingDir = file("${project.rootDir}/libProcessing")
-    val rustTargetDir = file("$libProcessingDir/target")
+    val libprocessingDir = file("${project.rootDir}/libprocessing")
+    val rustTargetDir = file("$libprocessingDir/target")
     val nativeOutputDir = file("${layout.buildDirectory.get()}/native/${currentPlatform.target}")
 
     val buildRustRelease by tasks.registering(CargoBuildTask::class) {
-        cargoWorkspaceDir.set(libProcessingDir)
+        cargoWorkspaceDir.set(libprocessingDir)
         manifestPath.set("ffi/Cargo.toml")
         release.set(true)
         cargoPath.set(PlatformUtils.getCargoPath())
         outputLibrary.set(file("$rustTargetDir/release/${currentPlatform.libName}"))
 
-        inputs.files(fileTree("$libProcessingDir/ffi/src"))
-        inputs.file("$libProcessingDir/ffi/Cargo.toml")
-        inputs.file("$libProcessingDir/ffi/build.rs")
-        inputs.file("$libProcessingDir/ffi/cbindgen.toml")
-        inputs.files(fileTree("$libProcessingDir/renderer/src"))
-        inputs.file("$libProcessingDir/renderer/Cargo.toml")
-        inputs.file("$libProcessingDir/Cargo.toml")
-        outputs.file("$libProcessingDir/ffi/include/processing.h")
+        inputs.files(fileTree("$libprocessingDir/ffi/src"))
+        inputs.file("$libprocessingDir/ffi/Cargo.toml")
+        inputs.file("$libprocessingDir/ffi/build.rs")
+        inputs.file("$libprocessingDir/ffi/cbindgen.toml")
+        inputs.files(fileTree("$libprocessingDir/renderer/src"))
+        inputs.file("$libprocessingDir/renderer/Cargo.toml")
+        inputs.file("$libprocessingDir/Cargo.toml")
+        outputs.file("$libprocessingDir/ffi/include/processing.h")
     }
 
     val copyNativeLibs by tasks.registering(Copy::class) {
@@ -109,7 +109,7 @@ if (enableWebGPU) {
     }
 
     val cleanRust by tasks.registering(CargoCleanTask::class) {
-        cargoWorkspaceDir.set(libProcessingDir)
+        cargoWorkspaceDir.set(libprocessingDir)
         manifestPath.set("ffi/Cargo.toml")
         cargoPath.set(PlatformUtils.getCargoPath())
 
@@ -158,7 +158,7 @@ if (enableWebGPU) {
             dependsOn(downloadJextract, makeJextractExecutable)
         }
 
-        headerFile.set(file("$libProcessingDir/ffi/include/processing.h"))
+        headerFile.set(file("$libprocessingDir/ffi/include/processing.h"))
         outputDirectory.set(generatedJavaDir)
         targetPackage.set("processing.ffi")
 

core/src/processing/webgpu/PWebGPU.java

@@ -10,7 +10,7 @@
 import processing.ffi.Color;
 
 /**
- * PWebGPU provides the native interface layer for libProcessing's WebGPU support.
+ * PWebGPU provides the native interface layer for libprocessing's WebGPU support.
  */
 public class PWebGPU {