Use teamcity kotlinLibsRepo and kotlinNativeDistDir parameters
This commit is contained in:
committed by
Space
parent
013a7fe62d
commit
6db5fc0a23
@@ -3,12 +3,12 @@ apply plugin: 'base'
|
||||
final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null
|
||||
|
||||
// kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin
|
||||
final File kotlinRootDir = rootProject.file( "../../../")
|
||||
final File kotlinLibsDir = new File(buildDir, 'libs')
|
||||
final String kotlinRootDir = rootProject.file("../../../").absolutePath
|
||||
final String kotlinLibsDir = "$buildDir/libs"
|
||||
|
||||
final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master"
|
||||
final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.5.255-SNAPSHOT"
|
||||
final String repo = isTeamcityBuild ? new File(buildDir, 'repo') : new File(kotlinRootDir, 'build/repo')
|
||||
final String repo = isTeamcityBuild ? project.property("kotlinLibsRepo") : "$kotlinRootDir/build/repo"
|
||||
|
||||
println("# Extracting info:")
|
||||
println(" isTeamcityBuild: $isTeamcityBuild")
|
||||
|
||||
@@ -3,8 +3,8 @@ apply plugin: 'base'
|
||||
final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null
|
||||
|
||||
// kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin/kotlin-native
|
||||
final String kotlinNativeRootDir = rootProject.file( "../../../kotlin-native")
|
||||
final File kotlinNativeLibsDir = isTeamcityBuild ? new File(buildDir, "libs") : new File(kotlinNativeRootDir, "dist")
|
||||
final String kotlinNativeRootDir = rootProject.file("../../../kotlin-native").absolutePath
|
||||
final String kotlinNativeLibsDir = isTeamcityBuild ? project.property("kotlinNativeDistDir") : "$kotlinNativeRootDir/dist"
|
||||
|
||||
project.extensions.kotlin_native_root = kotlinNativeRootDir
|
||||
project.extensions.kotlin_native_libs = kotlinNativeLibsDir
|
||||
|
||||
Reference in New Issue
Block a user