MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use pluginAuto for Ruby, fix auto for verifier

Browse Source 
GitOrigin-RevId: 125c1496d7283770c9c025b1f68e2c001c90a6ac
This commit is contained in:
Vladimir Krivosheev
2024-04-09 15:37:43 +00:00
committed by intellij-monorepo-bot
parent 83655b4ba3
commit 4100e96bfd
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+24 -19
View File
@@ -32,6 +32,7 @@ import java.io.File
import java.nio.ByteBuffer
import java.nio.file.*
import java.util.*
import kotlin.collections.LinkedHashSet
import kotlin.io.path.invariantSeparatorsPathString
import kotlin.io.path.readLines
@@ -288,24 +289,6 @@ class JarPackager private constructor(
)
}
// check verifier in all included modules
for (includedModule in layout.includedModules) {
for (name in helper.getModuleDependencies(includedModule.moduleName)) {
if (name != "intellij.platform.commercial.verifier" || addedModules.contains(name)) {
continue
}
val moduleItem = ModuleItem(moduleName = name, relativeOutputFile = layout.getMainJarName(), reason = "<- ${layout.mainModule}")
addedModules.add(name)
computeSourcesForModule(
item = moduleItem,
moduleOutputPatcher = moduleOutputPatcher,
layout = layout,
moduleWithSearchableOptions = moduleWithSearchableOptions,
)
}
}
if (layout.mainModule == "intellij.pycharm.ds.remoteInterpreter") {
// todo PyCharm team why this module is being incorrectly published
return
@@ -316,7 +299,7 @@ class JarPackager private constructor(
readXmlAsModel(file).getChild("content")?.let { content ->
for (module in content.children("module")) {
val moduleName = module.attributes.get("name")
if (moduleName == null || moduleName.contains('/') || addedModules.contains(moduleName)) {
if (moduleName == null || moduleName.contains('/') || !addedModules.add(moduleName)) {
continue
}
@@ -332,6 +315,28 @@ class JarPackager private constructor(
)
}
}
// check verifier in all included modules
val effectiveIncludedNonMainModules = LinkedHashSet<String>(layout.includedModules.size + addedModules.size)
layout.includedModules.mapTo(effectiveIncludedNonMainModules) { it.moduleName }
effectiveIncludedNonMainModules.remove(layout.mainModule)
effectiveIncludedNonMainModules.addAll(addedModules)
for (moduleName in effectiveIncludedNonMainModules) {
for (name in helper.getModuleDependencies(moduleName)) {
if (name != "intellij.platform.commercial.verifier" || addedModules.contains(name)) {
continue
}
val moduleItem = ModuleItem(moduleName = name, relativeOutputFile = layout.getMainJarName(), reason = "<- ${layout.mainModule}")
addedModules.add(name)
computeSourcesForModule(
item = moduleItem,
moduleOutputPatcher = moduleOutputPatcher,
layout = layout,
moduleWithSearchableOptions = moduleWithSearchableOptions,
)
}
}
}
private suspend fun computeSourcesForModule(