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

do not rebuild artifacts on project rebuild (IDEA-94132)

Browse Source
This commit is contained in:
nik
2012-11-27 12:06:46 +04:00
parent 7f89a3ec9e
commit 91082a45d4
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+9 -3
View File
@@ -187,9 +187,15 @@ public class CompileDriver {
}
public void rebuild(CompileStatusNotification callback) {
CompileScope projectScope = ArtifactCompileScope.createScopeWithArtifacts(new ProjectCompileScope(myProject),
ArtifactUtil.getArtifactWithOutputPaths(myProject), false);
final CompileScope compileScope = useOutOfProcessBuild() ? projectScope : addAdditionalRoots(projectScope, ALL_EXCEPT_SOURCE_PROCESSING);
final CompileScope compileScope;
ProjectCompileScope projectScope = new ProjectCompileScope(myProject);
if (useOutOfProcessBuild()) {
compileScope = projectScope;
}
else {
CompileScope scopeWithArtifacts = ArtifactCompileScope.createScopeWithArtifacts(projectScope, ArtifactUtil.getArtifactWithOutputPaths(myProject), false);
compileScope = addAdditionalRoots(scopeWithArtifacts, ALL_EXCEPT_SOURCE_PROCESSING);
}
doRebuild(callback, null, true, compileScope);
}
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+8 -4
View File
@@ -321,7 +321,9 @@ public class IncProjectBuilder {
}
else {
for (BuildTarget<?> target : projectDescriptor.getBuildTargetIndex().getAllTargets()) {
clearOutputFiles(context, target);
if (context.getScope().isAffected(target)) {
clearOutputFiles(context, target);
}
}
}
}
@@ -389,9 +391,11 @@ public class IncProjectBuilder {
ProjectDescriptor projectDescriptor = context.getProjectDescriptor();
for (BuildTarget<?> target : projectDescriptor.getBuildTargetIndex().getAllTargets()) {
final Collection<File> outputs = target.getOutputRoots(context);
for (File file : outputs) {
rootsToDelete.putValue(file, target);
if (context.getScope().isAffected(target)) {
final Collection<File> outputs = target.getOutputRoots(context);
for (File file : outputs) {
rootsToDelete.putValue(file, target);
}
}
}