From 7539eb3dfc86218d824843c6e70e4673d80d1673 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Sun, 30 Nov 2014 03:06:24 +0300 Subject: [PATCH] Fix build on windows: use forward-slash in path to config files, it's important for access to files inside jar/zip. --- .../jet/cli/jvm/compiler/EnvironmentConfigFiles.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java index 38f9476759e..d332064d20e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java @@ -16,17 +16,16 @@ package org.jetbrains.jet.cli.jvm.compiler; -import java.io.File; import java.util.Arrays; import java.util.List; public class EnvironmentConfigFiles { - private static final String EXTENSIONS_DIR = "extensions"; + private static final String EXTENSIONS_DIR = "extensions/"; - private static final String COMMON_CONFIG_FILE = EXTENSIONS_DIR + File.separator + "common.xml"; - private static final String JVM_CONFIG_FILE = EXTENSIONS_DIR + File.separator + "kotlin2jvm.xml"; - private static final String JS_CONFIG_FILE = EXTENSIONS_DIR + File.separator + "kotlin2js.xml"; + private static final String COMMON_CONFIG_FILE = EXTENSIONS_DIR + "common.xml"; + private static final String JVM_CONFIG_FILE = EXTENSIONS_DIR + "kotlin2jvm.xml"; + private static final String JS_CONFIG_FILE = EXTENSIONS_DIR + "kotlin2js.xml"; public static final List JVM_CONFIG_FILES = Arrays.asList(COMMON_CONFIG_FILE, JVM_CONFIG_FILE); public static final List JS_CONFIG_FILES = Arrays.asList(COMMON_CONFIG_FILE, JS_CONFIG_FILE);