eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allowing libraries folder to not exist, but log instead

Browse Source
This commit is contained in:
Stef Tervelde
2025-07-02 09:50:39 +02:00
parent fcb554a50c
commit bd5aba46e8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/gradle/src/main/kotlin/LibrariesTask.kt
View File

@@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import java.io.File
@@ -16,8 +17,8 @@ This task stores the resulting information in a file that can be used later to r
*/
abstract class LibrariesTask : DefaultTask() {
// TODO: Allow this directory to not exist
@InputDirectory
@Optional
val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
@OutputFile
@@ -38,6 +39,10 @@ abstract class LibrariesTask : DefaultTask() {
@TaskAction
fun execute() {
if (!librariesDirectory.isPresent) {
logger.error("Libraries directory is not set. Libraries will not be imported.")
return
}
val libraries = librariesDirectory.get().asFile
.listFiles { file -> file.isDirectory }
?.map { folder ->

2
java/gradle/src/main/kotlin/ProcessingPlugin.kt
View File

@@ -139,7 +139,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
task.description = "Scans the libraries in the sketchbook"
task.librariesDirectory.set(File(sketchbook, "libraries"))
task.librariesDirectory.set(sketchbook?.let { File(it, "libraries") })
}
val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")