azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Method renamed

Browse Source
This commit is contained in:
Andrey Breslav
2013-04-26 18:24:42 +04:00
parent abd162d466
commit 3f23704e13
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
+2 -1
View File
@@ -174,7 +174,8 @@ public class BytecodeCompiler {
@Nullable String stdlib, @Nullable String stdlib,
@Nullable String[] classpath) { @Nullable String[] classpath) {
try { try {
List<Module> modules = CompileEnvironmentUtil.loadModuleScript(getKotlinPathsForAntTask(), module, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR); List<Module> modules = CompileEnvironmentUtil.loadModuleDescriptions(getKotlinPathsForAntTask(), module,
MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR);
List<String> sourcesRoots = new ArrayList<String>(); List<String> sourcesRoots = new ArrayList<String>();
for (Module m : modules) { for (Module m : modules) {
sourcesRoots.addAll(m.getSourceFiles()); sourcesRoots.addAll(m.getSourceFiles());
compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
if (arguments.module != null) { if (arguments.module != null) {
MessageCollector sanitizedCollector = new FilteringMessageCollector(messageCollector); MessageCollector sanitizedCollector = new FilteringMessageCollector(messageCollector);
List<Module> modules = CompileEnvironmentUtil.loadModuleScript(paths, arguments.module, sanitizedCollector); List<Module> modules = CompileEnvironmentUtil.loadModuleDescriptions(paths, arguments.module, sanitizedCollector);
File directory = new File(arguments.module).getParentFile(); File directory = new File(arguments.module).getParentFile();
KotlinToJVMBytecodeCompiler.compileModules(configuration, modules, KotlinToJVMBytecodeCompiler.compileModules(configuration, modules,
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class CompileEnvironmentUtil {
} }
@NotNull @NotNull
public static List<Module> loadModuleScript(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) { public static List<Module> loadModuleDescriptions(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) {
Disposable disposable = new Disposable() { Disposable disposable = new Disposable() {
@Override @Override
public void dispose() { public void dispose() {