Fix sources unzipping: make build task depend on sources copy task
This commit is contained in:
committed by
Pavel Punegov
parent
e3236a5d04
commit
d78d14cd00
@@ -160,9 +160,14 @@ classes.dependsOn 'compilerClasses','cli_bcClasses','bc_frontendClasses'
|
|||||||
task stdlib(dependsOn: "${hostName}Stdlib")
|
task stdlib(dependsOn: "${hostName}Stdlib")
|
||||||
task start(dependsOn: "${hostName}Start")
|
task start(dependsOn: "${hostName}Start")
|
||||||
|
|
||||||
def commonSrc = zipTree(configurations.kotlin_common_stdlib_src.singleFile).matching {
|
def commonSrc = file('build/stdlib')
|
||||||
|
|
||||||
|
task unzipStdlibSources(type: Copy) {
|
||||||
|
from (zipTree(configurations.kotlin_common_stdlib_src.singleFile)) {
|
||||||
include 'generated/**/*.kt'
|
include 'generated/**/*.kt'
|
||||||
include 'kotlin/**/*.kt'
|
include 'kotlin/**/*.kt'
|
||||||
|
}
|
||||||
|
destinationDir commonSrc
|
||||||
}
|
}
|
||||||
|
|
||||||
// These files are built before the 'dist' is complete,
|
// These files are built before the 'dist' is complete,
|
||||||
@@ -190,8 +195,7 @@ targetList.each { target ->
|
|||||||
'-output', project(':runtime').file("build/${target}Stdlib"),
|
'-output', project(':runtime').file("build/${target}Stdlib"),
|
||||||
'-produce', 'library', '-module_name', 'stdlib',
|
'-produce', 'library', '-module_name', 'stdlib',
|
||||||
'-Xmulti-platform', '-Xuse-experimental=kotlin.Experimental',
|
'-Xmulti-platform', '-Xuse-experimental=kotlin.Experimental',
|
||||||
'--disable', 'devirtualization',
|
commonSrc.absolutePath,
|
||||||
*commonSrc.files.toList(),
|
|
||||||
project(':Interop:Runtime').file('src/main/kotlin'),
|
project(':Interop:Runtime').file('src/main/kotlin'),
|
||||||
project(':Interop:Runtime').file('src/native/kotlin'),
|
project(':Interop:Runtime').file('src/native/kotlin'),
|
||||||
project(':Interop:JsRuntime').file('src/main/kotlin'),
|
project(':Interop:JsRuntime').file('src/main/kotlin'),
|
||||||
@@ -200,9 +204,10 @@ targetList.each { target ->
|
|||||||
inputs.dir(project(':Interop:Runtime').file('src/main/kotlin'))
|
inputs.dir(project(':Interop:Runtime').file('src/main/kotlin'))
|
||||||
inputs.dir(project(':Interop:Runtime').file('src/native/kotlin'))
|
inputs.dir(project(':Interop:Runtime').file('src/native/kotlin'))
|
||||||
inputs.dir(project(':Interop:JsRuntime').file('src/main/kotlin'))
|
inputs.dir(project(':Interop:JsRuntime').file('src/main/kotlin'))
|
||||||
inputs.files(commonSrc)
|
inputs.dir(commonSrc)
|
||||||
outputs.dir(project(':runtime').file("build/${target}Stdlib"))
|
outputs.dir(project(':runtime').file("build/${target}Stdlib"))
|
||||||
|
|
||||||
|
dependsOn 'unzipStdlibSources'
|
||||||
dependsOn ":runtime:${target}Runtime"
|
dependsOn ":runtime:${target}Runtime"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user