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

Drop support of KOTLIN_HOME environment variable in the command-line compiler

Browse Source 
it is proved to be fragile and seems unnecessary at the moment
This commit is contained in:
Ilya Chernikov
2018-07-06 16:38:56 +02:00
parent 9549736d35
commit b83948f241
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
+1 -5
View File
@@ -50,7 +50,6 @@ import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
public abstract class CLICompiler<A extends CommonCompilerArguments> extends CLITool<A> { public abstract class CLICompiler<A extends CommonCompilerArguments> extends CLITool<A> {
public static String KOTLIN_HOME_PROPERTY = "kotlin.home"; public static String KOTLIN_HOME_PROPERTY = "kotlin.home";
public static String KOTLIN_HOME_ENV_VAR = "KOTLIN_HOME";
// Used in CompilerRunnerUtil#invokeExecMethod, in Eclipse plugin (KotlinCLICompiler) and in kotlin-gradle-plugin (GradleCompilerRunner) // Used in CompilerRunnerUtil#invokeExecMethod, in Eclipse plugin (KotlinCLICompiler) and in kotlin-gradle-plugin (GradleCompilerRunner)
@NotNull @NotNull
@@ -165,16 +164,13 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> extends CLI
CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, arguments.configureLanguageVersionSettings(collector)); CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, arguments.configureLanguageVersionSettings(collector));
} }
private static final String kotlinHomeEnvVar = System.getenv(KOTLIN_HOME_ENV_VAR);
@Nullable @Nullable
private static KotlinPaths computeKotlinPaths(@NotNull MessageCollector messageCollector, @NotNull CommonCompilerArguments arguments) { private static KotlinPaths computeKotlinPaths(@NotNull MessageCollector messageCollector, @NotNull CommonCompilerArguments arguments) {
KotlinPaths paths; KotlinPaths paths;
String kotlinHomeProperty = System.getProperty(KOTLIN_HOME_PROPERTY); String kotlinHomeProperty = System.getProperty(KOTLIN_HOME_PROPERTY);
File kotlinHome = File kotlinHome =
arguments.getKotlinHome() != null ? new File(arguments.getKotlinHome()) : arguments.getKotlinHome() != null ? new File(arguments.getKotlinHome()) :
kotlinHomeProperty != null ? new File(kotlinHomeProperty) : kotlinHomeProperty != null ? new File(kotlinHomeProperty)
kotlinHomeEnvVar != null ? new File(kotlinHomeEnvVar)
: null; : null;
if (kotlinHome != null) { if (kotlinHome != null) {
if (kotlinHome.isDirectory()) { if (kotlinHome.isDirectory()) {