<kotlinc> ant task now supports <src> element and multiple source directories

compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java

@@ -23,8 +23,7 @@ import java.io.File;
 import static junit.framework.Assert.assertEquals;
 
 public class AntTaskTest extends KotlinIntegrationTestBase {
-    @Test
-    public void antTaskJvm() throws Exception {
+    private void doAntTest() throws Exception {
         String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "hello.jar";
         String runtime = new File("dist/kotlinc/lib/kotlin-runtime.jar").getAbsolutePath();
 
@@ -32,6 +31,16 @@ public class AntTaskTest extends KotlinIntegrationTestBase {
         runJava("hello.run", "-cp", jar + File.pathSeparator + runtime, "Hello.HelloPackage");
     }
 
+    @Test
+    public void antTaskJvm() throws Exception {
+        doAntTest();
+    }
+
+    @Test
+    public void antTaskJvmManyRoots() throws Exception {
+        doAntTest();
+    }
+
     @Override
     protected String normalizeOutput(String content) {
         return super.normalizeOutput(content)

compiler/integration-tests/testData/antTaskJvm/build.log.expected

@@ -1,7 +1,7 @@
 OUT Buildfile: build.xml
 OUT 
 OUT build:
-OUT   [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+OUT   [kotlinc] Compiling [[[TestData]/hello.kt]] => [[Temp]/hello.jar]
 OUT 
 OUT BUILD SUCCESSFUL
 OUT Total time: [time]

compiler/integration-tests/testData/antTaskJvmManyRoots/build.log.expected

@@ -0,0 +1,8 @@
+OUT Buildfile: build.xml
+OUT 
+OUT build:
+OUT   [kotlinc] Compiling [[[TestData]/root1, [TestData]/root2]] => [[Temp]/hello.jar]
+OUT 
+OUT BUILD SUCCESSFUL
+OUT Total time: [time]
+Return code: 0

compiler/integration-tests/testData/antTaskJvmManyRoots/build.xml

@@ -0,0 +1,10 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc output="${temp}/hello.jar">
+          <src path="${test.data}/root1"/>
+          <src path="${test.data}/root2"/>
+        </kotlinc>
+    </target>
+</project>

compiler/integration-tests/testData/antTaskJvmManyRoots/hello.run.expected

@@ -0,0 +1,2 @@
+OUT Hello, a!
+Return code: 0

compiler/integration-tests/testData/antTaskJvmManyRoots/root1/hello.kt

@@ -0,0 +1,7 @@
+package Hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+    foo()
+}

compiler/integration-tests/testData/antTaskJvmManyRoots/root2/foo.kt

@@ -0,0 +1,3 @@
+package Hello
+
+fun foo() {}