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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Alex Tkachman
2011-12-29 19:36:58 +02:00
parent f632feb4f9 02b2cc4fb8
commit 01e6d6f7ec
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/compiler/CompileEnvironment.java
+13 -1
View File
@@ -97,6 +97,13 @@ public class CompileEnvironment {
public static File findRtJar(boolean failOnError) { public static File findRtJar(boolean failOnError) {
String javaHome = System.getenv("JAVA_HOME"); String javaHome = System.getenv("JAVA_HOME");
if (javaHome == null) {
javaHome = System.getProperty("java.home");
if ("jre".equals(new File(javaHome).getName())) {
javaHome = new File(javaHome).getParent();
}
}
File rtJar; File rtJar;
if (javaHome == null) { if (javaHome == null) {
rtJar = findActiveRtJar(failOnError); rtJar = findActiveRtJar(failOnError);
@@ -223,7 +230,12 @@ public class CompileEnvironment {
CompileSession moduleCompileSession = new CompileSession(myEnvironment); CompileSession moduleCompileSession = new CompileSession(myEnvironment);
moduleCompileSession.addStdLibSources(); moduleCompileSession.addStdLibSources();
for (String sourceFile : moduleBuilder.getSourceFiles()) { for (String sourceFile : moduleBuilder.getSourceFiles()) {
moduleCompileSession.addSources(new File(directory, sourceFile).getPath()); File source = new File(sourceFile);
if (!source.isAbsolute()) {
source = new File(directory, sourceFile);
}
moduleCompileSession.addSources(source.getPath());
} }
for (String classpathRoot : moduleBuilder.getClasspathRoots()) { for (String classpathRoot : moduleBuilder.getClasspathRoots()) {
myEnvironment.addToClasspath(new File(classpathRoot)); myEnvironment.addToClasspath(new File(classpathRoot));