From bd6cd15f2f862ad9783891a553afee592a370944 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 27 Sep 2013 15:14:27 +0200
Subject: [PATCH] avoid having two separate plugin.xml files for Python plugin
 in classpath when running idea from idea

---
 python/build/python_plugin_build.gant      |  1 +
 python/pluginResources/META-INF/plugin.xml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 python/pluginResources/META-INF/plugin.xml

diff --git a/python/build/python_plugin_build.gant b/python/build/python_plugin_build.gant
index 6fdbd3e90fd2..8cc45d3e8783 100644
--- a/python/build/python_plugin_build.gant
+++ b/python/build/python_plugin_build.gant
@@ -143,6 +143,7 @@ target(name: "compile", description: "Compile module python") {
   ant.mkdir(dir: "${classesDir}/META-INF")
   ant.copy(todir: "${classesDir}/META-INF") {
     fileset(file: "${pluginHome}/pluginSrc/META-INF/*.xml")
+    fileset(file: "${pluginHome}/pluginResources/META-INF/*.xml")
   }
 
   ant.replaceregexp(file: "${classesDir}/META-INF/plugin.xml",
diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
new file mode 100644
index 000000000000..ab57b46eb7c9
--- /dev/null
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -0,0 +1,16 @@
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="http://confluence.jetbrains.com/display/PYH/">
+  <!-- Components and extensions declared in this file work ONLY in Python plugin, not in standalone PyCharm.
+       Anything related to Python/Java integration must go in this file. -->
+
+  <id>PythonCore</id>
+  <name>Python Community Edition</name>
+  <idea-version since-build="130.0" until-build="133.0"/>
+  <description>Smart editing for Python scripts</description>
+  <version>3.0</version>
+  <depends>com.intellij.modules.java</depends>
+
+
+  <vendor url="http://www.jetbrains.com/pycharm/" logo="/com/jetbrains/python/python.png">JetBrains, Keith Lea</vendor>
+  <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+</idea-plugin>