Change previous gradle build for compatibility with the centralized build
incompatible with the main build yet
This commit is contained in:
@@ -9,7 +9,7 @@ sourceSets {
|
||||
annotations {
|
||||
if(!System.properties.'idea.active') {
|
||||
java {
|
||||
srcDir "${rootDir}/../core/runtime.jvm/src"
|
||||
srcDir "${rootDir}/core/runtime.jvm/src"
|
||||
include 'org/jetbrains/annotations/**'
|
||||
}
|
||||
kotlin {
|
||||
@@ -19,13 +19,13 @@ sourceSets {
|
||||
}
|
||||
builtins {
|
||||
java {
|
||||
srcDir "${rootDir}/../core/builtins/src"
|
||||
srcDir "${rootDir}/../core/runtime.jvm/src"
|
||||
srcDir "${rootDir}/core/builtins/src"
|
||||
srcDir "${rootDir}/core/runtime.jvm/src"
|
||||
exclude 'org/jetbrains/annotations/**'
|
||||
}
|
||||
kotlin {
|
||||
srcDir "${rootDir}/../core/builtins/src"
|
||||
srcDir "${rootDir}/../core/runtime.jvm/src"
|
||||
srcDir "${rootDir}/core/builtins/src"
|
||||
srcDir "${rootDir}/core/runtime.jvm/src"
|
||||
exclude 'org/jetbrains/annotations/**'
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,8 @@ task originalStdlibJar(type: Jar) {
|
||||
|
||||
jar {
|
||||
manifestAttributes(manifest, project, 'Main')
|
||||
from("${rootDir}/../dist/builtins")
|
||||
dependsOn ":core:builtins:serialize"
|
||||
from("${rootDir}/dist/builtins")
|
||||
from sourceSets.builtins.output
|
||||
}
|
||||
|
||||
@@ -64,14 +65,14 @@ task distJar(type: Jar) {
|
||||
baseName = 'dist-kotlin-stdlib'
|
||||
version = null
|
||||
manifestAttributes(manifest, project, 'Main')
|
||||
from("${rootDir}/../dist/builtins")
|
||||
from("${rootDir}/dist/builtins")
|
||||
from sourceSets.annotations.output
|
||||
from sourceSets.builtins.output
|
||||
from sourceSets.main.output
|
||||
}
|
||||
|
||||
sourcesJar {
|
||||
from "${rootDir}/../core/builtins/native"
|
||||
from "${rootDir}/core/builtins/native"
|
||||
from sourceSets.builtins.kotlin
|
||||
}
|
||||
|
||||
@@ -102,7 +103,7 @@ compileBuiltinsKotlin {
|
||||
"-version",
|
||||
"-Xallow-kotlin-package",
|
||||
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
|
||||
"-cp", "${rootDir}/../dist/builtins",
|
||||
"-cp", "${rootDir}/dist/builtins",
|
||||
"-module-name", "kotlin-runtime"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -17,7 +17,11 @@ sourceSets {
|
||||
|
||||
createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
|
||||
|
||||
compileKotlinCommon.dependsOn preprocessSourcesMain
|
||||
compileKotlinCommon {
|
||||
dependsOn preprocessSourcesMain
|
||||
// dependsOn ":prepare:compiler:prepare-compiler-with-bootstrap-runtime"
|
||||
// compilerJarFile = compilerJarWithBootstrapRuntime
|
||||
}
|
||||
|
||||
/*
|
||||
// TODO: currently unsupported
|
||||
|
||||
@@ -13,8 +13,8 @@ def builtinsSrcDir = "${buildDir}/builtin-sources"
|
||||
def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
|
||||
def commonSrcDir = "${buildDir}/common-sources"
|
||||
def commonTestSrcDir = "${buildDir}/common-test-sources"
|
||||
def builtinsDir = "${rootDir}/../core/builtins"
|
||||
def jsLibrariesDir = "${rootDir}/../js/js.libraries"
|
||||
def builtinsDir = "${rootDir}/core/builtins"
|
||||
def jsLibrariesDir = "${rootDir}/js/js.libraries"
|
||||
def jsSrcDir = "${jsLibrariesDir}/src"
|
||||
def jsTestSrcDir = "${jsLibrariesDir}/test"
|
||||
def jsSrcJsDir = "${jsSrcDir}/js"
|
||||
@@ -205,7 +205,7 @@ task mergedJar(type: Jar, dependsOn: classes) {
|
||||
|
||||
// TODO: Use standard implementation title after js stdlib detector becomes more flexible
|
||||
Properties properties = new Properties()
|
||||
new File("${rootDir}/../resources/kotlinManifest.properties").withInputStream {
|
||||
new File("${rootDir}/resources/kotlinManifest.properties").withInputStream {
|
||||
properties.load(it)
|
||||
}
|
||||
manifest.attributes 'Implementation-Title' : properties."manifest.impl.title.kotlin.javascript.stdlib"
|
||||
|
||||
Reference in New Issue
Block a user