MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

clear output directories when possible for ModuleBased-targets only (IDEA-164315)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2016-11-28 14:01:53 +01:00
parent a66d7a0b56
commit aea83b1e60
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+9 -2
View File
@@ -579,8 +579,15 @@ public class IncProjectBuilder {
final ProjectDescriptor projectDescriptor = context.getProjectDescriptor();
final List<? extends BuildTarget<?>> allTargets = projectDescriptor.getBuildTargetIndex().getAllTargets();
for (BuildTarget<?> target : allTargets) {
for (File file : target.getOutputRoots(context)) {
rootsToDelete.putValue(file, target);
if (target instanceof ModuleBasedTarget) {
for (File file : target.getOutputRoots(context)) {
rootsToDelete.putValue(file, target);
}
}
else {
if (context.getScope().isBuildForced(target)) {
clearOutputFilesUninterruptibly(context, target);
}
}
}
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java
+1 -1
View File
@@ -368,7 +368,7 @@ public class ArtifactBuilderTest extends ArtifactBuilderTestCase {
assertOutput(a, fs().file("a.txt").file("b.txt"));
rebuildAllModulesAndArtifacts();
assertOutput(a, fs().file("a.txt"));
assertOutput(a, fs().file("a.txt").file("b.txt"));
}
public void testDeleteOnlyOutputFileOnRebuildForArchiveArtifact() throws IOException {
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/CleanArtifactOutputOnRebuildTest.java
+2 -2
View File
@@ -36,7 +36,7 @@ public class CleanArtifactOutputOnRebuildTest extends ArtifactBuilderTestCase {
assertOutput(a, fs().file("a.txt").file("b.txt"));
rebuildAllModulesAndArtifacts();
assertOutput(a, fs().file("a.txt"));
assertOutput(a, fs().file("a.txt").file("b.txt"));
}
public void testDoNotCleanOnRebuildIfOptionIsSwitchedOff() {
@@ -78,7 +78,7 @@ public class CleanArtifactOutputOnRebuildTest extends ArtifactBuilderTestCase {
createFileInArtifactOutput(included, "b.txt");
assertOutput(included, fs().file("a.txt").file("b.txt"));
rebuildAllModulesAndArtifacts();
assertOutput(included, fs().file("a.txt"));
assertOutput(included, fs().file("a.txt").file("b.txt"));
}
public void testCleanModuleOutputIfItIsIncludedInArtifact() {