From 62221494e25d2da78632af76af93d4cc630795aa Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 10 Mar 2012 02:03:16 +0400
Subject: [PATCH] fix plugin build

---
 .idea/artifacts/KotlinPlugin.xml              |  1 +
 build.xml                                     |  2 +-
 .../jet/plugin/compiler/JetCompiler.java      | 27 ++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index af5077af68a..7955ac2d7a5 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -20,6 +20,7 @@
           <element id="archive" name="kotlin-js-libraries.zip">
             <element id="dir-copy" path="$PROJECT_DIR$/js/js.libraries/src" />
           </element>
+          <element id="library" level="project" name="guice-3.0" />
         </element>
         <element id="directory" name="kotlinc">
           <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
diff --git a/build.xml b/build.xml
index 8acbc9e970d..293477ddae7 100644
--- a/build.xml
+++ b/build.xml
@@ -272,7 +272,7 @@
     <target name="copyKotlinJars">
         <copy todir="${kotlin-home}/lib">
             <fileset dir="${idea.sdk}/core" includes="*.jar"/>
-            <fileset dir="${basedir}/lib" includes="*.jar"/>
+            <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         </copy>
         <copy todir="${kotlin-home}/bin">
             <fileset dir="${basedir}/compiler/cli/bin"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index c1bb6b2b5d6..028d359877a 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.compiler;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.intellij.compiler.impl.javaCompiler.ModuleChunk;
 import com.intellij.execution.configurations.GeneralCommandLine;
@@ -199,6 +200,21 @@ public class JetCompiler implements TranslatingCompiler {
         return script;
     }
 
+    private static List<File> getJarsInDirectory(File dir) {
+        List<File> r = Lists.newArrayList();
+
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File jar : files) {
+                if (jar.isFile() && jar.getName().endsWith(".jar")) {
+                    r.add(jar);
+                }
+            }
+        }
+
+        return r;
+    }
+
     private static List<File> kompilerClasspath(File kotlinHome, CompileContext context) {
         File libs = new File(kotlinHome, "lib");
 
@@ -209,15 +225,8 @@ public class JetCompiler implements TranslatingCompiler {
 
 
         ArrayList<File> answer = new ArrayList<File>();
-        File[] jars = libs.listFiles();
-        if (jars != null) {
-            for (File jar : jars) {
-                if (jar.isFile() && jar.getName().endsWith(".jar")) {
-                    answer.add(jar);
-                }
-            }
-        }
-
+        answer.addAll(getJarsInDirectory(libs));
+        answer.addAll(getJarsInDirectory(new File(libs, "guice"))); // TODO: flatten at artifact build
         return answer;
     }