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

Repl: fix paths on windows

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-11 16:20:11 +03:00
parent 8a944e099e
commit 30d675d49f
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
+3
View File
@@ -47,4 +47,7 @@ public interface KotlinPaths {
@NotNull
File getJsStdLibSrcJarPath();
@NotNull
File getCompilerPath();
}
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
+6
View File
@@ -82,6 +82,12 @@ public class KotlinPathsFromHomeDir implements KotlinPaths {
return getLibraryFile(PathUtil.JS_LIB_SRC_JAR_NAME);
}
@NotNull
@Override
public File getCompilerPath() {
return getLibraryFile(PathUtil.KOTLIN_COMPILER_JAR);
}
@NotNull
private File getLibraryFile(@NotNull String fileName) {
return new File(getLibPath(), fileName);
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
+3 -2
View File
@@ -38,8 +38,9 @@ public class PathUtil {
public static final String KOTLIN_JAVA_RUNTIME_JAR = "kotlin-runtime.jar";
public static final String KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar";
public static final String KOTLIN_JAVA_RUNTIME_SRC_JAR = "kotlin-runtime-sources.jar";
public static final String HOME_FOLDER_NAME = "kotlinc";
public static final String KOTLIN_COMPILER_JAR = "kotlin-compiler.jar";
public static final String HOME_FOLDER_NAME = "kotlinc";
private static final File NO_PATH = new File("<no_path>");
private PathUtil() {}
@@ -90,7 +91,7 @@ public class PathUtil {
if (!jar.exists()) return NO_PATH;
if (jar.getName().equals("kotlin-compiler.jar")) {
if (jar.getName().equals(KOTLIN_COMPILER_JAR)) {
File lib = jar.getParentFile();
return lib.getParentFile();
}