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

[stage][link][debug] always produce code with debug info.

Browse Source
This commit is contained in:
Vasily Levchenko
2017-06-13 11:19:22 +03:00
committed by vvlevchenko
parent b1db2fa182
commit 7ef5cbb52a
4 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+24 -28
View File
@@ -144,7 +144,7 @@ build.dependsOn 'compilerClasses','cli_bcClasses','bc_frontendClasses'
// These are just a couple of aliases
task stdlib(dependsOn: "${host}Stdlib")
task stdlib(dependsOn: "${host}Stdlib")
task start(dependsOn: "${host}Start")
// These files are built before the 'dist' is complete,
@@ -152,23 +152,27 @@ task start(dependsOn: "${host}Start")
// -runtime, -properties, -library and -Djava.library.path
targetList.each { target ->
def konanJvmArgs = ["-ea",
"-Dkonan.home=${project.parent.file('dist')}",
"-Djava.library.path=${project.buildDir}/nativelibs",
"-Dfile.encoding=UTF-8"]
def konanArgs = ['-nopack', '-nostdlib','-ea', '-g',
'-target', target,
'-runtime', project(':runtime').file("build/${target}/runtime.bc"),
'-properties', rootProject.konanPropertiesFile.canonicalPath,
*project.globalBuildArgs]
task("${target}Stdlib", type: JavaExec) {
main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
classpath = project.configurations.cli_bc
jvmArgs "-ea",
"-Dkonan.home=${project.parent.file('dist')}",
"-Djava.library.path=${project.buildDir}/nativelibs",
"-Dfile.encoding=UTF-8"
args('-output', project(':runtime').file("build/${target}Stdlib"),
'-nopack', '-nostdlib','-ea',
'-produce', 'library', '-target', target,
'-runtime', project(':runtime').file("build/${target}/runtime.bc"),
'-properties', project(':backend.native').file('konan.properties'),
project(':runtime').file('src/main/kotlin'),
project(':Interop:Runtime').file('src/main/kotlin'),
project(':Interop:Runtime').file('src/native/kotlin'),
*project.globalBuildArgs)
jvmArgs.addAll(konanJvmArgs)
args = [*konanArgs,
'-output', project(':runtime').file("build/${target}Stdlib"),
'-produce', 'library',
project(':Interop:Runtime').file('src/main/kotlin'),
project(':Interop:Runtime').file('src/native/kotlin'),
project(':runtime').file('src/main/kotlin')]
inputs.dir(project(':runtime').file('src/main/kotlin'))
inputs.dir(project(':Interop:Runtime').file('src/main/kotlin'))
inputs.dir(project(':Interop:Runtime').file('src/native/kotlin'))
@@ -176,23 +180,15 @@ targetList.each { target ->
dependsOn ":runtime:${target}Runtime"
}
}
targetList.each { target ->
task("${target}Start", type: JavaExec) {
main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
classpath = project.configurations.cli_bc
jvmArgs "-ea",
"-Dkonan.home=${project.parent.file('dist')}",
"-Djava.library.path=${project.buildDir}/nativelibs"
args('-output', project(':runtime').file("build/${target}Start"),
'-nopack', '-nostdlib', '-ea',
'-produce', 'bitcode', '-target', target,
'-library', project(':runtime').file("build/${target}Stdlib"),
'-runtime', project(':runtime').file("build/${target}/runtime.bc"),
'-properties', rootProject.konanPropertiesFile.canonicalPath,
project(':runtime').file('src/launcher/kotlin'),
*project.globalBuildArgs)
jvmArgs(*jvmArgs)
args = [*konanArgs, '-produce', 'bitcode',
'-output', project(':runtime').file("build/${target}Start"),
'-library', project(':runtime').file("build/${target}Stdlib"),
project(':runtime').file('src/launcher/kotlin')]
inputs.dir(project(':runtime').file('src/launcher/kotlin'))
outputs.file(project(':runtime').file("build/${target}Start"))