diff --git a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java index de3b855a85b..c3422098cf3 100644 --- a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java +++ b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java @@ -174,7 +174,8 @@ public class BytecodeCompiler { @Nullable String stdlib, @Nullable String[] classpath) { try { - List modules = CompileEnvironmentUtil.loadModuleScript(getKotlinPathsForAntTask(), module, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR); + List modules = CompileEnvironmentUtil.loadModuleDescriptions(getKotlinPathsForAntTask(), module, + MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR); List sourcesRoots = new ArrayList(); for (Module m : modules) { sourcesRoots.addAll(m.getSourceFiles()); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java index 5d944769acb..f7d58b3ab20 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java @@ -136,7 +136,7 @@ public class K2JVMCompiler extends CLICompiler { if (arguments.module != null) { MessageCollector sanitizedCollector = new FilteringMessageCollector(messageCollector); - List modules = CompileEnvironmentUtil.loadModuleScript(paths, arguments.module, sanitizedCollector); + List modules = CompileEnvironmentUtil.loadModuleDescriptions(paths, arguments.module, sanitizedCollector); File directory = new File(arguments.module).getParentFile(); KotlinToJVMBytecodeCompiler.compileModules(configuration, modules, diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index e8f0d252ea9..6009217e0e8 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -79,7 +79,7 @@ public class CompileEnvironmentUtil { } @NotNull - public static List loadModuleScript(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) { + public static List loadModuleDescriptions(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) { Disposable disposable = new Disposable() { @Override public void dispose() {