From 6110e4c27c9a93142b5222cfd4d26279b7198b06 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 31 Mar 2017 15:47:03 +0700 Subject: [PATCH] gradle-plugin: Log compilation and interop args --- .../src/main/kotlin/KonanCompilerTask.kt | 11 ++++------- .../src/main/kotlin/KonanInteropTask.kt | 14 +++++--------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt b/tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt index cece69fd793..56a67783a92 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt @@ -37,13 +37,10 @@ open class KonanCompileTask: DefaultTask() { // Other compilation parameters ------------------------------------------- - @InputFiles var inputFiles = mutableSetOf() - internal set + @InputFiles val inputFiles = mutableSetOf() - @InputFiles var libraries = mutableSetOf() - internal set - @InputFiles var nativeLibraries = mutableSetOf() - internal set + @InputFiles val libraries = mutableSetOf() + @InputFiles val nativeLibraries = mutableSetOf() @Input var linkerOpts = mutableListOf() 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 = " ")}") }) } } } diff --git a/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt b/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt index 01ed823fc94..c4c015a4c9d 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt @@ -44,16 +44,12 @@ open class KonanInteropTask: DefaultTask() { @Optional @Input var linker: String? = null internal set - @Input var compilerOpts = mutableListOf() - internal set - @Input var linkerOpts = mutableListOf() - internal set + @Input val compilerOpts = mutableListOf() + @Input val linkerOpts = mutableListOf() // TODO: Check if we can use only one FileCollection instead of set. - @InputFiles var headers = mutableSetOf() - internal set - @InputFiles var linkFiles = mutableSetOf() - internal set + @InputFiles val headers = mutableSetOf() + @InputFiles val linkFiles = mutableSetOf() @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 = " ")}") }) } } }