From f43b617fd8fcec729be1d2f3bcf34aa155907c8a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 9 Jul 2012 16:35:13 +0400 Subject: [PATCH] More neat adding JDK to configuration used for module script compilation. --- .../jvm/compiler/CompileEnvironmentUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 4c9495ca8ed..e4f094ce1aa 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 @@ -47,7 +47,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.jar.*; @@ -106,13 +105,15 @@ public class CompileEnvironmentUtil { } }; CompilerConfiguration configuration = new CompilerConfiguration(); - configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, Arrays.asList( - PathUtil.findRtJar(), - PathUtil.getDefaultRuntimePath() - )); - configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, Arrays.asList( - PathUtil.getJdkAnnotationsPath() - )); + File defaultRuntimePath = PathUtil.getDefaultRuntimePath(); + if (defaultRuntimePath != null) { + configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, defaultRuntimePath); + } + configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.findRtJar()); + File jdkAnnotationsPath = PathUtil.getJdkAnnotationsPath(); + if (jdkAnnotationsPath != null) { + configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, jdkAnnotationsPath); + } JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration); scriptEnvironment.addSources(moduleScriptFile);