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

Fixes after code review

Browse Source
This commit is contained in:
Alexey Tsvetkov
2019-02-18 14:58:32 +03:00
parent ada880fbad
commit 4154e97aa3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+1 -1
View File
@@ -195,7 +195,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
@Argument( @Argument(
value = "-Xjava-source-roots", value = "-Xjava-source-roots",
valueDescription = "<path>", valueDescription = "<path>",
description = "Paths to output directories for friend modules (whose internals should be visible)" description = "Paths to directories with Java source files"
) )
var javaSourceRoots: Array<String>? by FreezableVar(null) var javaSourceRoots: Array<String>? by FreezableVar(null)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+2 -2
View File
@@ -77,11 +77,11 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
for (arg in arguments.freeArgs) { for (arg in arguments.freeArgs) {
val file = File(arg) val file = File(arg)
if (file.extension == JavaFileType.DEFAULT_EXTENSION) { if (file.extension == JavaFileType.DEFAULT_EXTENSION) {
configuration.addJavaSourceRoot(file) configuration.addJavaSourceRoot(file, arguments.javaPackagePrefix)
} else { } else {
configuration.addKotlinSourceRoot(arg, isCommon = arg in commonSources) configuration.addKotlinSourceRoot(arg, isCommon = arg in commonSources)
if (file.isDirectory) { if (file.isDirectory) {
configuration.addJavaSourceRoot(file) configuration.addJavaSourceRoot(file, arguments.javaPackagePrefix)
} }
} }
} }
compiler/testData/cli/jvm/extraHelp.out
Vendored
+2
View File
@@ -22,6 +22,8 @@ where advanced options include:
-Xfriend-paths=<path> Paths to output directories for friend modules (whose internals should be visible) -Xfriend-paths=<path> Paths to output directories for friend modules (whose internals should be visible)
-Xmultifile-parts-inherit Compile multifile classes as a hierarchy of parts and facade -Xmultifile-parts-inherit Compile multifile classes as a hierarchy of parts and facade
-Xmodule-path=<path> Paths where to find Java 9+ modules -Xmodule-path=<path> Paths where to find Java 9+ modules
-Xjava-package-prefix Package prefix for Java files
-Xjava-source-roots=<path> Paths to directories with Java source files
-Xjavac-arguments=<option[,]> Java compiler arguments -Xjavac-arguments=<option[,]> Java compiler arguments
-Xjsr305={ignore/strict/warn}|under-migration:{ignore/strict/warn}|@<fq.name>:{ignore/strict/warn} -Xjsr305={ignore/strict/warn}|under-migration:{ignore/strict/warn}|@<fq.name>:{ignore/strict/warn}
Specify behavior for JSR-305 nullability annotations: Specify behavior for JSR-305 nullability annotations: