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

Fix klib install gradle task

Browse Source 
(cherry picked from commit a36abd282efab4568fceb92f8102e13fcac359fd)
This commit is contained in:
Roman Artemev
2020-12-25 10:57:22 +03:00
committed by Vasily Levchenko
parent 3127da287f
commit 67fa7c779a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+13 -10
View File
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION_WITH_DOT
import org.jetbrains.kotlin.konan.target.Distribution import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.target.PlatformManager import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.konan.util.DependencyProcessor import org.jetbrains.kotlin.konan.util.DependencyProcessor
@@ -27,8 +26,10 @@ import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import org.jetbrains.kotlin.konan.library.KonanLibrary import org.jetbrains.kotlin.konan.library.KonanLibrary
import org.jetbrains.kotlin.konan.library.resolverByName import org.jetbrains.kotlin.konan.library.resolverByName
import org.jetbrains.kotlin.konan.util.KonanHomeProvider import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION_WITH_DOT
import org.jetbrains.kotlin.library.metadata.parseModuleHeader import org.jetbrains.kotlin.library.metadata.parseModuleHeader
import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.util.removeSuffixIfPresent
import kotlin.system.exitProcess import kotlin.system.exitProcess
internal val KlibFactories = KlibMetadataFactories(::KonanBuiltIns, DynamicTypeDeserializer, PlatformDependentTypeTransformer.None) internal val KlibFactories = KlibMetadataFactories(::KonanBuiltIns, DynamicTypeDeserializer, PlatformDependentTypeTransformer.None)
@@ -106,11 +107,11 @@ open class ModuleDeserializer(val library: ByteArray) {
} }
class Library(val name: String, val requestedRepository: String?, val target: String) { class Library(val libraryNameOrPath: String, val requestedRepository: String?, val target: String) {
val repository = requestedRepository?.File() ?: defaultRepository val repository = requestedRepository?.File() ?: defaultRepository
fun info() { fun info() {
val library = libraryInRepoOrCurrentDir(repository, name) val library = libraryInRepoOrCurrentDir(repository, libraryNameOrPath)
val headerAbiVersion = library.versions.abiVersion val headerAbiVersion = library.versions.abiVersion
val headerCompilerVersion = library.versions.compilerVersion val headerCompilerVersion = library.versions.compilerVersion
val headerLibraryVersion = library.versions.libraryVersion val headerLibraryVersion = library.versions.libraryVersion
@@ -139,20 +140,22 @@ class Library(val name: String, val requestedRepository: String?, val target: St
repository.mkdirs() repository.mkdirs()
} }
Library(File(name).name.removeSuffix(KLIB_FILE_EXTENSION_WITH_DOT), requestedRepository, target).remove(true) val libraryTrueName = File(libraryNameOrPath).name.removeSuffixIfPresent(KLIB_FILE_EXTENSION_WITH_DOT)
val library = libraryInCurrentDir(libraryNameOrPath)
val library = libraryInCurrentDir(name) val installLibDir = File(repository, libraryTrueName)
val newLibDir = File(repository, library.libraryFile.name.removeSuffix(KLIB_FILE_EXTENSION_WITH_DOT))
library.libraryFile.unpackZippedKonanLibraryTo(newLibDir) if (installLibDir.exists) installLibDir.deleteRecursively()
library.libraryFile.unpackZippedKonanLibraryTo(installLibDir)
} }
fun remove(blind: Boolean = false) { fun remove(blind: Boolean = false) {
if (!repository.exists) error("Repository does not exist: $repository") if (!repository.exists) error("Repository does not exist: $repository")
val library = try { val library = try {
val library = libraryInRepo(repository, name) val library = libraryInRepo(repository, libraryNameOrPath)
if (blind) warn("Removing The previously installed $name from $repository.") if (blind) warn("Removing The previously installed $libraryNameOrPath from $repository.")
library library
} catch (e: Throwable) { } catch (e: Throwable) {
@@ -180,7 +183,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St
private fun loadModule(): ModuleDescriptor { private fun loadModule(): ModuleDescriptor {
val storageManager = LockBasedStorageManager("klib") val storageManager = LockBasedStorageManager("klib")
val library = libraryInRepoOrCurrentDir(repository, name) val library = libraryInRepoOrCurrentDir(repository, libraryNameOrPath)
val versionSpec = LanguageVersionSettingsImpl(currentLanguageVersion, currentApiVersion) val versionSpec = LanguageVersionSettingsImpl(currentLanguageVersion, currentApiVersion)
val module = KlibFactories.DefaultDeserializedDescriptorFactory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager, null) val module = KlibFactories.DefaultDeserializedDescriptorFactory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager, null)