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

Module script generator fixed

Browse Source 
It used to put system-dependent paths into script files, which resulted in syntactically incorrect string literals on Windows:
 sources += "C:\foo.kt" // \f is wrong here

 Solution: convert paths to system-independent form (forward slashes)
This commit is contained in:
Andrey Breslav
2012-11-12 11:54:45 +04:00
parent d6c8b8683b
commit 9619de2060
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptGenerator.java
+5 -3
View File
@@ -23,6 +23,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName;
public class KotlinModuleScriptGenerator {
public interface DependencyProvider {
@@ -53,7 +55,7 @@ public class KotlinModuleScriptGenerator {
script.append(" module(\"" + moduleName + "\") {\n");
for (File sourceFile : sourceFiles) {
script.append(" sources += \"" + sourceFile.getPath() + "\"\n");
script.append(" sources += \"" + toSystemIndependentName(sourceFile.getPath()) + "\"\n");
}
dependencyProvider.processClassPath(new DependencyProcessor() {
@@ -68,7 +70,7 @@ public class KotlinModuleScriptGenerator {
script.append(" // Output directory, commented out\n");
script.append(" // ");
}
script.append(" classpath += \"" + file.getPath() + "\"\n");
script.append(" classpath += \"" + toSystemIndependentName(file.getPath()) + "\"\n");
}
}
@@ -76,7 +78,7 @@ public class KotlinModuleScriptGenerator {
public void processAnnotationRoots(@NotNull List<File> files) {
script.append(" // External annotations\n");
for (File file : files) {
script.append(" annotationsPath += \"").append(file.getPath()).append("\"\n");
script.append(" annotationsPath += \"").append(toSystemIndependentName(file.getPath())).append("\"\n");
}
}
});