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 mark files up-to-date if compilation crashed

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-11-05 17:45:40 +01:00
parent fffb68f84d
commit 1e4935e63e
1 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+28 -35
View File
@@ -565,6 +565,17 @@ public class IncProjectBuilder {
myProjectDescriptor.fsState.beforeChunkBuildStart(context, chunk);
doneSomething = runBuildersForChunk(context, chunk);
onChunkBuildComplete(context, chunk);
if (doneSomething && GENERATE_CLASSPATH_INDEX) {
myAsyncTasks.add(SharedThreadPool.getInstance().executeOnPooledThread(new Runnable() {
@Override
public void run() {
createClasspathIndex(chunk);
}
}));
}
}
catch (ProjectBuildException e) {
throw e;
@@ -573,47 +584,29 @@ public class IncProjectBuilder {
throw new ProjectBuildException(e);
}
finally {
for (BuildRootDescriptor rd : context.getProjectDescriptor().getBuildRootIndex().clearTempRoots(context)) {
context.getProjectDescriptor().fsState.clearRecompile(rd);
}
try {
onChunkBuildComplete(context, chunk);
}
catch (Exception e) {
throw new ProjectBuildException(e);
}
finally {
for (BuildRootDescriptor rd : context.getProjectDescriptor().getBuildRootIndex().clearTempRoots(context)) {
context.getProjectDescriptor().fsState.clearRecompile(rd);
}
try {
// restore deleted paths that were not procesesd by 'integrate'
final Map<BuildTarget<?>, Collection<String>> map = Utils.REMOVED_SOURCES_KEY.get(context);
if (map != null) {
for (Map.Entry<BuildTarget<?>, Collection<String>> entry : map.entrySet()) {
final BuildTarget<?> target = entry.getKey();
final Collection<String> paths = entry.getValue();
if (paths != null) {
for (String path : paths) {
myProjectDescriptor.fsState.registerDeleted(target, new File(path), null);
}
// restore deleted paths that were not procesesd by 'integrate'
final Map<BuildTarget<?>, Collection<String>> map = Utils.REMOVED_SOURCES_KEY.get(context);
if (map != null) {
for (Map.Entry<BuildTarget<?>, Collection<String>> entry : map.entrySet()) {
final BuildTarget<?> target = entry.getKey();
final Collection<String> paths = entry.getValue();
if (paths != null) {
for (String path : paths) {
myProjectDescriptor.fsState.registerDeleted(target, new File(path), null);
}
}
}
}
catch (IOException e) {
throw new ProjectBuildException(e);
}
}
catch (IOException e) {
throw new ProjectBuildException(e);
}
finally {
Utils.REMOVED_SOURCES_KEY.set(context, null);
if (doneSomething && GENERATE_CLASSPATH_INDEX) {
final Future<?> future = SharedThreadPool.getInstance().executeOnPooledThread(new Runnable() {
@Override
public void run() {
createClasspathIndex(chunk);
}
});
myAsyncTasks.add(future);
}
}
}
}