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

Extracted "impl" modules from Python Community and PyCharm Community Customization to use them in other Python plugins for builds and runs

Browse Source 
The non-impl modules for these plugins now contain more or less just their plugin.xml files
that declare corresponding dependencies.

GitOrigin-RevId: 84fc4761a595912d676cff1e2ab58fba03a8cd22
This commit is contained in:
Andrey Vlasovskikh
2019-11-09 01:37:23 +03:00
committed by intellij-monorepo-bot
parent 095f2887d2
commit 543ca840b7
53 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -698,11 +698,13 @@
<module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" />
<module fileurl="file://$PROJECT_DIR$/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml" filepath="$PROJECT_DIR$/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" />
<module fileurl="file://$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.customization.impl.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.customization.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharm.community.resources.iml" filepath="$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharm.community.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/python/openapi/intellij.python.community.iml" filepath="$PROJECT_DIR$/python/openapi/intellij.python.community.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.impl.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" filepath="$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginCore/impl/intellij.python.community.plugin.impl.iml" filepath="$PROJECT_DIR$/python/pluginCore/impl/intellij.python.community.plugin.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginJava/intellij.python.community.plugin.java.iml" filepath="$PROJECT_DIR$/python/pluginJava/intellij.python.community.plugin.java.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" filepath="$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" />

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

@@ -11,9 +11,8 @@ import org.jetbrains.intellij.build.impl.PluginLayout
class PythonCommunityPluginModules {
static List<String> COMMUNITY_MODULES = [
"intellij.python.community",
"intellij.python.community.plugin",
"intellij.python.community.plugin.impl",
"intellij.python.community.plugin.java",
"intellij.python.community.plugin.minor",
"intellij.python.psi",
"intellij.python.psi.impl",
"intellij.python.pydev",
@@ -24,7 +23,11 @@ class PythonCommunityPluginModules {
"intellij.python.reStructuredText",
]
static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
pythonPlugin("intellij.python.community.plugin", "python-ce", COMMUNITY_MODULES) {
def communityOnlyModules = [
"intellij.python.community.plugin",
"intellij.python.community.plugin.minor",
]
pythonPlugin("intellij.python.community.plugin", "python-ce", COMMUNITY_MODULES + communityOnlyModules) {
body.delegate = delegate
body()
}

1
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
View File

@@ -47,6 +47,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
plugin("intellij.pycharm.community.customization") {
directoryName = "pythonIDE"
mainJarName = "python-ide.jar"
withModule("intellij.pycharm.community.customization.impl", mainJarName)
}
]
}

19
python/ide/impl/intellij.pycharm.community.customization.impl.iml Normal file
View File

@@ -0,0 +1,19 @@
<?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$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.diff" />
<orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
<orderEntry type="library" name="Guava" level="project" />
</component>
</module>

0
python/ide/src/META-INF/pycharm-community-customization.xml → python/ide/impl/resources/META-INF/pycharm-community-customization.xml
View File

0
python/ide/src/com/jetbrains/python/PlatformPythonModuleType.java → python/ide/impl/src/com/jetbrains/python/PlatformPythonModuleType.java
View File

0
python/ide/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java → python/ide/impl/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java
View File

0
python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java → python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java
View File

0
python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java → python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java
View File

0
python/ide/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java → python/ide/impl/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java
View File

0
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.form → python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.form
View File

0
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java → python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
View File

0
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java → python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java
View File

0
python/ide/src/com/jetbrains/python/PyModuleListener.java → python/ide/impl/src/com/jetbrains/python/PyModuleListener.java
View File

0
python/ide/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java → python/ide/impl/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java
View File

0
python/ide/src/com/jetbrains/python/PythonModuleTypeManager.java → python/ide/impl/src/com/jetbrains/python/PythonModuleTypeManager.java
View File

0
python/ide/src/com/jetbrains/python/PythonSdkConfigurator.kt → python/ide/impl/src/com/jetbrains/python/PythonSdkConfigurator.kt
View File

0
python/ide/src/com/jetbrains/python/PythonSourceRootConfigurator.java → python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java
View File

0
python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.form → python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.form
View File

0
python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java → python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java → python/ide/impl/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java
View File

0
python/ide/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java → python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java → python/ide/impl/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java → python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java → python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java → python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java → python/ide/impl/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form → python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
View File

0
python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java → python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PySdkStatusBar.kt → python/ide/impl/src/com/jetbrains/python/configuration/PySdkStatusBar.kt
View File

0
python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java → python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
View File

0
python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java → python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
View File

0
python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java → python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java
View File

0
python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java → python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
View File

0
python/ide/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java → python/ide/impl/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
View File

0
python/ide/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java → python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
View File

0
python/ide/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java → python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
View File

0
python/ide/src/META-INF/plugin.xml → python/ide/resources/META-INF/plugin.xml
View File

10
python/intellij.pycharm.community.customization.iml
View File

@@ -3,16 +3,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/ide">
<sourceFolder url="file://$MODULE_DIR$/ide/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/ide/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.diff" />
<orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="module" module-name="intellij.pycharm.community.customization.impl" />
</component>
</module>

16
python/pluginCore/impl/intellij.python.community.plugin.impl.iml Normal file
View File

@@ -0,0 +1,16 @@
<?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$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="library" name="Guava" level="project" />
</component>
</module>

0
python/pluginCore/META-INF/python-community-plugin-core.xml → python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml
View File

0
python/pluginCore/com/jetbrains/python/facet/PythonFacetUtil.java → python/pluginCore/impl/src/com/jetbrains/python/facet/PythonFacetUtil.java
View File

0
python/pluginCore/com/jetbrains/python/facet/PythonSdkTableListener.java → python/pluginCore/impl/src/com/jetbrains/python/facet/PythonSdkTableListener.java
View File

0
python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesAction.java → python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesAction.java
View File

0
python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesDialog.java → python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesDialog.java
View File

0
python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.form → python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.form
View File

0
python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.java → python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
View File

0
python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java → python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java
View File

6
python/pluginCore/intellij.python.community.plugin.iml
View File

@@ -3,13 +3,9 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="library" name="Guava" level="project" />
</component>
</module>

0
python/pluginCore/META-INF/plugin.xml → python/pluginCore/resources/META-INF/plugin.xml
View File

0
python/pluginCore/META-INF/pluginIcon.svg → python/pluginCore/resources/META-INF/pluginIcon.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
python/pluginJava/intellij.python.community.plugin.java.iml
View File

@@ -15,7 +15,7 @@
<orderEntry type="module" module-name="intellij.java.psi" />
<orderEntry type="module" module-name="intellij.java.indexing" />
<orderEntry type="module" module-name="intellij.java.ui" />
<orderEntry type="module" module-name="intellij.python.community.plugin" />
<orderEntry type="module" module-name="intellij.python.community.plugin.impl" />
<orderEntry type="module" module-name="intellij.python.psi.impl" />
</component>
</module>

2
python/pluginMinor/intellij.python.community.plugin.minor.iml
View File

@@ -10,6 +10,6 @@
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.python.community.plugin" />
<orderEntry type="module" module-name="intellij.python.community.plugin.impl" />
</component>
</module>