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

Add konan.home to resolve dist in KonanTest

Browse Source
This commit is contained in:
Pavel Punegov
2019-02-15 14:44:46 +03:00
committed by Pavel Punegov
parent 7d1bb97e76
commit fe05f74d7c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+2 -1
View File
@@ -32,7 +32,8 @@ abstract class KonanTest extends JavaExec {
public String source public String source
def platformManager = project.rootProject.platformManager def platformManager = project.rootProject.platformManager
def target = platformManager.targetManager(project.testTarget).target def target = platformManager.targetManager(project.testTarget).target
def dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?: "dist") def dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?:
project.findProperty("konan.home") ?: "dist")
def dependenciesDir = project.rootProject.dependenciesDir def dependenciesDir = project.rootProject.dependenciesDir
def konancDriver = project.isWindows() ? "konanc.bat" : "konanc" def konancDriver = project.isWindows() ? "konanc.bat" : "konanc"
def konanc = new File("${dist.canonicalPath}/bin/$konancDriver").absolutePath def konanc = new File("${dist.canonicalPath}/bin/$konancDriver").absolutePath