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

Use teamcity kotlinLibsRepo and kotlinNativeDistDir parameters

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2021-06-17 01:24:24 +03:00
committed by Space
parent 013a7fe62d
commit 6db5fc0a23
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
+3 -3
View File
@@ -3,12 +3,12 @@ apply plugin: 'base'
final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null
// kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin // kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin
final File kotlinRootDir = rootProject.file( "../../../") final String kotlinRootDir = rootProject.file("../../../").absolutePath
final File kotlinLibsDir = new File(buildDir, 'libs') final String kotlinLibsDir = "$buildDir/libs"
final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master" final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master"
final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.5.255-SNAPSHOT" 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("# Extracting info:")
println(" isTeamcityBuild: $isTeamcityBuild") println(" isTeamcityBuild: $isTeamcityBuild")
libraries/tools/kotlin-stdlib-docs/kotlin_native/build.gradle
+2 -2
View File
@@ -3,8 +3,8 @@ apply plugin: 'base'
final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null
// kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin/kotlin-native // kotlin/libraries/tools/kotlin-stdlib-docs -> kotlin/kotlin-native
final String kotlinNativeRootDir = rootProject.file( "../../../kotlin-native") final String kotlinNativeRootDir = rootProject.file("../../../kotlin-native").absolutePath
final File kotlinNativeLibsDir = isTeamcityBuild ? new File(buildDir, "libs") : new File(kotlinNativeRootDir, "dist") final String kotlinNativeLibsDir = isTeamcityBuild ? project.property("kotlinNativeDistDir") : "$kotlinNativeRootDir/dist"
project.extensions.kotlin_native_root = kotlinNativeRootDir project.extensions.kotlin_native_root = kotlinNativeRootDir
project.extensions.kotlin_native_libs = kotlinNativeLibsDir project.extensions.kotlin_native_libs = kotlinNativeLibsDir