Slightly tweaked klib utility to work with suffix-less klib names.

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt

@@ -89,11 +89,11 @@ interface SplitLibraryScheme {
 }
 
 class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int,
-        override val target: String) : 
+        override val target: String?) :
       FileBasedLibraryReader(libDir, currentAbiVersion, SplitMetadataReader(libDir)), 
       SplitLibraryScheme  {
 
-    public constructor(path: String, currentAbiVersion: Int, target: String) : 
+    public constructor(path: String, currentAbiVersion: Int, target: String?) :
         this(File(path), currentAbiVersion, target) 
 
     init {

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt

@@ -26,16 +26,16 @@ interface SearchPathResolver {
 }
 
 class KonanLibrarySearchPathResolver(repositories: List<String>,
-    val distributionKlib: String, val localKonanDir: String): SearchPathResolver {
+    val distributionKlib: String?, val localKonanDir: String?, val skipCurrentDir: Boolean = false): SearchPathResolver {
 
-    val localHead: File
+    val localHead: File?
-        get() = File(localKonanDir).klib
+        get() = localKonanDir?.File()?.klib
 
-    val distHead: File
+    val distHead: File?
-        get() = File(distributionKlib)
+        get() = distributionKlib?.File()
 
-    val currentDirHead: File
+    val currentDirHead: File?
-        get() = File.userDir
+        get() = if (!skipCurrentDir) File.userDir else null
 
     private val repoRoots: List<File> by lazy {
         repositories.map{File(it).klib}
@@ -43,7 +43,7 @@ class KonanLibrarySearchPathResolver(repositories: List<String>,
 
     // This is the place where we specify the order of library search.
     override val searchRoots: List<File> by lazy {
-        listOf(currentDirHead) + repoRoots + listOf(localHead, distHead)
+        (listOf(currentDirHead) + repoRoots + listOf(localHead, distHead)).filterNotNull()
     }
 
     private fun found(candidate: File): File? {
@@ -68,10 +68,10 @@ class KonanLibrarySearchPathResolver(repositories: List<String>,
                 found(File(it, givenPath))?.apply{return this}
             }
         }
-        error("Could not find \"$givenPath\" in any of the provided locations.")
+        error("Could not find \"$givenPath\" in ${searchRoots.map{it.absolutePath}}.")
     }
 
-    private val File.klib 
+    private val File.klib
         get() = File(this, "klib")
 }
 

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt

@@ -64,9 +64,13 @@ class File(val path: String) {
     companion object {
         val userDir
             get() = File(System.getProperty("user.dir"))
+
+        val userHome
+            get() = File(System.getProperty("user.home"))
     }
 }
 
+fun String.File() = File(this)
 
 private val File.zipUri: URI
         get() = URI.create("jar:${this.toPath().toUri()}")

klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt

@@ -1,9 +1,27 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.jetbrains.kotlin.cli.klib
 
 import kotlin.system.exitProcess
 import java.util.Properties
 // TODO: Extract these as a shared jar?
+import org.jetbrains.kotlin.backend.konan.library.SplitLibraryScheme
 import org.jetbrains.kotlin.backend.konan.library.SplitLibraryReader
+import org.jetbrains.kotlin.backend.konan.library.KonanLibrarySearchPathResolver
 import org.jetbrains.kotlin.backend.konan.util.File
 import org.jetbrains.kotlin.backend.konan.util.copyTo
 import org.jetbrains.kotlin.konan.target.TargetManager
@@ -58,24 +76,24 @@ fun error(text: String) {
     exitProcess(1)
 }
 
-class Library(val name: String, val repository: String, val target: String) {
+// TODO: Get rid of the hardcoded path.
+val defaultRepository = File(File.userHome, ".konan")
 
-    val file = File(name)
+class Library(val name: String, val requestedRepository: String?, val target: String) {
-    val repositoryFile = File(repository)
-
-    // TODO: need to do something here.
-    val currentAbiVersion = 1
-
-    val library = SplitLibraryReader(file, currentAbiVersion, target)
-    val manifestFile = library.manifestFile
 
+    val repository = requestedRepository?.File() ?: defaultRepository
     fun info() {
+        val library = libraryInRepoOrCurrentDir(repository, name)
         val header = Properties()
+        val manifestFile = library.manifestFile
         manifestFile.bufferedReader().use { reader ->
             header.load(reader)
         }
         val headerAbiVersion = header.getProperty("abi_version")!!
         val moduleName = header.getProperty("module_name")!!
+
+        println("")
+        println("Resolved to: ${library.libDir.absolutePath}")
         println("Module name: $moduleName")
         println("ABI version: $headerAbiVersion")
         val targets = library.targetsDir.listFiles.map{it.name}.joinToString(", ")
@@ -83,22 +101,34 @@ class Library(val name: String, val repository: String, val target: String) {
     }
 
     fun install() {
-        remove()
+        remove(true) 
-        val baseName = library.klibFile.name
+
-        val newKlibName = File(repositoryFile, baseName)
+        val klibFile = libraryInCurrentDir(name).klibFile
-        library.klibFile.copyTo(newKlibName)
+        val newLocation = File(repository, "klib")
+        newLocation.mkdirs()
+        val newFile = File(newLocation, klibFile.name)
+        klibFile.copyTo(newFile)
     }
 
-    fun remove() {
+    fun remove(blind: Boolean = false) {
-        repositoryFile.mkdirs()
+        if (!repository.exists) error("Repository does not exist: $repository")
-        val baseName = library.klibFile.name
+
-        val newDirName = File(repositoryFile, library.libDir.name)
+        val library = try {
-        val newKlibName = File(repositoryFile, baseName)
+            val library = libraryInRepo(repository, name)
-        newKlibName.deleteRecursively()
+            if (blind) warn("Removing The previously installed $name from $repository.")
-        newDirName.deleteRecursively()
+            library
+
+        } catch (e: Throwable) {
+            if (!blind) println(e.message)
+            null
+
+        }
+        library?.libDir?.deleteRecursively()
+        library?.klibFile?.delete()
     }
 
     fun contents() {
+        val library = libraryInRepoOrCurrentDir(repository, name)
         val moduleName = library.moduleName
         val printer = PrettyPrinter(
             library.tableOfContents, {name -> library.packageMetadata(name)})
@@ -109,20 +139,37 @@ class Library(val name: String, val repository: String, val target: String) {
     }
 }
 
+// TODO: need to do something here.
+val currentAbiVersion = 1
+
+val File.konanLibrary 
+    get() = SplitLibraryReader(this, currentAbiVersion, null)
+
+fun libraryInRepo(repository: File, name: String): SplitLibraryReader {
+    val resolver = KonanLibrarySearchPathResolver(listOf(repository.absolutePath), null, null, skipCurrentDir = true)
+    return resolver.resolve(name).konanLibrary
+}
+
+fun libraryInCurrentDir(name: String): SplitLibraryReader {
+    val resolver = KonanLibrarySearchPathResolver(emptyList(), null, null)
+    return resolver.resolve(name).konanLibrary
+}
+
+fun libraryInRepoOrCurrentDir(repository: File, name: String): SplitLibraryReader {
+    val resolver = KonanLibrarySearchPathResolver(listOf(repository.absolutePath), null, null)
+    return resolver.resolve(name).konanLibrary
+}
+
+
 fun main(args: Array<String>) {
     val command = Command(args)
 
     val targetManager = TargetManager(command.options["target"]?.last())
     val target = targetManager.targetName
 
-    val repository = command.options["repository"]?.last()
+    val repository = command.options["-repository"]?.last()
-    val repositoryList = repository ?.let { listOf(it) } ?: emptyList()
 
-    val userHome = File(System.getProperty("user.home")).absolutePath
+    val library = Library(command.library, repository, target)
-    val userKonan = File(userHome, ".konan")
-    val userRepo = File(userKonan, "klib")
-
-    val library = Library(command.library, repository ?: userRepo.path, target)
 
     warn("IMPORTANT: the library format is unstable now. It can change with any new git commit without warning!")