Fix Windows-specific klib bugs

This commit is contained in:
Svyatoslav Scherbina
2017-05-27 10:29:51 +03:00
committed by SvyatoslavScherbina
parent 9c35fbf91a
commit ed60732058
3 changed files with 6 additions and 4 deletions
@@ -82,9 +82,9 @@ interface SplitLibraryScheme {
val linkdataDir
get() = File(libDir, "linkdata")
val moduleHeaderFile
get() = File(linkdataDir, "<module>")
get() = File(linkdataDir, "module")
fun packageFile(packageName: String)
= File(linkdataDir, if (packageName == "") "<root>" else packageName)
= File(linkdataDir, if (packageName == "") "root_package" else "package_$packageName")
}
class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int,
@@ -58,7 +58,9 @@ internal class SplitMetadataGenerator(override val libDir: File): SplitLibrarySc
"module_name" to "${linkData.moduleName}"
))
moduleHeaderFile.writeText(linkData.module)
header.store(manifestFile.outputStream(), null)
manifestFile.outputStream().use {
header.store(it, null)
}
linkData.fragments.forEachIndexed { index, it ->
val name = linkData.fragmentNames[index]
@@ -69,7 +69,7 @@ class File(val path: String) {
private val File.zipUri: URI
get() = URI.create("jar:file:${this.absolutePath}")
get() = URI.create("jar:${this.toPath().toUri()}")
private val File.zipRootPath: Path
get() {