From 328a6ff8fc1791be8046815bc36a6e003689c0c3 Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Tue, 26 Feb 2019 11:23:19 +0300 Subject: [PATCH] Divide header option to full form and short deprecated form (#2717) --- .../jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt | 6 ++++-- .../org/jetbrains/kotlin/native/interop/gen/jvm/main.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt index 8b3504310f2..c984e80692e 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt @@ -53,8 +53,10 @@ fun getCInteropArguments(): List { val options = listOf( OptionDescriptor(ArgType.String(), "target", description = "native target to compile to", defaultValue = "host"), OptionDescriptor(ArgType.String(), "def", description = "the library definition file"), - OptionDescriptor(ArgType.String(), "header", "h", "header file to produce kotlin bindings for", - isMultiple = true, delimiter = ",", deprecatedWarning = "Short form -h of option -header is deprecated"), + OptionDescriptor(ArgType.String(), "header", description = "header file to produce kotlin bindings for", + 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", "header file to produce kotlin bindings for", isMultiple = true, delimiter = ","), OptionDescriptor(ArgType.String(), "compilerOpts", "copt", diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt index 4fb6cdba491..0cfb86b3b4b 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt @@ -298,7 +298,7 @@ internal fun buildNativeLibrary( arguments: ArgParser, imports: ImportsImpl ): NativeLibrary { - val additionalHeaders = arguments.getValuesAsArray("header") + val additionalHeaders = arguments.getValuesAsArray("header") + arguments.getValuesAsArray("h") val additionalCompilerOpts = arguments.getValuesAsArray("compilerOpts") val headerFiles = def.config.headers + additionalHeaders