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

in case of errors do not perform differentiate operation in 'rebuild' mode

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-03-19 12:05:19 +04:00
parent c574ec0ca3
commit d701c35e50
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
+8 -3
View File
@@ -74,6 +74,7 @@ public class JavaBuilderUtil {
final Mappings globalMappings = context.getProjectDescriptor().dataManager.getMappings();
final boolean errorsDetected = Utils.errorsDetected(context);
if (!isForcedRecompilationAllJavaModules(context)) {
if (context.shouldDifferentiate(chunk)) {
context.processMessage(new ProgressMessage("Checking dependencies... [" + chunk.getName() + "]"));
@@ -151,14 +152,18 @@ public class JavaBuilderUtil {
}
}
else {
globalMappings.differentiateOnNonIncrementalMake(delta, removedPaths, filesToCompile);
if (!errorsDetected) { // makes sense only if we are going to integrate changes
globalMappings.differentiateOnNonIncrementalMake(delta, removedPaths, filesToCompile);
}
}
}
else {
globalMappings.differentiateOnRebuild(delta);
if (!errorsDetected) { // makes sense only if we are going to integrate changes
globalMappings.differentiateOnRebuild(delta);
}
}
if (Utils.errorsDetected(context)) {
if (errorsDetected) {
// important: perform dependency analysis and mark found dependencies even if there were errors during the first phase of make.
// Integration of changes should happen only if the corresponding phase of make succeeds
// In case of errors this wil ensure that all dependencies marked after the first phase