Don't log Git output for rebuilds by default either (#229)

PaperMC · Dec 6, 2023 · f154896 · f154896
1 parent b356b4d
commit f154896
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/AllTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/AllTasks.kt
@@ -140,6 +140,7 @@ open class AllTasks(
         baseRef.set("base")
 
         patchDir.set(extension.paper.spigotApiPatchDir)
+        printOutput.set(project.printRebuildPatchesOutput())
     }
 
     val rebuildServerPatches by tasks.registering<RebuildGitPatches> {
@@ -149,6 +150,7 @@ open class AllTasks(
         baseRef.set("base")
 
         patchDir.set(extension.paper.spigotServerPatchDir)
+        printOutput.set(project.printRebuildPatchesOutput())
     }
 
     @Suppress("unused")

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt
@@ -30,6 +30,7 @@ import org.gradle.api.Task
 const val PAPERWEIGHT_EXTENSION = "paperweight"
 const val PAPERWEIGHT_DEBUG = "paperweight.debug"
 const val PAPERWEIGHT_PRINT_APPLY_PATCHES_OUTPUT = "paperweight.printBaseExecutionApplyPatchesOutput"
+const val PAPERWEIGHT_PRINT_REBUILD_PATCHES_OUTPUT = "paperweight.printRebuildPatchesOutput"
 
 const val MC_LIBRARY_URL = "https://libraries.minecraft.net/"
 

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt
@@ -142,6 +142,12 @@ fun Project.printApplyPatchesOutput(): Provider<Boolean> {
     }
 }
 
+fun Project.printRebuildPatchesOutput(): Provider<Boolean> {
+    return providers.gradleProperty(PAPERWEIGHT_PRINT_REBUILD_PATCHES_OUTPUT)
+        .map { it.toBoolean() }
+        .orElse(false)
+}
+
 val redirectThreadCount: AtomicLong = AtomicLong(0)
 
 fun redirect(input: InputStream, out: OutputStream): CompletableFuture<Unit> {

diff --git a/paperweight-patcher/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt b/paperweight-patcher/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt
@@ -295,6 +295,7 @@ class PaperweightPatcher : Plugin<Project> {
             patchDir.convention(config.patchDir)
             inputDir.convention(config.outputDir)
             baseRef.convention("base")
+            printOutput.set(project.printRebuildPatchesOutput())
         }
 
         rebuildPatches {