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

Reverted fix for KT-2042 Kotlin SDK must be explicitly specified for each module that uses Kotlin

Browse Source 
#KT-2042 reopened
This commit is contained in:
Evgeny Gerashchenko
2012-07-31 18:19:40 +04:00
parent 1f3aa6699c
commit 942c1ee9d9
23 changed files with 140 additions and 1122 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 -3
View File
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
import org.jetbrains.jet.cli.common.CompilerPlugin;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.common.util.CompilerPathUtil;
import org.jetbrains.jet.cli.jvm.compiler.*;
import org.jetbrains.jet.config.CommonConfigurationKeys;
import org.jetbrains.jet.config.CompilerConfiguration;
@@ -69,7 +68,7 @@ public class BytecodeCompiler {
configuration.add(CLASSPATH_KEY, new File(stdlib));
}
else {
File path = CompilerPathUtil.getRuntimePath();
File path = PathUtil.getDefaultRuntimePath();
if (path != null) {
configuration.add(CLASSPATH_KEY, path);
}
@@ -79,7 +78,7 @@ public class BytecodeCompiler {
configuration.add(CLASSPATH_KEY, new File(path));
}
}
File jdkAnnotationsPath = CompilerPathUtil.getJdkAnnotationsPath();
File jdkAnnotationsPath = PathUtil.getJdkAnnotationsPath();
if (jdkAnnotationsPath != null) {
configuration.add(ANNOTATIONS_PATH_KEY, jdkAnnotationsPath);
}