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

when recovering after storage corruption, keep original compile scope if the type of compilation was "forced compilation"

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-02-24 08:03:52 +01:00
parent dcdf2efc6c
commit 321b8f02c5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+9 -4
View File
@@ -86,7 +86,14 @@ public class IncProjectBuilder {
e.getMessage())
);
flushContext(context);
context = createContext(new AllProjectScope(scope.getProject(), Collections.<Artifact>emptySet(), true), false, true);
if (isMake || isProjectRebuild) {
context = createContext(new AllProjectScope(scope.getProject(), Collections.<Artifact>emptySet(), true), false, true);
}
else {
//in case of forced compilation keep the scope, but remove all caches
context = createContext(scope, false, false);
cleanOutputRoots(context);
}
runBuild(context);
}
else {
@@ -250,9 +257,7 @@ public class IncProjectBuilder {
}
}
else {
context.processMessage(new CompilerMessage(COMPILE_SERVER_NAME, BuildMessage.Kind.WARNING, "Output path " +
outputRoot.getPath() +
" intersects with a source root. The output cannot be cleaned."));
context.processMessage(new CompilerMessage(COMPILE_SERVER_NAME, BuildMessage.Kind.WARNING, "Output path " + outputRoot.getPath() + " intersects with a source root. The output cannot be cleaned."));
}
}