From f89e3a2d198e95a619bd8cfe33d1cbdd380b34a8 Mon Sep 17 00:00:00 2001 From: David Herman Date: Wed, 2 Oct 2024 23:08:53 -0700 Subject: [PATCH] Update the task that creates start.bat / start.sh scripts to take export layout into account --- .../kobweb/gradle/application/KobwebApplicationPlugin.kt | 3 ++- .../application/tasks/KobwebCreateServerScriptsTask.kt | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/KobwebApplicationPlugin.kt b/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/KobwebApplicationPlugin.kt index a7063ad2e..0e373def3 100644 --- a/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/KobwebApplicationPlugin.kt +++ b/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/KobwebApplicationPlugin.kt @@ -128,7 +128,8 @@ class KobwebApplicationPlugin @Inject constructor( val kobwebUnpackServerJarTask = project.tasks.register("kobwebUnpackServerJar") val kobwebCreateServerScriptsTask = project.tasks - .register("kobwebCreateServerScripts") + .register("kobwebCreateServerScripts", exportLayout) + val kobwebStartTask = run { val reuseServer = project.findProperty("kobwebReuseServer")?.toString()?.toBoolean() ?: true project.tasks.register( diff --git a/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/tasks/KobwebCreateServerScriptsTask.kt b/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/tasks/KobwebCreateServerScriptsTask.kt index b7a9c665c..3a72c955f 100644 --- a/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/tasks/KobwebCreateServerScriptsTask.kt +++ b/tools/gradle-plugins/application/src/main/kotlin/com/varabyte/kobweb/gradle/application/tasks/KobwebCreateServerScriptsTask.kt @@ -6,13 +6,15 @@ import com.varabyte.kobweb.gradle.application.util.getServerJar import com.varabyte.kobweb.gradle.core.tasks.KobwebTask import com.varabyte.kobweb.server.api.ServerEnvironment import com.varabyte.kobweb.server.api.SiteLayout +import org.gradle.api.tasks.Input import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import javax.inject.Inject /** * A simple task for creating scripts which can be used to run the Kobweb server in production mode. */ -abstract class KobwebCreateServerScriptsTask : +abstract class KobwebCreateServerScriptsTask @Inject constructor(@get:Input val siteLayout: SiteLayout) : KobwebTask("Create scripts which can be used to start the Kobweb server in production mode") { @OutputFile fun getServerStartShellScript() = @@ -25,7 +27,7 @@ abstract class KobwebCreateServerScriptsTask : fun execute() { val javaArgs = listOf( ServerEnvironment.PROD.toSystemPropertyParam(), - SiteLayout.FULLSTACK.toSystemPropertyParam(), + siteLayout.toSystemPropertyParam(), "-Dio.ktor.development=false", "-jar", kobwebApplication.kobwebFolder.getServerJar().absolutePath.let {