mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
CPP-434 Rename [python-configure] to [python-community-configure] and associative changes in XML file names, change clion plugin <id>
This commit is contained in:
@@ -29,7 +29,7 @@ private List<String> pycharmPlatformApiModules() {
|
||||
|
||||
private List pycharmImplementationModules() { //modules to put into pycharm.jar
|
||||
return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
|
||||
"python-ide-community", "python-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
|
||||
"python-ide-community", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
|
||||
}
|
||||
|
||||
private List modules() {
|
||||
|
||||
@@ -49,7 +49,7 @@ private List<String> pycharmPlatformApiModules() {
|
||||
|
||||
private List pycharmImplementationModules() { //modules to put into pycharm.jar
|
||||
return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
|
||||
"python-ide-community", "python-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
|
||||
"python-ide-community", "python-community-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
|
||||
}
|
||||
|
||||
private List modules() {
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="lang-impl" />
|
||||
<orderEntry type="module" module-name="python-community-ide-resources" />
|
||||
<orderEntry type="module" module-name="python-community" />
|
||||
<orderEntry type="module" module-name="python-community-configure" />
|
||||
<orderEntry type="module" module-name="platform-impl" />
|
||||
<orderEntry type="module" module-name="python-ide-community" />
|
||||
<orderEntry type="library" name="gson" level="project" />
|
||||
@@ -20,6 +21,5 @@
|
||||
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
|
||||
<orderEntry type="module" module-name="educational" />
|
||||
<orderEntry type="module" module-name="python-educational" />
|
||||
<orderEntry type="module" module-name="python-configure" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -10,7 +10,7 @@
|
||||
<orderEntry type="module" module-name="platform-impl" />
|
||||
<orderEntry type="module" module-name="python-community-ide-resources" />
|
||||
<orderEntry type="module" module-name="python-community" />
|
||||
<orderEntry type="module" module-name="python-configure" />
|
||||
<orderEntry type="module" module-name="python-community-configure" />
|
||||
<orderEntry type="module" module-name="lang-api" />
|
||||
<orderEntry type="module" module-name="lang-impl" />
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
|
||||
<xi:fallback/>
|
||||
</xi:include>
|
||||
<xi:include href="/META-INF/python-configure.xml" xpointer="xpointer(/idea-plugin/*)"/>
|
||||
<xi:include href="/META-INF/python-community-configure-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
|
||||
|
||||
<application-components>
|
||||
<component>
|
||||
|
||||
+1
-3
@@ -1,9 +1,7 @@
|
||||
<idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
|
||||
<!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
|
||||
<!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
|
||||
Both Community and Professional editions. -->
|
||||
|
||||
<!-- Components and extensions declared in this file work in CLion Python Plugin to configure Python toolchain -->
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
|
||||
serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
<!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
|
||||
Both Community and Professional editions. -->
|
||||
|
||||
<xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
|
||||
<xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<projectConfigurable groupId="project"
|
||||
id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
|
||||
-1
@@ -19,7 +19,6 @@ import com.intellij.ide.DataManager;
|
||||
import com.intellij.openapi.options.ex.Settings;
|
||||
import com.intellij.ui.ClickListener;
|
||||
import com.intellij.ui.components.JBLabel;
|
||||
import com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.swing.*;
|
||||
-1
@@ -19,7 +19,6 @@ import com.intellij.openapi.module.ModuleManager;
|
||||
import com.intellij.openapi.options.Configurable;
|
||||
import com.intellij.openapi.options.ConfigurableProvider;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.jetbrains.python.configuration.PyDependenciesConfigurable;
|
||||
|
||||
/**
|
||||
* @author Sergey.Malenkov
|
||||
Reference in New Issue
Block a user