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

javac ast indices: remove indices if java builder is disabled

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-01-30 12:45:47 +03:00
parent 56d5ebacab
commit 811a547f7d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java
+7 -10
View File
@@ -24,7 +24,6 @@ import org.jetbrains.jps.builders.DirtyFilesHolder;
import org.jetbrains.jps.builders.ModuleBasedTarget;
import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
import org.jetbrains.jps.incremental.*;
import org.jetbrains.jps.incremental.java.JavaBuilder;
import org.jetbrains.jps.incremental.messages.CustomBuilderMessage;
import org.jetbrains.jps.model.module.JpsModule;
@@ -56,7 +55,7 @@ public class BackwardReferenceIndexBuilder extends ModuleLevelBuilder {
@Override
public void buildFinished(CompileContext context) {
if (JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) {
if (BackwardReferenceIndexWriter.getInstance() != null) {
final BuildTargetIndex targetIndex = context.getProjectDescriptor().getBuildTargetIndex();
for (JpsModule module : context.getProjectDescriptor().getProject().getModules()) {
boolean allAreDummyOrCompiled = true;
@@ -85,17 +84,15 @@ public class BackwardReferenceIndexBuilder extends ModuleLevelBuilder {
ModuleChunk chunk,
DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
OutputConsumer outputConsumer) throws ProjectBuildException, IOException {
if (dirtyFilesHolder.hasRemovedFiles()) {
final BackwardReferenceIndexWriter writer = BackwardReferenceIndexWriter.getInstance();
if (writer != null) {
for (ModuleBuildTarget target : chunk.getTargets()) {
final Collection<String> files = dirtyFilesHolder.getRemovedFiles(target);
writer.processDeletedFiles(files);
}
final BackwardReferenceIndexWriter writer = BackwardReferenceIndexWriter.getInstance();
if (writer != null && dirtyFilesHolder.hasRemovedFiles()) {
for (ModuleBuildTarget target : chunk.getTargets()) {
final Collection<String> files = dirtyFilesHolder.getRemovedFiles(target);
writer.processDeletedFiles(files);
}
}
if (JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) {
if (writer != null) {
for (ModuleBuildTarget target : chunk.getTargets()) {
if (context.getScope().isWholeTargetAffected(target)) {
myCompiledTargets.add(target);
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class BackwardReferenceIndexWriter {
if (isEnabled()) {
boolean isRebuild = isRebuildInAllJavaModules(context);
if (!JavaCompilers.JAVAC_ID.equals(JavaBuilder.getUsedCompilerId(context))) {
if (!JavaCompilers.JAVAC_ID.equals(JavaBuilder.getUsedCompilerId(context)) || !JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) {
CompilerBackwardReferenceIndex.removeIndexFiles(buildDir);
return;
}