Support argfiles in kotlin compiler

Using '-Xargfile=path/to/argfile' will substitute
that argument with the content of argfile.

See KT-24472
This commit is contained in:
Dmitry Savvinov
2018-05-17 21:36:59 +03:00
parent ede2e227c2
commit 43467516ef
18 changed files with 210 additions and 29 deletions
@@ -52,7 +52,9 @@ data class ArgumentParseErrors(
// Arguments where [Argument.deprecatedName] was used; the key is the deprecated name, the value is the new name ([Argument.value])
val deprecatedArguments: MutableMap<String, String> = mutableMapOf(),
var argumentWithoutValue: String? = null
var argumentWithoutValue: String? = null,
val argfileErrors: MutableList<String> = SmartList<String>()
)
// Parses arguments into the passed [result] object. Errors related to the parsing will be collected into [CommonToolArguments.errors].
@@ -0,0 +1,77 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.cli.common.arguments
import java.io.*
import java.nio.charset.StandardCharsets
private val experimentalArgfileArgument = "-Xargfile"
private val QUOTATION_MARK = '"'
private val BACKSLASH = '\\'
private val WHITESPACE = ' '
private val NEWLINE = '\n'
/**
* Performs initial preprocessing of arguments, passed to the compiler.
* This is done prior to *any* arguments parsing, and result of preprocessing
* will be used instead of actual passed arguments.
*/
fun <A : CommonToolArguments> preprocessCommandLineArguments(args: List<String>, result: A): List<String> =
args.flatMap {
if (it.isArgumentForArgfile)
File(it.argfilePath).expand(result)
else
listOf(it)
}
private fun <A : CommonToolArguments> File.expand(result: A): List<String> {
return try {
bufferedReader(Charsets.UTF_8).use {
generateSequence { it.parseNextArgument() }.toList()
}
} catch (e: FileNotFoundException) {
// Process FNFE separately to render absolutePath in error message
result.errors.argfileErrors += "Argfile not found: $absolutePath"
emptyList()
} catch (e: IOException) {
result.errors.argfileErrors += "Error while reading argfile: $e"
emptyList()
}
}
private fun Reader.parseNextArgument(): String? {
val sb = StringBuilder()
var r: Int = read()
while (r != -1) {
when (r.toChar()) {
WHITESPACE, NEWLINE -> return sb.toString()
QUOTATION_MARK -> consumeRestOfEscapedSequence(sb)
BACKSLASH -> sb.append(read().toChar())
else -> sb.append(r.toChar())
}
r = read()
}
return sb.toString().takeIf { it.isNotEmpty() }
}
private fun Reader.consumeRestOfEscapedSequence(sb: StringBuilder) {
var ch = read().toChar()
while (ch != QUOTATION_MARK) {
if (ch == BACKSLASH) sb.append(read().toChar()) else sb.append(ch)
ch = read().toChar()
}
}
private val String.argfilePath: String
get() = removePrefix("$experimentalArgfileArgument=")
// Note that currently we use only experimental syntax for passing argfiles
// In 1.3 we can support also javac-like syntax `@argfile`
private val String.isArgumentForArgfile: Boolean
get() = startsWith("$experimentalArgfileArgument=")