CPP-434 Split [python-community] into [python-community] and [python-community-ide-resources]

(cherry picked from commit 89dface)

python/build/pycharm_community_build.gant

@@ -13,7 +13,7 @@ setProperty("ch", home)
 setProperty("pythonCommunityHome", "$home/python")
 
 // load ApplicationInfo.xml properties
-ant.xmlproperty(file: "$pythonCommunityHome/resources/idea/PyCharmCoreApplicationInfo.xml", collapseAttributes: "true")
+ant.xmlproperty(file: "$pythonCommunityHome/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml", collapseAttributes: "true")
 
 setProperty("system_selector", "PyCharmCE${p("component.version.major")}0")
 setProperty("dryRun", false)
@@ -165,6 +165,7 @@ public layoutCommunity(String classesPath, Set usedJars) {
   def launcher64 = "${paths.distWin}/bin/pycharm64.exe"
   List resourcePaths = ["$ch/community-resources/src",
     "$ch/platform/icons/src",
+    "$pythonCommunityHome/python-community-ide-resources/resources",
     "$pythonCommunityHome/resources"]
   buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher.exe", launcher,
                    appInfo, "$pythonCommunityHome/build/pycharm_community_launcher.properties", system_selector, resourcePaths)
@@ -248,8 +249,10 @@ private layoutFull(Map args, String target, Set usedJars) {
       //noinspection GroovyAssignabilityCheck
       jar([name: "resources_en.jar", duplicate: "preserve"]) {
         // custom resources should go first
-        fileset(dir: "$pythonCommunityHome/resources") {
-          include(name: "**/tips/**")
+        module("python-community-ide-resources") {
+          ant.patternset {
+            include(name: "**/tips/**")
+          }
         }
         module("platform-resources-en") {
           ant.patternset {

python/build/python_plugin_build.gant

@@ -34,8 +34,6 @@ setProperty("zipname", "python-community-${pluginRevision}.zip")
 
 setProperty("srcDir", "${pluginHome}/src")
 
-setProperty("resourcesDir", "${pluginHome}/resources")
-
 setProperty("classesRootDir", "${outDir}/classes")
 setProperty("classesDir", "${classesRootDir}/python")
 
@@ -98,7 +96,6 @@ target(name: "compile", description: "Compile module python") {
 
   ant.path(id: "sourcepath") {
     dirset(dir: "${pluginHome}") {
-      include(name: "resources")
       include(name: "src")
       include(name: "gen")
       include(name: "pluginCore")
@@ -135,7 +132,11 @@ target(name: "compile", description: "Compile module python") {
 
   //copy resources
   ant.copy(todir: "${classesDir}") {
-    fileset(dir: "${resourcesDir}") {
+    fileset(dir: "${pluginHome}/resources") {
+      patternset(refid: "resources.pt")
+      type(type: "file")
+    }
+    fileset(dir: "${pluginHome}/python-community-ide-resources/resources") {
       patternset(refid: "resources.pt")
       type(type: "file")
     }
@@ -154,11 +155,6 @@ target(name: "compile", description: "Compile module python") {
     fileset(dir: "${pluginHome}/IntelliLang-python/src") {
       include(name: "resources/*.xml")
     }
-    fileset(dir: "${pluginHome}/resources") {
-      patternset(refid: "resources.pt")
-      type(type: "file")
-    }
-    fileset(dir: "${home}/colorSchemes/src")
     fileset(dir: "${pluginHome}/ipnb/resources") {
       patternset(refid: "resources.pt")
       type(type: "file")
@@ -175,7 +171,7 @@ target(name: "compile", description: "Compile module python") {
   }
 
   // set version to PyCharm current version from ApplicationInfo.xml
-  ant.loadfile(property: "appInfo", srcFile: "${pluginHome}/resources/idea/PyCharmCoreApplicationInfo.xml") {
+  ant.loadfile(property: "appInfo", srcFile: "${pluginHome}/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml") {
   }
 
   major = ("${appInfo}" =~ /major\s*=\s*\"([^"])\"/)[0][1]

python/edu/build/pycharm_edu_build.gant

@@ -48,8 +48,8 @@ private List<String> pycharmPlatformApiModules() {
 
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
-  return [platformImplementationModules, "dom-impl", "python-community", "python-ide-community", "python-configure",
-    "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
+  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()
 }
 
 private List modules() {
@@ -94,10 +94,6 @@ target('default': "Build artifacts") {
 
   loadProject()
 
-  List resourcePaths = ["$ch/community-resources/src",
-                        "$ch/platform/icons/src",
-                        "$pythonEduHome/resources"]
-
   projectBuilder.stage("Cleaning up sandbox folder")
 
   projectBuilder.targetFolder = "${paths.sandbox}/classes"
@@ -198,6 +194,7 @@ public layoutEducational(String classesPath, Set usedJars) {
   def launcher = "${paths.distWin}/bin/pycharm.exe"
   List resourcePaths = ["$ch/community-resources/src",
     "$ch/platform/icons/src",
+    "$pythonCommunityHome/python-community-ide-resources/resources",
     "$pythonCommunityHome/resources",
     "$pythonEduHome/resources"]
   buildWinLauncher(ch, "$ch/bin/WinLauncher/WinLauncher.exe", launcher,
@@ -295,8 +292,10 @@ private layoutFull(Map args, String target, Set usedJars) {
       //noinspection GroovyAssignabilityCheck
       jar([name: "resources_en.jar", duplicate: "preserve"]) {
         // custom resources should go first
-        fileset(dir: "$pythonCommunityHome/resources") {
-          include(name: "**/tips/**")
+        module("python-community-ide-resources") {
+          ant.patternset {
+            include(name: "**/tips/**")
+          }
         }
         module("platform-resources-en") {
           ant.patternset {

python/edu/course-creator-intellij-py/course-creator-intellij-py.iml

@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="course-creator" />
     <orderEntry type="module" module-name="course-creator-python" />
     <orderEntry type="module" module-name="main" />
+    <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="interactive-learning-intellij-py" />

python/edu/course-creator-python/course-creator-python.iml

@@ -11,6 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="course-creator" />
     <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="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="python-ide-community" />

python/edu/interactive-learning-intellij-py/interactive-learning-intellij-py.iml

@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="interactive-learning-intellij" />
     <orderEntry type="module" module-name="main" />
+    <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="interactive-learning-python" />

python/edu/interactive-learning-python/interactive-learning-python.iml

@@ -11,6 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="interactive-learning" />
     <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="platform-impl" />
     <orderEntry type="module" module-name="python-ide-community" />

python/edu/python-educational.iml

@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="module" module-name="xdebugger-impl" />
     <orderEntry type="module" module-name="xml-psi-impl" />
+    <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
   </component>
 </module>

python/edu/resources/tips/GoToAction.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="../../../python/resources/tips/css/tips.css">
+    <link rel="stylesheet" type="text/css" href="../../../python-community-ide-resources/resources/tips/css/tips.css">
 </head>
 <body>
 

python/edu/resources/tips/GoToClass.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="../../../python/resources/tips/css/tips.css">
+    <link rel="stylesheet" type="text/css" href="../../../python-community-ide-resources/resources/tips/css/tips.css">
 </head>
 <body>
     <p>

python/edu/resources/tips/HierarchyBrowser.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="../../../python/resources/tips/css/tips.css">
+    <link rel="stylesheet" type="text/css" href="../../../python-community-ide-resources/resources/tips/css/tips.css">
 </head>
 <body>
     <p>

python/ide/python-ide-community.iml

@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <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="lang-api" />

python/python-community-ide-resources/python-community-ide-resources.iml

@@ -0,0 +1,11 @@
+<?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$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>