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

Migrating script generation onto java.io.File

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-09 20:15:25 +04:00
parent 0b6b8873b9
commit 57120e6d5c
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptGenerator.java
+14 -13
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.compiler.runner;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -29,15 +30,15 @@ public class KotlinModuleScriptGenerator {
}
public interface DependencyProcessor {
void processClassPathSection(@NotNull String sectionDescription, @NotNull Collection<String> paths);
void processAnnotationRoots(@NotNull List<String> paths);
void processClassPathSection(@NotNull String sectionDescription, @NotNull Collection<File> files);
void processAnnotationRoots(@NotNull List<File> files);
}
public static CharSequence generateModuleScript(String moduleName,
DependencyProvider dependencyProvider,
List<String> sourceFilePaths,
List<File> sourceFiles,
boolean tests,
final Set<String> directoriesToFilterOut) {
final Set<File> directoriesToFilterOut) {
final StringBuilder script = new StringBuilder();
if (tests) {
@@ -51,31 +52,31 @@ public class KotlinModuleScriptGenerator {
script.append("fun project() {\n");
script.append(" module(\"" + moduleName + "\") {\n");
for (String sourceFile : sourceFilePaths) {
script.append(" sources += \"" + sourceFile + "\"\n");
for (File sourceFile : sourceFiles) {
script.append(" sources += \"" + sourceFile.getPath() + "\"\n");
}
dependencyProvider.processClassPath(new DependencyProcessor() {
@Override
public void processClassPathSection(@NotNull String sectionDescription, @NotNull Collection<String> paths) {
public void processClassPathSection(@NotNull String sectionDescription, @NotNull Collection<File> files) {
script.append(" // " + sectionDescription + "\n");
for (String path : paths) {
if (directoriesToFilterOut.contains(path)) {
for (File file : files) {
if (directoriesToFilterOut.contains(file)) {
// For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies
// appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was
// removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath.
script.append(" // Output directory, commented out\n");
script.append(" // ");
}
script.append(" classpath += \"" + path + "\"\n");
script.append(" classpath += \"" + file.getPath() + "\"\n");
}
}
@Override
public void processAnnotationRoots(@NotNull List<String> paths) {
public void processAnnotationRoots(@NotNull List<File> files) {
script.append(" // External annotations\n");
for (String path : paths) {
script.append(" annotationsPath += \"").append(path).append("\"\n");
for (File file : files) {
script.append(" annotationsPath += \"").append(file.getPath()).append("\"\n");
}
}
});