Merge remote branch 'origin/master'

2012-01-25 13:30:06 +02:00
parent 4633e1c7f4 e5f4377ee4
commit 02c2e9d5e6
18 changed files with 178 additions and 77 deletions
@@ -80,7 +80,7 @@ public class ForTestCompileStdlib {

    private static void compileKotlinPartOfStdlib(File destdir) throws IOException {
        // lame
-        KotlinCompiler.main("-output", destdir.getPath(), "-src", "./stdlib/ktSrc");
+        KotlinCompiler.exec("-output", destdir.getPath(), "-src", "./stdlib/ktSrc");
    }
    
    private static List<File> javaFilesInDir(File dir) {