mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-21 07:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

maybe fix empty jar issue

Browse Source
This commit is contained in:
dfsek
2021-12-25 12:56:57 -07:00
parent a0a05436a0
commit d10a1d1660
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ fun Project.configureDistribution() {
} }
} }
doFirst { doLast {
// The addons are copied into a JAR because of a ShadowJar bug // The addons are copied into a JAR because of a ShadowJar bug
// which expands *all* JARs, even resource ones, into the fat JAR. // which expands *all* JARs, even resource ones, into the fat JAR.
// To get around this, we copy all addon JARs into a *new* JAR, // To get around this, we copy all addon JARs into a *new* JAR,
@@ -53,13 +53,16 @@ fun Project.configureDistribution() {
forSubProjects(":common:addons") { forSubProjects(":common:addons") {
val jar = (tasks.named("jar").get() as Jar) val jar = (tasks.named("jar").get() as Jar)
println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}.") println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}. 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 entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}") val entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}")
zip.putNextEntry(entry) zip.putNextEntry(entry)
FileInputStream(jar.archiveFile.get().asFile).copyTo(zip) FileInputStream(jar.archiveFile.get().asFile).run {
copyTo(zip)
close()
}
zip.closeEntry() zip.closeEntry()
} }
zip.close() zip.close()
@@ -70,7 +73,7 @@ fun Project.configureDistribution() {
group = "terra" group = "terra"
dependsOn(downloadDefaultPacks) dependsOn(downloadDefaultPacks)
dependsOn(installAddons) dependsOn(installAddons)
doFirst { 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/")