Removed obsolete -mode CLI parameter.
This commit is contained in:
@@ -415,8 +415,6 @@
|
|||||||
<arg value="-output"/>
|
<arg value="-output"/>
|
||||||
<arg value="${output}/classes/stdlib"/>
|
<arg value="${output}/classes/stdlib"/>
|
||||||
<arg value="-noStdlib"/>
|
<arg value="-noStdlib"/>
|
||||||
<arg value="-mode"/>
|
|
||||||
<arg value="stdlib"/>
|
|
||||||
<arg value="-classpath"/>
|
<arg value="-classpath"/>
|
||||||
<arg value="${output}/classes/runtime"/>
|
<arg value="${output}/classes/runtime"/>
|
||||||
</java>
|
</java>
|
||||||
@@ -448,8 +446,6 @@
|
|||||||
<arg value="-output"/>
|
<arg value="-output"/>
|
||||||
<arg value="${output}/classes/lang"/>
|
<arg value="${output}/classes/lang"/>
|
||||||
<arg value="-noStdlib"/>
|
<arg value="-noStdlib"/>
|
||||||
<arg value="-mode"/>
|
|
||||||
<arg value="builtins"/>
|
|
||||||
<arg value="-builtins"/>
|
<arg value="-builtins"/>
|
||||||
</java>
|
</java>
|
||||||
|
|
||||||
|
|||||||
@@ -74,9 +74,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
|
|||||||
@Argument(value = "jdkAnnotations", description = "Path to the kotlin-jdk-annotations.jar")
|
@Argument(value = "jdkAnnotations", description = "Path to the kotlin-jdk-annotations.jar")
|
||||||
public String jdkAnnotations;
|
public String jdkAnnotations;
|
||||||
|
|
||||||
@Argument(value = "mode", description = "Special compiler modes: stubs or jdkHeaders")
|
|
||||||
public String mode;
|
|
||||||
|
|
||||||
@Argument(value = "output", description = "output directory")
|
@Argument(value = "output", description = "output directory")
|
||||||
public String outputDir;
|
public String outputDir;
|
||||||
|
|
||||||
@@ -163,14 +160,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
|
|||||||
this.stdlib = stdlib;
|
this.stdlib = stdlib;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMode() {
|
|
||||||
return mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMode(String mode) {
|
|
||||||
this.mode = mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isTags() {
|
public boolean isTags() {
|
||||||
return tags;
|
return tags;
|
||||||
|
|||||||
@@ -39,8 +39,7 @@ public class ForTestCompileBuiltins {
|
|||||||
@Override
|
@Override
|
||||||
protected void doCompile(@NotNull File classesDir) throws Exception {
|
protected void doCompile(@NotNull File classesDir) throws Exception {
|
||||||
ExitCode exitCode = new K2JVMCompiler().exec(
|
ExitCode exitCode = new K2JVMCompiler().exec(
|
||||||
System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-noStdlib", "-mode", "builtins",
|
System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-noStdlib", "-builtins");
|
||||||
"-builtins");
|
|
||||||
if (exitCode != ExitCode.OK) {
|
if (exitCode != ExitCode.OK) {
|
||||||
throw new IllegalStateException("builtins compilation failed: " + exitCode);
|
throw new IllegalStateException("builtins compilation failed: " + exitCode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ public class ForTestCompileRuntime {
|
|||||||
"-output", destdir.getPath(),
|
"-output", destdir.getPath(),
|
||||||
"-src", "./libraries/stdlib/src",
|
"-src", "./libraries/stdlib/src",
|
||||||
"-noStdlib",
|
"-noStdlib",
|
||||||
"-mode", "stdlib",
|
|
||||||
"-classpath", "out/production/runtime");
|
"-classpath", "out/production/runtime");
|
||||||
if (exitCode != ExitCode.OK) {
|
if (exitCode != ExitCode.OK) {
|
||||||
throw new IllegalStateException("stdlib for test compilation failed: " + exitCode);
|
throw new IllegalStateException("stdlib for test compilation failed: " + exitCode);
|
||||||
|
|||||||
@@ -270,8 +270,7 @@ public class JetCompiler implements TranslatingCompiler {
|
|||||||
"-module", scriptFile.getAbsolutePath(),
|
"-module", scriptFile.getAbsolutePath(),
|
||||||
"-output", path(outputDir),
|
"-output", path(outputDir),
|
||||||
"-tags", "-verbose", "-version",
|
"-tags", "-verbose", "-version",
|
||||||
"-noStdlib", "-noJdkAnnotations", "-noJdk",
|
"-noStdlib", "-noJdkAnnotations", "-noJdk"};
|
||||||
"-mode", "idea"};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void runOutOfProcess(final CompileContext compileContext,
|
private static void runOutOfProcess(final CompileContext compileContext,
|
||||||
|
|||||||
Reference in New Issue
Block a user