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

IJPL-36450 cleanup

Browse Source 
GitOrigin-RevId: b26de727c8c4f9d5f839777b7382066c9e220890
This commit is contained in:
Vladimir Krivosheev
2025-10-27 14:46:55 +00:00
committed by intellij-monorepo-bot
parent bc5588f544
commit 456ff6acfe
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/JarPackagerDependencyHelper.kt
+11 -4
View File
@@ -5,10 +5,17 @@ package org.jetbrains.intellij.build
import com.intellij.util.xml.dom.XmlElement
import com.intellij.util.xml.dom.readXmlAsModel
import org.jetbrains.intellij.build.impl.*
import org.jetbrains.intellij.build.impl.ModuleItem
import org.jetbrains.intellij.build.impl.ModuleOutputPatcher
import org.jetbrains.intellij.build.impl.PluginLayout
import org.jetbrains.intellij.build.impl.findFileInModuleSources
import org.jetbrains.jps.model.java.JpsJavaClasspathKind
import org.jetbrains.jps.model.java.JpsJavaExtensionService
import org.jetbrains.jps.model.module.*
import org.jetbrains.jps.model.module.JpsDependencyElement
import org.jetbrains.jps.model.module.JpsLibraryDependency
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.model.module.JpsModuleDependency
import org.jetbrains.jps.model.module.JpsModuleReference
import java.io.StringReader
import java.util.concurrent.ConcurrentHashMap
@@ -66,9 +73,9 @@ internal class JarPackagerDependencyHelper(private val context: CompilationConte
suspend fun getPluginXmlContent(pluginModule: JpsModule): String {
val path = "META-INF/plugin.xml"
var pluginXmlContent = context.readFileContentFromModuleOutput(pluginModule, path, forTests = false)
var pluginXmlContent = context.readFileContentFromModuleOutput(module = pluginModule, relativePath = path, forTests = false)
if (useTestSourceEnabled && pluginXmlContent == null) {
pluginXmlContent = context.readFileContentFromModuleOutput(pluginModule, path, forTests = true)
pluginXmlContent = context.readFileContentFromModuleOutput(module = pluginModule, relativePath = path, forTests = true)
}
return pluginXmlContent?.let { String(it, Charsets.UTF_8) }
?: throw IllegalStateException("$path not found in ${pluginModule.name} module output")