MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Make python auxiliary plugins incompatible with IntelliJ IDEA as they are bundled into python plugin

Browse Source 
+ get rid of python plugin without auxiliary plugins inside

GitOrigin-RevId: 4a74b542be95aa012b7d74755bfffab21c8c0cfe
This commit is contained in:
Alexander Zolotov
2019-09-26 23:23:27 +03:00
committed by intellij-monorepo-bot
parent 82fdcc8c57
commit 4f5dbd65a4
10 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
View File

@@ -3,8 +3,6 @@ package org.jetbrains.intellij.build
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import org.jetbrains.intellij.build.python.PythonCommunityPluginModules
/**
* @author nik
*/
@@ -27,7 +25,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
productLayout.additionalPlatformJars.put("resources.jar", "intellij.idea.community.resources")
productLayout.bundledPluginModules = BUNDLED_PLUGIN_MODULES
productLayout.prepareCustomPluginRepositoryForPublishedPlugins = false
productLayout.compatiblePluginsToIgnore = PythonCommunityPluginModules.PYCHARM_ONLY_PLUGIN_MODULES + ["intellij.java.plugin"]
productLayout.compatiblePluginsToIgnore = ["intellij.java.plugin"]
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
JavaPluginLayout.javaPlugin(false),
CommunityRepositoryModules.androidPlugin([:]),

7
platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
View File

@@ -26,19 +26,17 @@ class PythonCommunityPluginModules {
public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin.resources"
static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", "intellij.python.community.plugin.dependencies",
COMMUNITY_MODULES) {
pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", COMMUNITY_MODULES) {
withProjectLibrary("markdown4j") // Required for ipnb
PYCHARM_ONLY_PLUGIN_MODULES.each { module ->
excludeFromModule(module, "META-INF/plugin.xml")
}
excludeFromModule(PYTHON_COMMUNITY_PLUGIN_MODULE, "META-INF/python-plugin-dependencies.xml")
body.delegate = delegate
body()
}
}
static PluginLayout pythonPlugin(String mainModuleName, String name, String buildPatchesModule, List<String> modules,
static PluginLayout pythonPlugin(String mainModuleName, String name, List<String> modules,
@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
PluginLayout.plugin(mainModuleName) {
directoryName = name
@@ -47,7 +45,6 @@ class PythonCommunityPluginModules {
withModule(module, mainJarName, null)
}
withModule(mainModuleName, mainJarName)
withModule(buildPatchesModule, mainJarName, null)
withResourceFromModule("intellij.python.helpers", "", "helpers")
doNotCreateSeparateJarForLocalizableResources()
withProjectLibrary("libthrift") // Required for "Python Console" in intellij.python.community.impl module

2
python/IntelliLang-python/resources/META-INF/plugin.xml
View File

@@ -4,7 +4,7 @@
<description>This plugin enables language injections</description>
<vendor>JetBrains</vendor>
<depends>com.intellij.modules.python</depends>
<depends>com.intellij.modules.pycharm</depends>
<depends>org.intellij.intelliLang</depends>
<xi:include href="/META-INF/intellilang-python-support.xml" xpointer="xpointer(/idea-plugin/*)"/>

10
python/build/pluginDependencies/META-INF/python-plugin-dependencies.xml
View File

@@ -1,10 +0,0 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- This version of python-plugin-dependencies.xml is used in release versions of the
Python plugin and contains the real list of optional dependencies for the Python plugin.
-->
<depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
<depends optional="true" config-file="python-copyright-plugin.xml">com.intellij.copyright</depends>
<depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
<depends optional="true" config-file="python-terminal-plugin.xml">org.jetbrains.plugins.terminal</depends>
</idea-plugin>

11
python/build/pluginDependencies/intellij.python.community.plugin.dependencies.iml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

9
python/pluginResources/META-INF/plugin.xml
View File

@@ -23,9 +23,8 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
<depends optional="true" config-file="python-plugin-rider.xml">com.intellij.modules.rider</depends>
<depends optional="true" config-file="python-plugin-dbide.xml">com.intellij.modules.datagrip</depends>
<depends optional="true" config-file="python-plugin-goland.xml">com.intellij.modules.go</depends>
<!-- Two different versions of this file exist: one is used when building from sources (when auxiliary
plugins are loaded as separate plugins) and another is used for the real release build (when auxiliary
plugins are packed inside the Python plugin jar) -->
<xi:include href="/META-INF/python-plugin-dependencies.xml" xpointer="xpointer(/idea-plugin/*)"/>
<depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
<depends optional="true" config-file="python-copyright-plugin.xml">com.intellij.copyright</depends>
<depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
<depends optional="true" config-file="python-terminal-plugin.xml">org.jetbrains.plugins.terminal</depends>
</idea-plugin>

10
python/pluginResources/META-INF/python-plugin-dependencies.xml
View File

@@ -1,10 +0,0 @@
<idea-plugin>
<!-- This version of python-plugin-dependencies.xml is used when running IntelliJ IDEA with
Python plugin from sources. In this configuration, all auxiliary modules (intellij.python.javascript.debugger,
intellij.python.localization etc.) are loaded as separate plugins, so they mustnt' be loaded again as
parts of the Python plugin.
The version of python-plugin-dependencies.xml used in production builds can be found under the
'build' directory.
-->
</idea-plugin>

2
python/python-copyright/resources/META-INF/plugin.xml
View File

@@ -3,7 +3,7 @@
<id>org.jetbrains.plugins.python-copyright</id>
<vendor>JetBrains</vendor>
<depends>com.intellij.modules.python</depends>
<depends>com.intellij.modules.pycharm</depends>
<depends>com.intellij.copyright</depends>
<xi:include href="/META-INF/python-copyright-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>

2
python/python-rest/resources/META-INF/plugin.xml
View File

@@ -2,7 +2,7 @@
<name>Python ReStructureText Integration</name>
<id>org.jetbrains.plugins.python-rest</id>
<vendor>JetBrains</vendor>
<depends>com.intellij.modules.python</depends>
<depends>com.intellij.modules.pycharm</depends>
<depends>org.jetbrains.plugins.rest</depends>
<xi:include href="/META-INF/python-rest-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>

2
python/python-terminal/resources/META-INF/plugin.xml
View File

@@ -3,7 +3,7 @@
<id>org.jetbrains.plugins.python-terminal</id>
<vendor>JetBrains</vendor>
<depends>com.intellij.modules.python</depends>
<depends>com.intellij.modules.pycharm</depends>
<depends>org.jetbrains.plugins.terminal</depends>
<xi:include href="/META-INF/python-terminal-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>