From ea71d57808f7494f67c4d6c52d9fa1f5656d0e1d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 14 Apr 2017 13:22:10 +0200
Subject: [PATCH] Use script-runtime properly in IDEA project:

use it from the installed plugin for dependent modules (frontend)
use it from bootstrap in the plugin being built
also drop unused daemon-client from the plugin

This makes it consistent with ant build and allow building idea project
without prior ant dist
---
 .idea/artifacts/KotlinPlugin.xml | 3 +--
 compiler/cli/cli.iml             | 1 -
 compiler/frontend/frontend.iml   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 76190390b88..89a2411df61 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -92,8 +92,7 @@
         <element id="archive" name="noarg-ide-plugin.jar">
           <element id="module-output" name="noarg-ide" />
         </element>
-        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-daemon-client.jar" />
-        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-script-runtime.jar" />
+        <element id="file-copy" path="$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-script-runtime.jar" />
         <element id="archive" name="sam-with-receiver-compiler-plugin.jar">
           <element id="module-output" name="sam-with-receiver-cli" />
         </element>
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index ddc2e2618d0..c7a97a3796a 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -22,7 +22,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="annotation-collector" />
     <orderEntry type="module" module-name="builtins-serializer" />
-    <orderEntry type="module" module-name="script.runtime" />
     <orderEntry type="module" module-name="frontend.script" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 80953adda4f..5d2710bd1a0 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -16,7 +16,6 @@
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="resolution" exported="" />
     <orderEntry type="library" exported="" name="kotlin-script-runtime" level="project" />
-    <orderEntry type="module" module-name="script.runtime" />
     <orderEntry type="library" name="javaslang" level="project" />
   </component>
 </module>
\ No newline at end of file