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