MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Build scripts: use setupKotlinPlugin task name

Browse Source
This commit is contained in:
Alexander Zolotov
2017-09-07 19:24:09 +03:00
parent 3b952ead58
commit 11b2d5a981
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@@ -17,7 +17,7 @@
</condition>
<exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
<arg value="--no-daemon"/>
<arg value="setupKotlin"/>
<arg value="setupKotlinPlugin"/>
</exec>
<propertyset id="intellij.build.properties">
<propertyref name="build.number"/>

4
build/scripts/utils.gant
View File

@@ -110,7 +110,7 @@ binding.setVariable("loadProject", {
bundledKotlinPath = "$home/community/build/dependencies/build/kotlin/Kotlin/kotlinc"
}
if (!new File(bundledKotlinPath, "lib/kotlin-runtime.jar").exists()) {
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
return
}
setPathVariable("KOTLIN_BUNDLED", bundledKotlinPath)
@@ -159,7 +159,7 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
kotlinPluginLibPath = "$home/community/build/dependencies/build/kotlin/Kotlin/lib"
}
if (!new File(kotlinPluginLibPath, "kotlin-runtime.jar").exists()) {
projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module " +
projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module " +
"to download Kotlin JARs")
return false
}

2
build/update.xml
View File

@@ -30,7 +30,7 @@
</condition>
<exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
<arg value="--no-daemon"/>
<arg value="setupKotlin"/>
<arg value="setupKotlinPlugin"/>
</exec>
<java failonerror="true" classname="org.apache.tools.ant.Main" fork="true">
<jvmarg line="-Xms64m -Xmx512m"/>

2
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
View File

@@ -146,7 +146,7 @@ class CompilationContextImpl implements CompilationContext {
}
else {
messages.error(
"Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
"Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
}
}