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

gradle-plugin: Log compilation and interop args

Browse Source
This commit is contained in:
Ilya Matveev
2017-03-31 15:47:03 +07:00
committed by ilmat192
parent ffe022d4c8
commit 6110e4c27c
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt
+4 -7
View File
@@ -37,13 +37,10 @@ open class KonanCompileTask: DefaultTask() {
// Other compilation parameters -------------------------------------------
@InputFiles var inputFiles = mutableSetOf<FileCollection>()
internal set
@InputFiles val inputFiles = mutableSetOf<FileCollection>()
@InputFiles var libraries = mutableSetOf<FileCollection>()
internal set
@InputFiles var nativeLibraries = mutableSetOf<FileCollection>()
internal set
@InputFiles val libraries = mutableSetOf<FileCollection>()
@InputFiles val nativeLibraries = mutableSetOf<FileCollection>()
@Input var linkerOpts = mutableListOf<String>()
internal set
@@ -134,7 +131,7 @@ open class KonanCompileTask: DefaultTask() {
main = COMPILER_MAIN
classpath = project.fileTree(COMPILER_CLASSPATH).apply { include("*.jar") }
jvmArgs(COMPILER_JVM_ARGS)
args(buildArgs())
args(buildArgs().apply { logger.info("Compiler args: ${this.joinToString(separator = " ")}") })
}
}
}
tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt
+5 -9
View File
@@ -44,16 +44,12 @@ open class KonanInteropTask: DefaultTask() {
@Optional @Input var linker: String? = null
internal set
@Input var compilerOpts = mutableListOf<String>()
internal set
@Input var linkerOpts = mutableListOf<String>()
internal set
@Input val compilerOpts = mutableListOf<String>()
@Input val linkerOpts = mutableListOf<String>()
// TODO: Check if we can use only one FileCollection instead of set.
@InputFiles var headers = mutableSetOf<FileCollection>()
internal set
@InputFiles var linkFiles = mutableSetOf<FileCollection>()
internal set
@InputFiles val headers = mutableSetOf<FileCollection>()
@InputFiles val linkFiles = mutableSetOf<FileCollection>()
@TaskAction
fun exec() {
@@ -66,7 +62,7 @@ open class KonanInteropTask: DefaultTask() {
environment("LD_LIBRARY_PATH", "${project.konanHome}/nativelib")
environment("DYLD_LIBRARY_PATH", "${project.konanHome}/nativelib")
args(buildArgs())
args(buildArgs().apply { logger.info("Interop args: ${this.joinToString(separator = " ")}") })
}
}
}