azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sources unzipping: make build task depend on sources copy task

Browse Source
This commit is contained in:
Pavel Punegov
2018-06-08 20:12:23 +03:00
committed by Pavel Punegov
parent e3236a5d04
commit d78d14cd00
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+13 -8
View File
@@ -88,7 +88,7 @@ kotlinNativeInterop {
llvm { llvm {
dependsOn ":llvmDebugInfoC:debugInfoStaticLibrary" dependsOn ":llvmDebugInfoC:debugInfoStaticLibrary"
defFile 'llvm.def' defFile 'llvm.def'
if (!project.parent.convention.plugins.platformInfo.isWindows()) if (!project.parent.convention.plugins.platformInfo.isWindows())
compilerOpts "-fPIC" compilerOpts "-fPIC"
compilerOpts "-I$llvmDir/include", "-I${project(':llvmDebugInfoC').projectDir}/src/main/include" compilerOpts "-I$llvmDir/include", "-I${project(':llvmDebugInfoC').projectDir}/src/main/include"
linkerOpts "-L$llvmDir/lib", "-L${project(':llvmDebugInfoC').buildDir}/libs/debugInfo/static" linkerOpts "-L$llvmDir/lib", "-L${project(':llvmDebugInfoC').buildDir}/libs/debugInfo/static"
@@ -98,7 +98,7 @@ kotlinNativeInterop {
if (!project.parent.convention.plugins.platformInfo.isWindows()) { if (!project.parent.convention.plugins.platformInfo.isWindows()) {
compilerOpts '-fPIC' compilerOpts '-fPIC'
linkerOpts '-fPIC' linkerOpts '-fPIC'
} }
linker 'clang++' linker 'clang++'
linkOutputs ":common:${hostName}Hash" linkOutputs ":common:${hostName}Hash"
@@ -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')
include 'generated/**/*.kt'
include 'kotlin/**/*.kt' task unzipStdlibSources(type: Copy) {
from (zipTree(configurations.kotlin_common_stdlib_src.singleFile)) {
include 'generated/**/*.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"
} }