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-22 20:31:26 +04:00
parent ba90f07c8d
commit 3299957c0c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/jet/utils/PathUtil.java
+7
View File
@@ -49,6 +49,13 @@ public class PathUtil {
@NotNull @NotNull
public static KotlinPaths getKotlinPathsForJpsPluginOrJpsTests() { public static KotlinPaths getKotlinPathsForJpsPluginOrJpsTests() {
// 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
String jpsKotlinHome = System.getProperty("jps.kotlin.home");
if (jpsKotlinHome != null) {
return new KotlinPathsFromHomeDir(new File(jpsKotlinHome));
}
if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) { if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) {
return getKotlinPathsForDistDirectory(); return getKotlinPathsForDistDirectory();
} }