Renamed SplitScheme to SplitLibraryScheme.
This commit is contained in:
committed by
alexander-gorshenev
parent
ff86c16fc9
commit
1b30f0988b
+1
-1
@@ -44,9 +44,9 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal val libraries: List<KonanLibraryReader> by lazy {
|
internal val libraries: List<KonanLibraryReader> by lazy {
|
||||||
// Here we have chosen a particular KonanLibraryReader implementation
|
|
||||||
val currentAbiVersion = configuration.get(KonanConfigKeys.ABI_VERSION)!!
|
val currentAbiVersion = configuration.get(KonanConfigKeys.ABI_VERSION)!!
|
||||||
val target = targetManager.currentName
|
val target = targetManager.currentName
|
||||||
|
// Here we have chosen a particular KonanLibraryReader implementation.
|
||||||
libraryNames.map{it -> SplitLibraryReader(it, currentAbiVersion, target)}
|
libraryNames.map{it -> SplitLibraryReader(it, currentAbiVersion, target)}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -62,7 +62,7 @@ abstract open class FileBasedLibraryReader(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This scheme describes the Konan Library (klib) layout.
|
// This scheme describes the Konan Library (klib) layout.
|
||||||
interface SplitScheme {
|
interface SplitLibraryScheme {
|
||||||
val libDir: File
|
val libDir: File
|
||||||
val target: String?
|
val target: String?
|
||||||
// This is a default implementation. Can't make it an assignment.
|
// This is a default implementation. Can't make it an assignment.
|
||||||
@@ -90,7 +90,7 @@ interface SplitScheme {
|
|||||||
class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int,
|
class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int,
|
||||||
override val target: String) :
|
override val target: String) :
|
||||||
FileBasedLibraryReader(libDir, currentAbiVersion, SplitMetadataReader(libDir)),
|
FileBasedLibraryReader(libDir, currentAbiVersion, SplitMetadataReader(libDir)),
|
||||||
SplitScheme {
|
SplitLibraryScheme {
|
||||||
|
|
||||||
public constructor(path: String, currentAbiVersion: Int, target: String) :
|
public constructor(path: String, currentAbiVersion: Int, target: String) :
|
||||||
this(File(path), currentAbiVersion, target)
|
this(File(path), currentAbiVersion, target)
|
||||||
@@ -145,7 +145,7 @@ abstract class FileBasedLibraryWriter (
|
|||||||
}
|
}
|
||||||
|
|
||||||
class SplitLibraryWriter(override val libDir: File, override val target: String?,
|
class SplitLibraryWriter(override val libDir: File, override val target: String?,
|
||||||
val nopack: Boolean = false): FileBasedLibraryWriter(libDir), SplitScheme {
|
val nopack: Boolean = false): FileBasedLibraryWriter(libDir), SplitLibraryScheme {
|
||||||
|
|
||||||
public constructor(path: String, target: String, nopack: Boolean):
|
public constructor(path: String, target: String, nopack: Boolean):
|
||||||
this(File(path), target, nopack)
|
this(File(path), target, nopack)
|
||||||
|
|||||||
+2
-2
@@ -26,7 +26,7 @@ interface MetadataReader {
|
|||||||
fun loadSerializedPackageFragment(fqName: String): String
|
fun loadSerializedPackageFragment(fqName: String): String
|
||||||
}
|
}
|
||||||
|
|
||||||
class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitScheme {
|
class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitLibraryScheme {
|
||||||
|
|
||||||
override fun loadSerializedModule(currentAbiVersion: Int): NamedModuleData {
|
override fun loadSerializedModule(currentAbiVersion: Int): NamedModuleData {
|
||||||
val header = Properties()
|
val header = Properties()
|
||||||
@@ -47,7 +47,7 @@ class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitSche
|
|||||||
= packageFile(fqName).readText()
|
= packageFile(fqName).readText()
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class SplitMetadataGenerator(override val libDir: File): SplitScheme {
|
internal class SplitMetadataGenerator(override val libDir: File): SplitLibraryScheme {
|
||||||
|
|
||||||
fun addLinkData(linkData: LinkData) {
|
fun addLinkData(linkData: LinkData) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user