From a8d6fb98f944b12ba4779c55302b3da3fc11338b Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Tue, 3 Apr 2012 16:14:13 +0400 Subject: [PATCH] KotlinCompiler: split classpath by pathSeparator before adding to environment --- .../cli/src/org/jetbrains/jet/cli/KotlinCompiler.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java index 41e8b11a6fb..be035f98d63 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java @@ -16,11 +16,17 @@ package org.jetbrains.jet.cli; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; import com.sampullara.cli.Args; -import org.jetbrains.jet.compiler.*; +import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.CompileEnvironmentException; +import org.jetbrains.jet.compiler.CompilerPlugin; +import org.jetbrains.jet.compiler.MessageRenderer; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; +import java.io.File; import java.io.PrintStream; import java.util.List; @@ -191,7 +197,8 @@ public class KotlinCompiler { } if (arguments.classpath != null) { - environment.addToClasspath(arguments.classpath); + final Iterable classpath = Splitter.on(File.pathSeparatorChar).split(arguments.classpath); + environment.addToClasspath(Iterables.toArray(classpath, String.class)); } } }