azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Klib path component is not required anymore.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-10-05 17:19:23 +03:00
committed by alexander-gorshenev
parent 0efa78d4a0
commit a4f8333c94
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+2 -3
View File
@@ -74,7 +74,7 @@ fun error(text: String) {
} }
// TODO: Get rid of the hardcoded path. // TODO: Get rid of the hardcoded path.
val defaultRepository = File(File.userHome, ".konan") val defaultRepository = File(File.userHome, ".konan/klib")
class Library(val name: String, val requestedRepository: String?, val target: String) { class Library(val name: String, val requestedRepository: String?, val target: String) {
@@ -97,8 +97,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St
Library(File(name).name.removeSuffix(".klib"), requestedRepository, target).remove(true) Library(File(name).name.removeSuffix(".klib"), requestedRepository, target).remove(true)
val library = ZippedKonanLibrary(libraryInCurrentDir(name)) val library = ZippedKonanLibrary(libraryInCurrentDir(name))
val newLocation = File(repository, "klib") val newLibDir = File(repository, library.libraryName.File().name)
val newLibDir = File(newLocation, library.libraryName.File().name)
newLibDir.mkdirs() newLibDir.mkdirs()
library.unpackTo(newLibDir) library.unpackTo(newLibDir)
} }