From 438f22348cbae5cdaaa6d3f8f38b3ad5074c1f5f Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Wed, 15 Feb 2017 15:11:05 +0300 Subject: [PATCH] Exclude files only from modules that actually have them --- .../build/pycharm/PythonPluginPropertiesBase.groovy | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy index f8dae9592117..b2cd586b9f66 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy @@ -43,8 +43,17 @@ abstract class PythonPluginPropertiesBase extends PyCharmPropertiesBase { } PluginLayout pythonCommunityPluginLayout(String pluginVersion) { + def pluginXmlModules = [ + "IntelliLang-python", + "ipnb", + ] pythonPlugin(pythonCommunityPluginModule, "python-ce", "python-community-plugin-build-patches", - communityModules, pluginVersion) + communityModules, pluginVersion) { + pluginXmlModules.each { module -> + excludeFromModule(module, "META-INF/plugin.xml") + } + excludeFromModule(pythonCommunityPluginModule, "META-INF/python-plugin-dependencies.xml") + } } static PluginLayout pythonPlugin(String mainModuleName, String name, String buildPatchesModule, List modules, @@ -55,8 +64,6 @@ abstract class PythonPluginPropertiesBase extends PyCharmPropertiesBase { version = pluginVersion modules.each { module -> withModule(module, mainJarName, false) - excludeFromModule(module, "**/plugin.xml") - excludeFromModule(module, "**/python-plugin-dependencies.xml") } withModule(buildPatchesModule, mainJarName, false) withResourceFromModule("python-helpers", "", "helpers")