refactored std.* package to be kotlin.*. Due to KT-1381 I had to move the functions from kotlin.test into the stdlib for now (I made them not depend on JUnit for now)

2012-03-03 12:11:06 +00:00
parent 4a53e468fe
commit eb3aac9acb
162 changed files with 454 additions and 324 deletions
@@ -56,6 +56,9 @@ public class KotlinCompiler {
        @Argument(value = "module", description = "module to compile")
        public String module;

+        @Argument(value = "classpath", description = "classpath to use when compiling")
+        public String classpath;
+
        @Argument(value = "includeRuntime", description = "include Kotlin runtime in to resulting jar")
        public boolean includeRuntime;

@@ -140,6 +143,10 @@ public class KotlinCompiler {
                environment.setStdlib(arguments.stdlib);
            }

+            if (arguments.classpath != null) {
+                environment.addToClasspath(arguments.classpath);
+            }
+
            boolean ok;
            if (arguments.module != null) {
                ok = environment.compileModuleScript(arguments.module, arguments.jar, arguments.outputDir, arguments.includeRuntime);