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

More neat adding JDK to configuration used for module script compilation.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-09 16:35:13 +04:00
parent e54767e9a6
commit f43b617fd8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+9 -8
View File
@@ -47,7 +47,6 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.jar.*; import java.util.jar.*;
@@ -106,13 +105,15 @@ public class CompileEnvironmentUtil {
} }
}; };
CompilerConfiguration configuration = new CompilerConfiguration(); CompilerConfiguration configuration = new CompilerConfiguration();
configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, Arrays.asList( File defaultRuntimePath = PathUtil.getDefaultRuntimePath();
PathUtil.findRtJar(), if (defaultRuntimePath != null) {
PathUtil.getDefaultRuntimePath() configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, defaultRuntimePath);
)); }
configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, Arrays.asList( configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.findRtJar());
PathUtil.getJdkAnnotationsPath() File jdkAnnotationsPath = PathUtil.getJdkAnnotationsPath();
)); if (jdkAnnotationsPath != null) {
configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, jdkAnnotationsPath);
}
JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration); JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
scriptEnvironment.addSources(moduleScriptFile); scriptEnvironment.addSources(moduleScriptFile);