IDEA-CR-53226 drop intellij.python.community.plugin.resources module

Making python community layout similar to python professional.

GitOrigin-RevId: 55316c2c9dcc958c1c2de24df2acc8ef1fe04633
This commit is contained in:
Gregory.Shrago
2019-10-09 13:06:32 +00:00
committed by intellij-monorepo-bot
parent 823ef2b176
commit 2c08d2c1f7
12 changed files with 3 additions and 25 deletions
-2
View File
@@ -241,7 +241,6 @@
<module old-name="python-community-plugin-core" new-name="intellij.python.community.plugin" />
<module old-name="python-community-plugin-java" new-name="intellij.python.community.plugin.java" />
<module old-name="python-community-plugin-minor" new-name="intellij.python.community.plugin.minor" />
<module old-name="python-community-plugin-resources" new-name="intellij.python.community.plugin.resources" />
<module old-name="python-community-tests" new-name="intellij.python.community.tests" />
<module old-name="python-community-tools" new-name="intellij.python.tools" />
<module old-name="python-helpers" new-name="intellij.python.helpers" />
@@ -656,7 +655,6 @@
<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" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.resources.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/python/testSrc/intellij.python.community.tests.iml" filepath="$PROJECT_DIR$/python/testSrc/intellij.python.community.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-community-configure/intellij.python.configure.iml" filepath="$PROJECT_DIR$/python/python-community-configure/intellij.python.configure.iml" />
@@ -17,7 +17,7 @@ class PythonCommunityPluginModules {
"intellij.python.pydev",
"intellij.python.community.impl",
]
public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin.resources"
public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin"
static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", COMMUNITY_MODULES) {
@@ -36,7 +36,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
"intellij.pycharm.community"
]
productLayout.bundledPluginModules =
["intellij.python.community.plugin.resources",
["intellij.python.community.plugin",
"intellij.pycharm.community.customization"
] + new File("$communityHome/python/build/plugin-list.txt").readLines()
@@ -5,6 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/pluginResources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -11,7 +11,6 @@
<orderEntry type="module" module-name="intellij.python.community.plugin" exported="" />
<orderEntry type="module" module-name="intellij.python.community.plugin.java" exported="" />
<orderEntry type="module" module-name="intellij.python.community.impl" exported="" />
<orderEntry type="module" module-name="intellij.python.community.plugin.resources" exported="" />
<orderEntry type="module" module-name="intellij.python.configure" exported="" />
<orderEntry type="module" module-name="intellij.python.community.plugin.minor" exported="" />
<orderEntry type="module" module-name="intellij.idea.community.main" />
@@ -1,19 +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$/pluginResources">
<sourceFolder url="file://$MODULE_DIR$/pluginResources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.plugin.java" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.community.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.configure" scope="RUNTIME" />
</component>
</module>
@@ -14,6 +14,5 @@
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.plugin.resources" scope="RUNTIME" />
</component>
</module>

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB