[build][dist] global dist fixed

This commit is contained in:
Vasily Levchenko
2020-12-25 09:50:09 +01:00
parent 3298cd3455
commit 7b73917217
11 changed files with 30 additions and 2 deletions
@@ -74,6 +74,12 @@ if (libclangextIsEnabled) {
model { model {
tasks.compileClangstubsSharedLibraryClangstubsC{
dependsOn ":kotlin-native:dependencies:update"
}
tasks.compileClangstubsSharedLibraryClangstubsCpp {
dependsOn ":kotlin-native:dependencies:update"
}
components { components {
clangstubs(NativeLibrarySpec) { clangstubs(NativeLibrarySpec) {
sources { sources {
@@ -84,6 +90,7 @@ model {
binaries.all { binaries.all {
cCompiler.args hostPlatform.clang.hostCompilerArgsForJni cCompiler.args hostPlatform.clang.hostCompilerArgsForJni
cCompiler.args.addAll(cflags) cCompiler.args.addAll(cflags)
cppCompiler.args.add("-std=c++11")
} }
binaries.withType(SharedLibraryBinarySpec) { binaries.withType(SharedLibraryBinarySpec) {
@@ -3,6 +3,7 @@
#include <jni.h> #include <jni.h>
#include <clang-c/Index.h> #include <clang-c/Index.h>
#include <clang-c/ext.h> #include <clang-c/ext.h>
#include <clang-c/ExtVector.h>
// NOTE THIS FILE IS AUTO-GENERATED // NOTE THIS FILE IS AUTO-GENERATED
@@ -30,6 +30,9 @@ import org.jetbrains.kotlin.konan.target.ClangArgs
model { model {
tasks.compileCallbacksSharedLibraryCallbacksC {
dependsOn ":kotlin-native:dependencies:update"
}
components { components {
callbacks(NativeLibrarySpec) { callbacks(NativeLibrarySpec) {
sources.c.source { sources.c.source {
@@ -197,6 +197,7 @@ class NamedNativeInteropConfig implements Named {
} }
genTask.configure { genTask.configure {
dependsOn ":kotlin-native:dependencies:update"
classpath = project.configurations.interopStubGenerator classpath = project.configurations.interopStubGenerator
main = "org.jetbrains.kotlin.native.interop.gen.jvm.MainKt" main = "org.jetbrains.kotlin.native.interop.gen.jvm.MainKt"
jvmArgs '-ea' jvmArgs '-ea'
@@ -65,6 +65,7 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) {
SanitizerKind.THREAD -> " with TSAN" SanitizerKind.THREAD -> " with TSAN"
} }
description = "Compiles '$name' to bitcode for $targetName$sanitizerDescription" description = "Compiles '$name' to bitcode for $targetName$sanitizerDescription"
dependsOn(":kotlin-native:dependencies:update")
configurationBlock() configurationBlock()
} }
} }
+1
View File
@@ -359,6 +359,7 @@ task shadowJar(type: ShadowJar) {
} }
task distCompiler(type: Copy) { task distCompiler(type: Copy) {
dependsOn ":kotlin-native:dependencies:update"
dependsOn ':kotlin-native:shadowJar' dependsOn ':kotlin-native:shadowJar'
destinationDir distDir destinationDir distDir
+6 -2
View File
@@ -8,8 +8,12 @@ plugins {
} }
bitcode { bitcode {
create("hash") create("hash") {
create("files") dependsOn(":kotlin-native:dependencies:update")
}
create("files"){
dependsOn(":kotlin-native:dependencies:update")
}
} }
val hostName: String by project val hostName: String by project
+3
View File
@@ -30,6 +30,9 @@ import org.jetbrains.kotlin.PlatformInfo
ext.isEnabled = PlatformInfo.isMac() ext.isEnabled = PlatformInfo.isMac()
model { model {
tasks.compileClangextStaticLibraryClangextCpp {
dependsOn ":kotlin-native:dependencies:update"
}
components { components {
clangext(NativeLibrarySpec) { clangext(NativeLibrarySpec) {
sources { sources {
@@ -29,6 +29,9 @@ buildscript {
import org.jetbrains.kotlin.konan.target.ClangArgs import org.jetbrains.kotlin.konan.target.ClangArgs
model { model {
tasks.compileCoverageMappingStaticLibraryCoverageMappingCpp {
dependsOn ":kotlin-native:dependencies:update"
}
components { components {
coverageMapping(NativeLibrarySpec) { coverageMapping(NativeLibrarySpec) {
sources.cpp.source.srcDirs "src/main/cpp" sources.cpp.source.srcDirs "src/main/cpp"
@@ -29,6 +29,9 @@ buildscript {
import org.jetbrains.kotlin.konan.target.ClangArgs import org.jetbrains.kotlin.konan.target.ClangArgs
model { model {
tasks.compileDebugInfoStaticLibraryDebugInfoCpp {
dependsOn ":kotlin-native:dependencies:update"
}
components { components {
debugInfo(NativeLibrarySpec) { debugInfo(NativeLibrarySpec) {
sources.cpp.source.srcDirs "src/main/cpp" sources.cpp.source.srcDirs "src/main/cpp"
+1
View File
@@ -28,6 +28,7 @@ val targetList: List<String> by project
bitcode { bitcode {
create("runtime", file("src/main")) { create("runtime", file("src/main")) {
dependsOn( dependsOn(
":kotlin-native:dependencies:update",
":kotlin-native:common:${target}Hash", ":kotlin-native:common:${target}Hash",
"${target}StdAlloc", "${target}StdAlloc",
"${target}OptAlloc", "${target}OptAlloc",