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

Supported cases of removing source files from package fragment.

Browse Source 
Original commit: 820bd911fb
This commit is contained in:
Evgeny Gerashchenko
2014-06-05 17:54:43 +04:00
parent 21ac2b80f5
commit f6147fcbcd
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+32 -6
View File
@@ -65,6 +65,7 @@ import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCom
public class KotlinBuilder extends ModuleLevelBuilder { public class KotlinBuilder extends ModuleLevelBuilder {
private static final Key<Set<File>> ALL_COMPILED_FILES_KEY = Key.create("_all_kotlin_compiled_files_"); private static final Key<Set<File>> ALL_COMPILED_FILES_KEY = Key.create("_all_kotlin_compiled_files_");
private static final Key<Set<ModuleBuildTarget>> PROCESSED_TARGETS_WITH_REMOVED_FILES = Key.create("_processed_targets_with_removed_files_");
public static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; public static final String KOTLIN_BUILDER_NAME = "Kotlin Builder";
private static final List<String> COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt"); private static final List<String> COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt");
@@ -172,7 +173,20 @@ public class KotlinBuilder extends ModuleLevelBuilder {
filesToCompile.removeAll(allCompiledFiles); filesToCompile.removeAll(allCompiledFiles);
allCompiledFiles.addAll(filesToCompile); allCompiledFiles.addAll(filesToCompile);
File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile); Set<ModuleBuildTarget> processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context);
boolean haveRemovedFiles = false;
for (ModuleBuildTarget target : chunk.getTargets()) {
if (processedTargetsWithRemoved.add(target)) {
if (!dirtyFilesHolder.getRemovedFiles(target).isEmpty()) {
haveRemovedFiles = true;
break;
}
}
}
File moduleFile = KotlinBuilderModuleScriptGenerator
.generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles);
if (moduleFile == null) { if (moduleFile == null) {
// No Kotlin sources found // No Kotlin sources found
return ExitCode.NOTHING_DONE; return ExitCode.NOTHING_DONE;
@@ -198,17 +212,20 @@ public class KotlinBuilder extends ModuleLevelBuilder {
IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context));
try { try {
for (ModuleBuildTarget target : chunk.getTargets()) {
for (String file : dirtyFilesHolder.getRemovedFiles(target)) {
cache.clearPackagePartSourceData(target.getId(), new File(file));
}
}
boolean significantChanges = false; boolean significantChanges = false;
for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) {
BuildTarget<?> target = null; BuildTarget<?> target = null;
Collection<File> sourceFiles = outputItem.getSourceFiles(); Collection<File> sourceFiles = outputItem.getSourceFiles();
if (sourceFiles != null && !sourceFiles.isEmpty()) { if (!sourceFiles.isEmpty()) {
target = sourceToTarget.get(sourceFiles.iterator().next()); target = sourceToTarget.get(sourceFiles.iterator().next());
} }
else {
messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION);
}
if (target == null) { if (target == null) {
target = representativeTarget; target = representativeTarget;
@@ -217,7 +234,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
File outputFile = outputItem.getOutputFile(); File outputFile = outputItem.getOutputFile();
if (IncrementalCompilation.ENABLED) { if (IncrementalCompilation.ENABLED) {
if (cache.saveFileToCache(target.getId(), outputFile)) { if (cache.saveFileToCache(target.getId(), sourceFiles, outputFile)) {
significantChanges = true; significantChanges = true;
} }
} }
@@ -255,6 +272,15 @@ public class KotlinBuilder extends ModuleLevelBuilder {
return allCompiledFiles; return allCompiledFiles;
} }
private static Set<ModuleBuildTarget> getProcessedTargetsWithRemovedFilesContainer(CompileContext context) {
Set<ModuleBuildTarget> set = PROCESSED_TARGETS_WITH_REMOVED_FILES.get(context);
if (set == null) {
set = new HashSet<ModuleBuildTarget>();
PROCESSED_TARGETS_WITH_REMOVED_FILES.set(context, set);
}
return set;
}
private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) { private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) {
boolean hasKotlinFiles = false; boolean hasKotlinFiles = false;
for (ModuleBuildTarget target : chunk.getTargets()) { for (ModuleBuildTarget target : chunk.getTargets()) {
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+3 -2
View File
@@ -59,7 +59,8 @@ public class KotlinBuilderModuleScriptGenerator {
public static File generateModuleDescription( public static File generateModuleDescription(
CompileContext context, CompileContext context,
ModuleChunk chunk, ModuleChunk chunk,
List<File> sourceFiles // ignored for non-incremental compilation List<File> sourceFiles, // ignored for non-incremental compilation
boolean hasRemovedFiles
) )
throws IOException throws IOException
{ {
@@ -79,7 +80,7 @@ public class KotlinBuilderModuleScriptGenerator {
sourceFiles = new ArrayList<File>(KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); sourceFiles = new ArrayList<File>(KotlinSourceFileCollector.getAllKotlinSourceFiles(target));
} }
if (sourceFiles.size() > 0) { if (sourceFiles.size() > 0 || hasRemovedFiles) {
noSources = false; noSources = false;
if (logger.isEnabled()) { if (logger.isEnabled()) {