Rename -jdk compiler option to -jdk-home (jdkHome), add jdk path validation.

This commit is contained in:
Ilya Gorbunov
2016-06-23 16:33:25 +03:00
parent 13016cae93
commit 7c5c4610e8
13 changed files with 64 additions and 34 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ where possible options include:
-d <directory|jar> Destination for generated class files
-classpath (-cp) <path> Paths where to find user class files
-include-runtime Include Kotlin runtime in to resulting .jar
-jdk <path> Path to JDK home to include into classpath, if differs from default %JAVA_HOME%
-jdk-home <path> Path to JDK home directory to include into classpath, if differs from default JAVA_HOME
-no-jdk Don't include Java runtime into classpath
-no-stdlib Don't include Kotlin runtime into classpath
-module <path> Path to the module file to compile
+1 -1
View File
@@ -1,6 +1,6 @@
$TESTDATA_DIR$/simple.kt
-d
$TEMP_DIR$
-jdk
-jdk-home
$TESTDATA_DIR$
-no-jdk
+1 -1
View File
@@ -1,2 +1,2 @@
warning: the '-jdk' option with a path to JDK is ignored because '-no-jdk' is specified
warning: the '-jdk-home' option is ignored because '-no-jdk' is specified
OK
+1 -1
View File
@@ -4,7 +4,7 @@ where possible options include:
-d <directory|jar> Destination for generated class files
-classpath (-cp) <path> Paths where to find user class files
-include-runtime Include Kotlin runtime in to resulting .jar
-jdk <path> Path to JDK home to include into classpath, if differs from default %JAVA_HOME%
-jdk-home <path> Path to JDK home directory to include into classpath, if differs from default JAVA_HOME
-no-jdk Don't include Java runtime into classpath
-no-stdlib Don't include Kotlin runtime into classpath
-module <path> Path to the module file to compile
+5
View File
@@ -0,0 +1,5 @@
$TESTDATA_DIR$/simple.kt
-d
$TEMP_DIR$
-jdk-home
$TESTDATA_DIR$
+2
View File
@@ -0,0 +1,2 @@
error: no class roots are found in the JDK path: compiler/testData/cli/jvm
COMPILATION_ERROR