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

Remove redundant use of mac and windows binaries

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2021-06-05 14:12:25 +03:00
committed by Space
parent feaef467cd
commit 9777888ed4
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-dokka-stdlib/build-docs.xml
-2
View File
@@ -15,8 +15,6 @@
<property name="kotlin_native_root" location="IT_IS_SET_FROM_GRADLE6"/> <property name="kotlin_native_root" location="IT_IS_SET_FROM_GRADLE6"/>
<property name="kotlin_native_linux" location="IT_IS_SET_FROM_GRADLE7"/> <property name="kotlin_native_linux" location="IT_IS_SET_FROM_GRADLE7"/>
<property name="kotlin_native_windows" location="IT_IS_SET_FROM_GRADLE8"/>
<property name="kotlin_native_mac" location="IT_IS_SET_FROM_GRADLE9"/>
<property name="language.version" value="1.5"/> <property name="language.version" value="1.5"/>
libraries/tools/kotlin-dokka-stdlib/build.gradle
-2
View File
@@ -74,7 +74,5 @@ setupCallDokka.doLast {
"-Dkotlin_libs=${pKotlinBig().kotlin_libs}", "-Dkotlin_libs=${pKotlinBig().kotlin_libs}",
"-Dkotlin_native_root=${pKotlinNative().kotlin_native_root}", "-Dkotlin_native_root=${pKotlinNative().kotlin_native_root}",
"-Dkotlin_native_linux=${pKotlinNative().kotlin_native_bin_linux}", "-Dkotlin_native_linux=${pKotlinNative().kotlin_native_bin_linux}",
"-Dkotlin_native_windows=${pKotlinNative().kotlin_native_bin_windows}",
"-Dkotlin_native_mac=${pKotlinNative().kotlin_native_bin_mac}",
] ]
} }
libraries/tools/kotlin-dokka-stdlib/kotlin_native/build.gradle
+1 -17
View File
@@ -35,8 +35,6 @@ if (useBuildServer) {
configurations { configurations {
kotlin_native_linux kotlin_native_linux
kotlin_native_mac
kotlin_native_windows
} }
def kotlinNativeDep(String target, String ext) { def kotlinNativeDep(String target, String ext) {
@@ -47,8 +45,6 @@ def kotlinNativeDep(String target, String ext) {
dependencies { dependencies {
kotlin_native_linux kotlinNativeDep("linux", "tar.gz") kotlin_native_linux kotlinNativeDep("linux", "tar.gz")
kotlin_native_mac kotlinNativeDep("macos", "tar.gz")
kotlin_native_windows kotlinNativeDep("windows", "zip")
} }
final File kotlin_native_dir = new File(buildDir, "kotlin_native") final File kotlin_native_dir = new File(buildDir, "kotlin_native")
@@ -58,16 +54,6 @@ task extractKotlinNativeBinariesLinux(type: Sync) {
into new File(kotlin_native_dir, 'linux') into new File(kotlin_native_dir, 'linux')
} }
task extractKotlinNativeBinariesMac(type: Sync) {
from { tarTree(resources.gzip(configurations.kotlin_native_mac.singleFile)) }
into new File(kotlin_native_dir, 'mac')
}
task extractKotlinNativeBinariesWindows(type: Sync) {
from { zipTree(configurations.kotlin_native_windows.singleFile) }
into new File(kotlin_native_dir, 'windows')
}
final File teamCityBuildInfo = new File(buildDir, "kotlin-native-build-${kotlin_native_build}.xml") final File teamCityBuildInfo = new File(buildDir, "kotlin-native-build-${kotlin_native_build}.xml")
final String teamCityBuildsURL = "$buildServer/guestAuth/app/rest/builds/buildType:${kotlin_native_build_configuration},branch:default:any,number:${kotlin_native_build}" final String teamCityBuildsURL = "$buildServer/guestAuth/app/rest/builds/buildType:${kotlin_native_build_configuration},branch:default:any,number:${kotlin_native_build}"
@@ -132,9 +118,7 @@ task extractKotlinNativeSources(type: Sync, dependsOn: downloadKotlinNativeSourc
} }
} }
task extractKotlinNative(dependsOn: [extractKotlinNativeSources, extractKotlinNativeBinariesLinux, extractKotlinNativeBinariesMac, extractKotlinNativeBinariesWindows]) {} task extractKotlinNative(dependsOn: [extractKotlinNativeSources, extractKotlinNativeBinariesLinux]) {}
project.extensions.kotlin_native_root = findProperty("kotlinLocalRoot") == null ? kotlinTargetDir : findProperty("kotlinLocalRoot") + "/kotlin-native" project.extensions.kotlin_native_root = findProperty("kotlinLocalRoot") == null ? kotlinTargetDir : findProperty("kotlinLocalRoot") + "/kotlin-native"
project.extensions.kotlin_native_bin_linux = new File(kotlin_native_dir, "linux/kotlin-native-linux-${kotlin_native_version}") project.extensions.kotlin_native_bin_linux = new File(kotlin_native_dir, "linux/kotlin-native-linux-${kotlin_native_version}")
project.extensions.kotlin_native_bin_mac = new File(kotlin_native_dir, "mac/kotlin-native-mac-${kotlin_native_version}")
project.extensions.kotlin_native_bin_windows = new File(kotlin_native_dir, "windows/kotlin-native-windows-${kotlin_native_version}")