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

Support jps.kotlin.home

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-27 13:55:05 +04:00
committed by Natalia.Ukhorskaya
parent 8511137596
commit aa90dac6d1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/jet/utils/PathUtil.java
+4 -5
View File
@@ -44,18 +44,17 @@ public class PathUtil {
@NotNull @NotNull
public static KotlinPaths getKotlinPathsForJpsPlugin() { public static KotlinPaths getKotlinPathsForJpsPlugin() {
return new KotlinPathsFromHomeDir(getCompilerPathForJpsPlugin());
}
@NotNull
public static KotlinPaths getKotlinPathsForJpsPluginOrJpsTests() {
// When JPS is run on TeamCity, it can not rely on Kotlin plugin layout, // When JPS is run on TeamCity, it can not rely on Kotlin plugin layout,
// so the path to Kotlin is specified in a system property // so the path to Kotlin is specified in a system property
String jpsKotlinHome = System.getProperty("jps.kotlin.home"); String jpsKotlinHome = System.getProperty("jps.kotlin.home");
if (jpsKotlinHome != null) { if (jpsKotlinHome != null) {
return new KotlinPathsFromHomeDir(new File(jpsKotlinHome)); return new KotlinPathsFromHomeDir(new File(jpsKotlinHome));
} }
return new KotlinPathsFromHomeDir(getCompilerPathForJpsPlugin());
}
@NotNull
public static KotlinPaths getKotlinPathsForJpsPluginOrJpsTests() {
if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) { if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) {
return getKotlinPathsForDistDirectory(); return getKotlinPathsForDistDirectory();
} }