diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/ModuleResources.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/ModuleResources.kt new file mode 100644 index 000000000..49f354b16 --- /dev/null +++ b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/ModuleResources.kt @@ -0,0 +1,14 @@ +package korlibs.korge.gradle.targets + +import org.gradle.api.* +import org.gradle.api.file.* +import java.io.* + +fun CopySpec.registerModulesResources(project: Project) { + project.afterEvaluate { + for (file in (project.rootDir.resolve("modules").listFiles()?.toList() ?: emptyList())) { + from(File(file, "resources")) + from(File(file, "src/commonMain/resources")) + } + } +} diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt index 5dbfbd0bb..6de0a1274 100644 --- a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt +++ b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt @@ -1,5 +1,6 @@ package korlibs.korge.gradle.targets.js +import korlibs.korge.gradle.targets.* import korlibs.korge.gradle.util.* import org.gradle.api.* import org.gradle.api.tasks.Copy @@ -19,6 +20,7 @@ fun Project.configureWebpack() { from(project.tasks.getByName("jsProcessResources").outputs.files) from(jsFile) from(mapFile) + registerModulesResources(project) into(wwwFolder) } } diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt index a1beb0f25..a73b6c0ca 100644 --- a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt +++ b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt @@ -1,6 +1,7 @@ package korlibs.korge.gradle.targets.js import korlibs.korge.gradle.* +import korlibs.korge.gradle.targets.* import korlibs.korge.gradle.util.* import org.gradle.api.* import org.gradle.api.file.* @@ -64,20 +65,9 @@ fun Project.configureErrorableEsbuild() { duplicatesStrategy = DuplicatesStrategy.EXCLUDE from(project.tasks.getByName("jsProcessResources").outputs.files) - //afterEvaluate { - // project.tasks.findByName(getKorgeProcessResourcesTaskName("js", "main"))?.outputs?.files?.let { - // from(it) - // } - //} - //for (sourceSet in gkotlin.js().compilations.flatMap { it.kotlinSourceSets }) from(sourceSet.resources) + //from(kotlin.targets.getByName("js").compilations.main.defaultSourceSet.resources) + registerModulesResources(project) into(wwwFolder) - //afterEvaluate { - // afterEvaluate { - // val korgeGeneratedTask = project.tasks.findByName(korgeProcessResourcesTaskName) as? KorgeGenerateResourcesTask? - // println("korgeGeneratedTaskName=$korgeGeneratedTask : korgeProcessResourcesTaskName=$korgeProcessResourcesTaskName") - // korgeGeneratedTask?.addExcludeToCopyTask(this) - // } - //} } val browserPrepareEsbuildPrepare = tasks.createThis("browserPrepareEsbuildPrepare") {