Skip to content

Include missing resources from modules #2322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soywiz merged 1 commit into from
May 8, 2025
Merged

Include missing resources from modules #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/ModuleResources.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))
}
}
}
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,6 +20,7 @@ fun Project.configureWebpack() {
from(project.tasks.getByName("jsProcessResources").outputs.files)
from(jsFile)
from(mapFile)
registerModulesResources(project)
into(wwwFolder)
}
}
16 changes: 3 additions & 13 deletions buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*
Expand Down Expand Up @@ -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<Task>("browserPrepareEsbuildPrepare") {
Expand Down
Loading