mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 08:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

redo addon bundling

Browse Source
This commit is contained in:
dfsek 2022-05-31 22:31:51 -07:00
parent 839013d89a
commit 675a4465d7
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
buildSrc/src/main/kotlin/DistributionConfig.kt
View File

@ -1,11 +1,10 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import java.io.File import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.FileWriter import java.io.FileWriter
import java.net.URL import java.net.URL
import java.util.zip.ZipEntry import java.nio.file.FileSystems
import java.util.zip.ZipOutputStream import java.nio.file.Files
import java.nio.file.StandardCopyOption
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.plugins.BasePluginExtension
@ -39,41 +38,32 @@ fun Project.configureDistribution() {
} }
doLast { doLast {
// The addons are copied into a JAR because of a ShadowJar bug
// which expands *all* JARs, even resource ones, into the fat JAR.
// To get around this, we copy all addon JARs into a *new* JAR,
// then, ShadowJar expands the newly created JAR, putting the original
// JARs where they should go.
//
// https://github.com/johnrengelman/shadow/issues/111 // https://github.com/johnrengelman/shadow/issues/111
val dest = File(buildDir, "/resources/main/addons.jar") val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toPath()
dest.parentFile.mkdirs()
val zip = ZipOutputStream(FileOutputStream(dest))
FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
forSubProjects(":common:addons") { forSubProjects(":common:addons") {
val jar = getJarTask() val jar = getJarTask()
println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}. size: ${jar.archiveFile.get().asFile.length() / 1024}KB") println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else "" val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}");
if(!Files.exists(addonPath)) {
Files.createDirectories(addonPath.parent)
Files.createFile(addonPath)
Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
}
val entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}")
zip.putNextEntry(entry)
FileInputStream(jar.archiveFile.get().asFile).run {
copyTo(zip)
close()
} }
zip.closeEntry()
} }
zip.close()
} }
} }
val generateResourceManifest = tasks.create("generateResourceManifest") { val generateResourceManifest = tasks.create("generateResourceManifest") {
group = "terra" group = "terra"
dependsOn(downloadDefaultPacks) dependsOn(downloadDefaultPacks)
dependsOn(installAddons)
doLast { doLast {
val resources = HashMap<String, MutableList<String>>() val resources = HashMap<String, MutableList<String>>()
val packsDir = File("${project.buildDir}/resources/main/packs/") val packsDir = File("${project.buildDir}/resources/main/packs/")
@ -118,6 +108,7 @@ fun Project.configureDistribution() {
tasks["processResources"].dependsOn(generateResourceManifest) tasks["processResources"].dependsOn(generateResourceManifest)
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
// Tell shadow to download the packs // Tell shadow to download the packs
dependsOn(downloadDefaultPacks) dependsOn(downloadDefaultPacks)
@ -129,6 +120,8 @@ fun Project.configureDistribution() {
relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic") relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
relocate("org.json", "com.dfsek.terra.lib.json") relocate("org.json", "com.dfsek.terra.lib.json")
relocate("org.yaml", "com.dfsek.terra.lib.yaml") relocate("org.yaml", "com.dfsek.terra.lib.yaml")
finalizedBy(installAddons)
} }
configure<BasePluginExtension> { configure<BasePluginExtension> {