erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Add <kobaltCompilerFlagss> in settings.xml.

Browse source
This commit is contained in:
Cedric Beust 2017-01-14 10:14:34 -08:00
parent fb0da19f24
commit 991887e280
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt
View file

@ -34,6 +34,9 @@ class KobaltSettingsXml {
@XmlElement(name = "kobaltCompilerRepo") @JvmField @XmlElement(name = "kobaltCompilerRepo") @JvmField
var kobaltCompilerRepo: String? = null var kobaltCompilerRepo: String? = null
@XmlElement(name = "kobaltCompilerFlags") @JvmField
var kobaltCompilerFlags: String? = null
} }
class ProxiesXml { class ProxiesXml {
@ -97,6 +100,7 @@ class KobaltSettings @Inject constructor(val xmlFile: KobaltSettingsXml) {
var kobaltCompilerVersion = xmlFile.kobaltCompilerVersion var kobaltCompilerVersion = xmlFile.kobaltCompilerVersion
var kobaltCompilerRepo = xmlFile.kobaltCompilerRepo var kobaltCompilerRepo = xmlFile.kobaltCompilerRepo
var kobaltCompilerFlags = xmlFile.kobaltCompilerFlags
companion object { companion object {
val SETTINGS_FILE_PATH = KFiles.joinDir(KFiles.HOME_KOBALT_DIR.absolutePath, "settings.xml") val SETTINGS_FILE_PATH = KFiles.joinDir(KFiles.HOME_KOBALT_DIR.absolutePath, "settings.xml")

17
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -85,6 +85,23 @@ class KotlinCompiler @Inject constructor(
friendPaths = friends friendPaths = friends
} }
/**
* ~/.config/kobalt/settings.xml allows users to specify -Xflags in the
* <kobaltCompilerFlags> tag. Map each of these string flags to the boolean
* found in the args class
*/
fun updateArgsWithCompilerFlags(args: K2JVMCompilerArguments, settings: KobaltSettings) {
val flags = settings.kobaltCompilerFlags?.split(" ")
flags?.forEach {
if (it.startsWith("-X")) when(it.substring(2)) {
"skip-metadata-version-check" -> args.skipMetadataVersionCheck = true
else -> warn("Unknown Kotlin compiler flag found in config.xml: $it")
}
}
}
updateArgsWithCompilerFlags(args, settings)
fun logk(level: Int, message: CharSequence) = kobaltLog.log(projectName ?: "", level, message) fun logk(level: Int, message: CharSequence) = kobaltLog.log(projectName ?: "", level, message)
logk(2, "Invoking K2JVMCompiler with arguments:" logk(2, "Invoking K2JVMCompiler with arguments:"