[build] joint (step 1)
(cherry picked from commit 7d0775f7e69ab900200bcf1fa78b94d68e6bd4f6)
This commit is contained in:
@@ -20,8 +20,7 @@ buildscript {
|
||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}"
|
||||
}
|
||||
}
|
||||
apply plugin: 'kotlin'
|
||||
@@ -32,7 +31,7 @@ apply plugin: 'cpp'
|
||||
|
||||
import org.jetbrains.kotlin.konan.target.ClangArgs
|
||||
|
||||
final Project libclangextProject = project(":libclangext")
|
||||
final Project libclangextProject = project(":kotlin-native:libclangext")
|
||||
final String libclangextTask = libclangextProject.path + ":build"
|
||||
File libclangextDir = new File(libclangextProject.buildDir, "libs/clangext/static")
|
||||
final boolean libclangextIsEnabled = libclangextProject.isEnabled
|
||||
@@ -46,7 +45,7 @@ if (isWindows()) {
|
||||
|
||||
List<String> cflags = [
|
||||
"-I$llvmDir/include",
|
||||
"-I${project(":libclangext").projectDir.absolutePath + "/src/main/include"}"
|
||||
"-I${project(":kotlin-native:libclangext").projectDir.absolutePath}/src/main/include"
|
||||
]*.toString()
|
||||
|
||||
List<String> ldflags = ["$llvmDir/$libclang", "-L$libclangextDir.absolutePath", "-lclangext"]*.toString()
|
||||
@@ -111,15 +110,10 @@ sourceSets {
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
url buildKotlinCompilerRepo
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
compile project(':Interop:Runtime')
|
||||
compile project(":kotlin-stdlib")
|
||||
compile project(':kotlin-native:Interop:Runtime')
|
||||
}
|
||||
|
||||
task nativelibs(type: Copy) {
|
||||
|
||||
@@ -15,6 +15,6 @@
|
||||
*/
|
||||
|
||||
buildscript {
|
||||
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
|
||||
apply from: "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle"
|
||||
}
|
||||
|
||||
|
||||
@@ -23,8 +23,7 @@ buildscript {
|
||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}"
|
||||
}
|
||||
}
|
||||
import org.jetbrains.kotlin.konan.target.ClangArgs
|
||||
@@ -38,9 +37,9 @@ model {
|
||||
include '**/*.c'
|
||||
}
|
||||
binaries.all {
|
||||
def host = rootProject.ext.hostName
|
||||
def host = rootProject.project(":kotlin-native").ext.hostName
|
||||
|
||||
def hostLibffiDir = rootProject.ext.get("${host}LibffiDir")
|
||||
def hostLibffiDir = rootProject.project(":kotlin-native").ext.get("${host}LibffiDir")
|
||||
|
||||
cCompiler.args hostPlatform.clang.hostCompilerArgsForJni
|
||||
cCompiler.args "-I$hostLibffiDir/include"
|
||||
@@ -59,16 +58,10 @@ model {
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
url buildKotlinCompilerRepo
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(":utilities:basic-utils")
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
||||
compile project(":kotlin-native:utilities:basic-utils")
|
||||
compile project(":kotlin-stdlib")
|
||||
compile project(":kotlin-reflect")
|
||||
}
|
||||
|
||||
sourceSets.main.kotlin.srcDirs += "src/jvm/kotlin"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
buildscript {
|
||||
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
|
||||
apply from: "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle"
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin'
|
||||
@@ -23,25 +23,19 @@ apply plugin: 'application'
|
||||
|
||||
mainClassName = "org.jetbrains.kotlin.native.interop.gen.jvm.MainKt"
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
url buildKotlinCompilerRepo
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
implementation project(":Interop:Indexer")
|
||||
implementation project(":utilities:basic-utils")
|
||||
api project(path: ":endorsedLibraries:kotlinx.cli", configuration: "jvmRuntimeElements")
|
||||
implementation project(":kotlin-native:Interop:Indexer")
|
||||
implementation project(":kotlin-native:utilities:basic-utils")
|
||||
api project(path: ":kotlin-native:endorsedLibraries:kotlinx.cli", configuration: "jvmRuntimeElements")
|
||||
|
||||
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
api "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
||||
api "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
api "org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion"
|
||||
api project(":kotlin-stdlib")
|
||||
api project(":kotlin-compiler")
|
||||
api project(":kotlinx-metadata-klib")
|
||||
|
||||
testImplementation "junit:junit:4.12"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test:$buildKotlinVersion"
|
||||
testImplementation project(":kotlin-test:kotlin-test-junit")
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
|
||||
Reference in New Issue
Block a user