MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts: correct old utils.gant to support Kotlin 1.2 layout

Browse Source
This commit is contained in:
nik
2017-11-20 12:49:37 +03:00
parent e3aa0df966
commit 2e60e39093
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+15 -9
View File
@@ -154,17 +154,23 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
return true
}
def kotlinPluginLibPath = "$home/build/dependencies/build/kotlin/Kotlin/lib"
if (!new File(kotlinPluginLibPath).exists()) {
kotlinPluginLibPath = "$home/community/build/dependencies/build/kotlin/Kotlin/lib"
def kotlinHomePath = "$home/build/dependencies/build/kotlin/Kotlin"
if (!new File(kotlinHomePath).exists()) {
kotlinHomePath = "$home/community/build/dependencies/build/kotlin/Kotlin"
}
if (!new File(kotlinPluginLibPath, "kotlin-runtime.jar").exists()) {
projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module " +
"to download Kotlin JARs")
return false
def kotlinPluginLibPath = "$kotlinHomePath/lib"
def kotlincLibPath = "$kotlinHomePath/kotlinc/lib"
if (new File(kotlinPluginLibPath).exists() && new File(kotlincLibPath).exists()) {
["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-reflect.jar"].each {
BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
}
["kotlin-runtime.jar"].each {
BuildUtils.addToJpsClassPath("$kotlincLibPath/$it", ant)
}
}
["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-runtime.jar", "kotlin-reflect.jar"].each {
BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
else {
projectBuilder.error(
"Could not find Kotlin JARs at $kotlinPluginLibPath and $kotlincLibPath: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
}
return true
}