From 83a211105744db827f5aedd784fd526814714b45 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 11 Nov 2014 15:32:13 +0300
Subject: [PATCH] Configure modules 'reflection' and 'reflection.jvm'

Add source roots for IDE features to work in sources, but exclude from Make:
these modules are compiled by the new compiler from build.xml and some weird
errors may arise if we compile it with the old compiler (and also output of
that compilation won't be used anyway)
---
 .idea/compiler.xml                     | 7 +++++--
 core/reflection.jvm/reflection.jvm.iml | 2 +-
 core/reflection/reflection.iml         | 9 +++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d4ecca5e0a6..1be8a5b2e25 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,10 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/core/reflection" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -22,5 +26,4 @@
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/core/reflection.jvm/reflection.jvm.iml b/core/reflection.jvm/reflection.jvm.iml
index 44071adbdcd..5b59df0d759 100644
--- a/core/reflection.jvm/reflection.jvm.iml
+++ b/core/reflection.jvm/reflection.jvm.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="reflection" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/reflection/reflection.iml b/core/reflection/reflection.iml
index 5ceeb8204d8..459d78f4e36 100644
--- a/core/reflection/reflection.iml
+++ b/core/reflection/reflection.iml
@@ -2,10 +2,11 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="builtins" />
+    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file