From ea6c4116df3d863968814e386ac26579ff0173da Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 11 Jul 2012 18:41:21 +0400 Subject: [PATCH] Passing sources via compiler configuration in BytecodeCompiler. --- .../jetbrains/jet/buildtools/core/BytecodeCompiler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 c48f42ebcc7..50c82ac3a0a 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 @@ -23,15 +23,18 @@ import org.jetbrains.jet.cli.common.CompilerPlugin; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.jvm.compiler.*; import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping; +import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.utils.PathUtil; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.*; +import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.ANNOTATIONS_PATH_KEY; +import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; /** @@ -75,10 +78,8 @@ public class BytecodeCompiler { configuration.add(ANNOTATIONS_PATH_KEY, jdkAnnotationsPath); } + configuration.addAll(CommonConfigurationKeys.SOURCE_ROOTS_KEY, Arrays.asList(sourceRoots)); JetCoreEnvironment environment = new JetCoreEnvironment(CompileEnvironmentUtil.createMockDisposable(), configuration); - for (String sourceRoot : sourceRoots) { - environment.addSources(sourceRoot); - } K2JVMCompileEnvironmentConfiguration env = new K2JVMCompileEnvironmentConfiguration(environment, MessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR, false, BuiltinsScopeExtensionMode.ALL, false, BuiltinToJavaTypesMapping.ENABLED);