MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

GitHub plugin is split into community and ultimate parts which should be published with the same ID if not bundled

Browse Source 
GitOrigin-RevId: 7673da63563b1b8005cc8259440ff2e8cfd32c2b
This commit is contained in:
Dmitriy.Panov
2024-07-05 16:20:31 +02:00
committed by intellij-monorepo-bot
parent e86bc97da1
commit 8a5ada0dcf
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt
View File

@@ -2,7 +2,6 @@
package org.jetbrains.intellij.build
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.plus
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.jetbrains.intellij.build.impl.qodana.QodanaProductProperties
@@ -62,7 +61,6 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde
JavaPluginLayout.javaPlugin(),
CommunityRepositoryModules.androidPlugin(allPlatforms = true),
CommunityRepositoryModules.groovyPlugin(),
CommunityRepositoryModules.githubPlugin("intellij.vcs.github.community"),
))
productLayout.addPlatformSpec { layout, _ ->

10
platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
View File

@@ -210,7 +210,8 @@ object CommunityRepositoryModules {
"intellij.driver.client"
)
),
pluginAuto(listOf("intellij.performanceTesting.ui"))
pluginAuto(listOf("intellij.performanceTesting.ui")),
githubPlugin("intellij.vcs.github.community", kind = "community"),
)
val CONTRIB_REPOSITORY_PLUGINS: List<PluginLayout> = java.util.List.of(
@@ -642,13 +643,16 @@ object CommunityRepositoryModules {
}
}
fun githubPlugin(mainModuleName: String): PluginLayout {
fun githubPlugin(mainModuleName: String, kind: String): PluginLayout {
return plugin(mainModuleName) { spec ->
spec.directoryName = "vcs-github"
spec.directoryName = "vcs-github-$kind"
spec.mainJarName = "vcs-github.jar"
spec.withModules(listOf(
"intellij.vcs.github"
))
spec.withCustomVersion { _, version, _ ->
PluginVersionEvaluatorResult(pluginVersion = "$version-$kind")
}
}
}

5
python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
View File

@@ -3,7 +3,6 @@ package org.jetbrains.intellij.build.pycharm
import kotlinx.collections.immutable.persistentMapOf
import kotlinx.collections.immutable.persistentSetOf
import kotlinx.collections.immutable.plus
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.impl.qodana.QodanaProductProperties
import org.jetbrains.intellij.build.io.copyFileToDir
@@ -38,10 +37,6 @@ class PyCharmCommunityProperties(private val communityHome: Path) : PyCharmPrope
Files.readAllLines(communityHome.resolve("python/build/plugin-list.txt"))
)
productLayout.pluginLayouts = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS.addAll(listOf(
CommunityRepositoryModules.githubPlugin("intellij.vcs.github.community")
)
)
productLayout.pluginModulesToPublish = persistentSetOf("intellij.python.community.plugin")
baseDownloadUrl = "https://download.jetbrains.com/python/"