From cfe4b7f7360140419ae984be131d4a20b7596566 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Sat, 3 Mar 2012 06:35:18 +0000
Subject: [PATCH] added support for multiple source directories for generation
 of the kdoc, so we can include java & kunit etc

---
 build.xml                          | 17 ++---------------
 {modules => kdoc}/ApiDocsModule.kt |  0
 kdoc/kdoc.iml                      | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 17 deletions(-)
 rename {modules => kdoc}/ApiDocsModule.kt (100%)

diff --git a/build.xml b/build.xml
index 6e4566905ae..43bd9ea83d9 100644
--- a/build.xml
+++ b/build.xml
@@ -112,28 +112,15 @@
                 <path refid="classpath"/>
                 <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
                 <pathelement location="${output}/classes/kdoc"/>
-
-<!--
-    lets use the local Ant build rather than the mvn build
-
-                <fileset dir="${basedir}/kdoc/target">
-                  <include name="**/*.jar"/>
-                </fileset>
--->
-
                 <!-- TODO Dirty Hack until kdoc jar has stdlib inside it -->
                 <pathelement location="${output}/classes/stdlib"/>
             </classpath>
-<!--
-            <arg value="-src"/>
-            <arg value="${basedir}/stdlib/ktSrc"/>
--->
             <arg value="-output"/>
-            <arg value="${output}/classes/stdlib"/>
+            <arg value="${output}/classes/apidoc"/>
             <arg value="-docOutput"/>
             <arg value="${output}/apidoc/stdlib"/>
             <arg value="-module"/>
-            <arg value="${basedir}/modules/ApiDocsModule.kt"/>
+            <arg value="${basedir}/kdoc/ApiDocsModule.kt"/>
         </java>
 
         <fail message="No stdlib API docs generated.">
diff --git a/modules/ApiDocsModule.kt b/kdoc/ApiDocsModule.kt
similarity index 100%
rename from modules/ApiDocsModule.kt
rename to kdoc/ApiDocsModule.kt
diff --git a/kdoc/kdoc.iml b/kdoc/kdoc.iml
index 5d99e712211..1b17856053a 100644
--- a/kdoc/kdoc.iml
+++ b/kdoc/kdoc.iml
@@ -33,7 +33,9 @@
           <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/kotlin-compiler.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../compiler/cli/src" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -102,7 +104,25 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/asm-all-3.3.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/asm-util-3.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/asm-tree-3.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/asm-analysis-3.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />