From f5b7b5990fb4dc28b61489e862ad1dd04cddc130 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Mon, 28 Jan 2019 12:45:18 +0300
Subject: [PATCH] Build: fix PILL for JPS build.

---
 .gitignore                                      |  1 +
 buildSrc/src/main/kotlin/pill/plugin.kt         | 17 +++++++++++++----
 .../JPS_All_Compiler_Tests.xml                  |  8 --------
 .../PILL_All_Compiler_Tests.xml                 |  8 ++++++++
 ...Tests.xml => PILL_All_IDEA_Plugin_Tests.xml} |  2 +-
 ...mpiler_Tests.xml => PILL_Compiler_Tests.xml} |  2 +-
 ...ll_Tests.xml => PILL_Generate_All_Tests.xml} |  2 +-
 .../{JPS_IDEA.xml => PILL_IDEA.xml}             |  2 +-
 ... PILL_IDEA_No_ProcessCancelledException.xml} |  2 +-
 ...kend_Tests.xml => PILL_JS_Backend_Tests.xml} |  2 +-
 ...end_Tests.xml => PILL_JVM_Backend_Tests.xml} |  2 +-
 ...S_Java_8_Tests.xml => PILL_Java_8_Tests.xml} |  2 +-
 ...JPS_Model.xml => PILL_Refresh_JPS_Model.xml} |  2 +-
 13 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100644 buildSrc/src/main/resources/runConfigurations/JPS_All_Compiler_Tests.xml
 create mode 100644 buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml
 rename buildSrc/src/main/resources/runConfigurations/{JPS_All_IDEA_Plugin_Tests.xml => PILL_All_IDEA_Plugin_Tests.xml} (93%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_Compiler_Tests.xml => PILL_Compiler_Tests.xml} (93%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_Generate_All_Tests.xml => PILL_Generate_All_Tests.xml} (73%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_IDEA.xml => PILL_IDEA.xml} (94%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_IDEA_No_ProcessCancelledException.xml => PILL_IDEA_No_ProcessCancelledException.xml} (93%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_JS_Backend_Tests.xml => PILL_JS_Backend_Tests.xml} (92%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_JVM_Backend_Tests.xml => PILL_JVM_Backend_Tests.xml} (93%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_Java_8_Tests.xml => PILL_Java_8_Tests.xml} (92%)
 rename buildSrc/src/main/resources/runConfigurations/{JPS_Refresh_JPS_Model.xml => PILL_Refresh_JPS_Model.xml} (83%)

diff --git a/.gitignore b/.gitignore
index b252dc3cb71..812a913a1f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ build/
 .idea/artifacts/PILL_*.xml
 .idea/modules
 .idea/runConfigurations/JPS_*.xml
+.idea/runConfigurations/PILL_*.xml
 .idea/libraries
 .idea/modules.xml
 .idea/gradle.xml
diff --git a/buildSrc/src/main/kotlin/pill/plugin.kt b/buildSrc/src/main/kotlin/pill/plugin.kt
index 351d850d282..cb160742e15 100644
--- a/buildSrc/src/main/kotlin/pill/plugin.kt
+++ b/buildSrc/src/main/kotlin/pill/plugin.kt
@@ -151,7 +151,8 @@ class JpsCompatiblePlugin : Plugin<Project> {
         val files = render(jpsProject)
 
         removeExistingIdeaLibrariesAndModules()
-        removeJpsRunConfigurations()
+        removeJpsAndPillRunConfigurations()
+        removeAllArtifactConfigurations()
 
         copyRunConfigurations()
         setOptionsForDefaultJunitRunConfiguration(rootProject)
@@ -163,7 +164,8 @@ class JpsCompatiblePlugin : Plugin<Project> {
         initEnvironment(project)
 
         removeExistingIdeaLibrariesAndModules()
-        removeJpsRunConfigurations()
+        removeJpsAndPillRunConfigurations()
+        removeAllArtifactConfigurations()
     }
 
     private fun removeExistingIdeaLibrariesAndModules() {
@@ -171,10 +173,17 @@ class JpsCompatiblePlugin : Plugin<Project> {
         File(projectDir, ".idea/modules").deleteRecursively()
     }
 
-    private fun removeJpsRunConfigurations() {
+    private fun removeJpsAndPillRunConfigurations() {
         File(projectDir, ".idea/runConfigurations")
             .walk()
-            .filter { it.name.startsWith("JPS_") && it.extension.toLowerCase() == "xml" }
+            .filter { (it.name.startsWith("JPS_") || it.name.startsWith("PILL_")) && it.extension.toLowerCase() == "xml" }
+            .forEach { it.delete() }
+    }
+
+    private fun removeAllArtifactConfigurations() {
+        File(projectDir, ".idea/artifacts")
+            .walk()
+            .filter { it.extension.toLowerCase() == "xml" }
             .forEach { it.delete() }
     }
 
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_All_Compiler_Tests.xml b/buildSrc/src/main/resources/runConfigurations/JPS_All_Compiler_Tests.xml
deleted file mode 100644
index e6eb48f501b..00000000000
--- a/buildSrc/src/main/resources/runConfigurations/JPS_All_Compiler_Tests.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] All Compiler Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
-    <toRun type="JUnit" name="[JPS] Compiler Tests" />
-    <toRun type="JUnit" name="[JPS] JS Backend Tests" />
-    <toRun type="JUnit" name="[JPS] Java 8 Tests" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml
new file mode 100644
index 00000000000..48a042bab57
--- /dev/null
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_All_Compiler_Tests.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="[PILL] All Compiler Tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
+    <toRun type="JUnit" name="[PILL] Compiler Tests" />
+    <toRun type="JUnit" name="[PILL] JS Backend Tests" />
+    <toRun type="JUnit" name="[PILL] Java 8 Tests" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_All_IDEA_Plugin_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml
similarity index 93%
rename from buildSrc/src/main/resources/runConfigurations/JPS_All_IDEA_Plugin_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml
index f56fbf23aa9..d58bc15a04b 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_All_IDEA_Plugin_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_All_IDEA_Plugin_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[PILL] All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
       <pattern>
         <option name="PATTERN" value="org.jetbrains.kotlin.*" />
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_Compiler_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml
similarity index 93%
rename from buildSrc/src/main/resources/runConfigurations/JPS_Compiler_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml
index 5a26401c2f9..bd38108fad4 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_Compiler_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_Compiler_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] Compiler Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[PILL] Compiler Tests" type="JUnit" factoryName="JUnit">
     <module name="compiler.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_Generate_All_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml
similarity index 73%
rename from buildSrc/src/main/resources/runConfigurations/JPS_Generate_All_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml
index ee11b91c9d6..cbfe6465539 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_Generate_All_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_Generate_All_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] Generate All Tests" type="Application" factoryName="Application">
+  <configuration default="false" name="[PILL] Generate All Tests" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.pill.generateAllTests.Main" />
     <module name="generate-all-tests.test" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_IDEA.xml b/buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml
similarity index 94%
rename from buildSrc/src/main/resources/runConfigurations/JPS_IDEA.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml
index 42f39e19842..d18664140a1 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_IDEA.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_IDEA.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] IDEA" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="[PILL] IDEA" type="Application" factoryName="Application" singleton="true">
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner" />
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_IDEA_No_ProcessCancelledException.xml b/buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml
similarity index 93%
rename from buildSrc/src/main/resources/runConfigurations/JPS_IDEA_No_ProcessCancelledException.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml
index 8c35c6e8fcd..0416cd16dd9 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_IDEA_No_ProcessCancelledException.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_IDEA_No_ProcessCancelledException.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="[PILL] IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner" />
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_JS_Backend_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml
similarity index 92%
rename from buildSrc/src/main/resources/runConfigurations/JPS_JS_Backend_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml
index 1a3364ebd7f..bcbc5451e3b 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_JS_Backend_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_JS_Backend_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] JS Backend Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[PILL] JS Backend Tests" type="JUnit" factoryName="JUnit">
     <module name="js.tests.test" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_JVM_Backend_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml
similarity index 93%
rename from buildSrc/src/main/resources/runConfigurations/JPS_JVM_Backend_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml
index 237c151893d..555529d35a2 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_JVM_Backend_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_JVM_Backend_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] JVM Backend Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[PILL] JVM Backend Tests" type="JUnit" factoryName="JUnit">
     <module name="compiler.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_Java_8_Tests.xml b/buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml
similarity index 92%
rename from buildSrc/src/main/resources/runConfigurations/JPS_Java_8_Tests.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml
index 4751f51096f..7ce9231ae5c 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_Java_8_Tests.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_Java_8_Tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] Java 8 Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="[PILL] Java 8 Tests" type="JUnit" factoryName="JUnit">
     <module name="tests-java8.test" />
     <extension name="coverage">
       <pattern>
diff --git a/buildSrc/src/main/resources/runConfigurations/JPS_Refresh_JPS_Model.xml b/buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml
similarity index 83%
rename from buildSrc/src/main/resources/runConfigurations/JPS_Refresh_JPS_Model.xml
rename to buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml
index 3fe30c2a636..73495e9d380 100644
--- a/buildSrc/src/main/resources/runConfigurations/JPS_Refresh_JPS_Model.xml
+++ b/buildSrc/src/main/resources/runConfigurations/PILL_Refresh_JPS_Model.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[JPS] Refresh JPS Model" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
+  <configuration default="false" name="[PILL] Refresh PILL Model" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />