Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -64,6 +66,8 @@ jobs:

- name: Checkout Repository
uses: actions/checkout@v4
with:
submodules: true
- name: Install Java
uses: actions/setup-java@v4
with:
Expand All @@ -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 }}
6 changes: 5 additions & 1 deletion .github/workflows/pull_request-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -65,6 +67,8 @@ jobs:

- name: Checkout Repository
uses: actions/checkout@v4
with:
submodules: true
- name: Install Java
uses: actions/setup-java@v4
with:
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ generated/
/java/gradle/build
/java/gradle/example/.processing

libProcessing/ffi/include/*
libprocessing/ffi/include/*
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libprocessing"]
path = libprocessing
url = https://github.com/processing/libprocessing
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
26 changes: 13 additions & 13 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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())

Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion core/src/processing/webgpu/PWebGPU.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 0 additions & 2 deletions libProcessing/.gitignore

This file was deleted.

Loading