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

[Commonizer] K/N dist: Process targets in alphabetical order

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-02-18 13:37:59 +03:00
parent f473b88e47
commit 1895c230ef
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt
+1 -1
View File
@@ -15,7 +15,7 @@ internal object NativeTargetsOptionType : OptionType<List<KonanTarget>>("targets
val targets = targetNames.mapTo(HashSet()) { targetName -> val targets = targetNames.mapTo(HashSet()) { targetName ->
predefinedTargets[targetName] ?: onError("Unknown hardware target: $targetName") predefinedTargets[targetName] ?: onError("Unknown hardware target: $targetName")
}.toList() }.sortedBy { it.name }
return Option(this, targets) return Option(this, targets)
} }
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt
+4 -4
View File
@@ -61,7 +61,7 @@ internal class NativeKlibCommonize(options: Collection<Option<*>>) : Task(option
val konanTargets = outputCommonizerTarget.konanTargets val konanTargets = outputCommonizerTarget.konanTargets
val logger = CliLoggerAdapter(2) val logger = CliLoggerAdapter(2)
val libraryLoader = DefaultNativeLibraryLoader(logger) val libraryLoader = DefaultNativeLibraryLoader(logger)
val statsCollector = StatsCollector(statsType, outputCommonizerTarget.konanTargets.toList()) val statsCollector = StatsCollector(statsType, konanTargets.toList())
val repository = FilesRepository(targetLibraries.toSet(), libraryLoader) val repository = FilesRepository(targetLibraries.toSet(), libraryLoader)
val resultsConsumer = buildResultsConsumer { val resultsConsumer = buildResultsConsumer {
@@ -75,10 +75,10 @@ internal class NativeKlibCommonize(options: Collection<Option<*>>) : Task(option
LibraryCommonizer( LibraryCommonizer(
konanDistribution = distribution, konanDistribution = distribution,
repository = repository, repository = repository,
dependencies = KonanDistributionRepository(distribution, outputCommonizerTarget.konanTargets, libraryLoader) + dependencies = KonanDistributionRepository(distribution, konanTargets, libraryLoader) +
FilesRepository(dependencyLibraries.toSet(), libraryLoader), FilesRepository(dependencyLibraries.toSet(), libraryLoader),
libraryLoader = libraryLoader, libraryLoader = libraryLoader,
targets = outputCommonizerTarget.konanTargets.toList(), targets = konanTargets.toList(),
resultsConsumer = resultsConsumer, resultsConsumer = resultsConsumer,
statsCollector = statsCollector, statsCollector = statsCollector,
logger = logger logger = logger
@@ -103,7 +103,7 @@ internal class NativeDistributionCommonize(options: Collection<Option<*>>) : Tas
val logger = CliLoggerAdapter(2) val logger = CliLoggerAdapter(2)
val libraryLoader = DefaultNativeLibraryLoader(logger) val libraryLoader = DefaultNativeLibraryLoader(logger)
val repository = KonanDistributionRepository(distribution, targets.toSet(), libraryLoader) val repository = KonanDistributionRepository(distribution, targets.toSet(), libraryLoader)
val statsCollector = StatsCollector(statsType, targets.toList()) val statsCollector = StatsCollector(statsType, targets)
val resultsConsumer = buildResultsConsumer { val resultsConsumer = buildResultsConsumer {
this add ModuleSerializer(destination, NativeDistributionCommonizerOutputLayout) this add ModuleSerializer(destination, NativeDistributionCommonizerOutputLayout)