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

Divide header option to full form and short deprecated form (#2717)

Browse Source
This commit is contained in:
LepilkinaElena
2019-02-26 11:23:19 +03:00
committed by GitHub
parent 30ac956300
commit 328a6ff8fc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt
+4 -2
View File
@@ -53,8 +53,10 @@ fun getCInteropArguments(): List<OptionDescriptor> {
val options = listOf( val options = listOf(
OptionDescriptor(ArgType.String(), "target", description = "native target to compile to", defaultValue = "host"), OptionDescriptor(ArgType.String(), "target", description = "native target to compile to", defaultValue = "host"),
OptionDescriptor(ArgType.String(), "def", description = "the library definition file"), OptionDescriptor(ArgType.String(), "def", description = "the library definition file"),
OptionDescriptor(ArgType.String(), "header", "h", "header file to produce kotlin bindings for", OptionDescriptor(ArgType.String(), "header", description = "header file to produce kotlin bindings for",
isMultiple = true, delimiter = ",", deprecatedWarning = "Short form -h of option -header is deprecated"), isMultiple = true, delimiter = ","),
OptionDescriptor(ArgType.String(), "h", description = "header file to produce kotlin bindings for",
isMultiple = true, delimiter = ",", deprecatedWarning = "Option -h is deprecated. Please use -header."),
OptionDescriptor(ArgType.String(), HEADER_FILTER_ADDITIONAL_SEARCH_PREFIX, "hfasp", OptionDescriptor(ArgType.String(), HEADER_FILTER_ADDITIONAL_SEARCH_PREFIX, "hfasp",
"header file to produce kotlin bindings for", isMultiple = true, delimiter = ","), "header file to produce kotlin bindings for", isMultiple = true, delimiter = ","),
OptionDescriptor(ArgType.String(), "compilerOpts", "copt", OptionDescriptor(ArgType.String(), "compilerOpts", "copt",
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+1 -1
View File
@@ -298,7 +298,7 @@ internal fun buildNativeLibrary(
arguments: ArgParser, arguments: ArgParser,
imports: ImportsImpl imports: ImportsImpl
): NativeLibrary { ): NativeLibrary {
val additionalHeaders = arguments.getValuesAsArray("header") val additionalHeaders = arguments.getValuesAsArray("header") + arguments.getValuesAsArray("h")
val additionalCompilerOpts = arguments.getValuesAsArray("compilerOpts") val additionalCompilerOpts = arguments.getValuesAsArray("compilerOpts")
val headerFiles = def.config.headers + additionalHeaders val headerFiles = def.config.headers + additionalHeaders