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

build javac ast index only when compilation invoked from IDE: reused existing property

Browse Source
This commit is contained in:
nik
2016-10-20 11:41:42 +03:00
parent 9fee026234
commit f371f75bc1
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
-3
View File
@@ -17,7 +17,6 @@ package com.intellij.compiler.server;
import com.intellij.ProjectTopics;
import com.intellij.compiler.CompilerConfiguration;
import com.intellij.compiler.CompilerReferenceService;
import com.intellij.compiler.CompilerWorkspaceConfiguration;
import com.intellij.compiler.impl.CompilerUtil;
import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration;
@@ -105,7 +104,6 @@ import org.jetbrains.jps.cmdline.BuildMain;
import org.jetbrains.jps.cmdline.ClasspathBootstrap;
import org.jetbrains.jps.incremental.Utils;
import org.jetbrains.jps.model.java.JpsJavaSdkType;
import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions;
import org.jetbrains.jps.model.serialization.JpsGlobalLoader;
import javax.tools.*;
@@ -1083,7 +1081,6 @@ public class BuildManager implements Disposable {
}
cmdLine.addParameter("-D"+ GlobalOptions.COMPILE_PARALLEL_OPTION +"=" + Boolean.toString(config.PARALLEL_COMPILATION));
cmdLine.addParameter("-D"+ GlobalOptions.REBUILD_ON_DEPENDENCY_CHANGE_OPTION + "=" + Boolean.toString(config.REBUILD_ON_DEPENDENCY_CHANGE));
cmdLine.addParameter("-D" + JpsJavaCompilerOptions.COLLECT_REFERENCES_PROPERTY + "=" + CompilerReferenceService.isEnabled());
if (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("java.net.preferIPv4Stack", "false")))) {
cmdLine.addParameter("-Djava.net.preferIPv4Stack=true");
jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class BackwardReferenceIndexWriter {
}
}
static boolean isEnabled() {
public static boolean isEnabled() {
return SystemProperties.getBooleanProperty(PROP_KEY, false) || forceEnabled;
}
jps/jps-builders/src/org/jetbrains/jps/builders/impl/java/JavacCompilerTool.java
+2 -3
View File
@@ -16,16 +16,15 @@
package org.jetbrains.jps.builders.impl.java;
import com.intellij.util.ExceptionUtil;
import com.intellij.util.SystemProperties;
import com.sun.source.util.JavacTask;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.backwardRefs.BackwardReferenceIndexWriter;
import org.jetbrains.jps.builders.java.CannotCreateJavaCompilerException;
import org.jetbrains.jps.builders.java.JavaCompilingTool;
import org.jetbrains.jps.javac.JavacMain;
import org.jetbrains.jps.javac.ast.JavacReferencesCollector;
import org.jetbrains.jps.model.java.compiler.JavaCompilers;
import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions;
import javax.tools.*;
import java.io.File;
@@ -87,7 +86,7 @@ public class JavacCompilerTool extends JavaCompilingTool {
@Override
public void prepareCompilationTask(@NotNull JavaCompiler.CompilationTask task, @NotNull Collection<String> options) {
if (SystemProperties.getBooleanProperty(JpsJavaCompilerOptions.COLLECT_REFERENCES_PROPERTY, false)) {
if (BackwardReferenceIndexWriter.isEnabled()) {
JavacReferencesCollector.installOn((JavacTask)task);
}
}
jps/model-api/src/org/jetbrains/jps/model/java/compiler/JpsJavaCompilerOptions.java
-2
View File
@@ -19,8 +19,6 @@ package org.jetbrains.jps.model.java.compiler;
* @author nik
*/
public class JpsJavaCompilerOptions {
public static final String COLLECT_REFERENCES_PROPERTY = "jps.javac.collect.references";
public boolean DEBUGGING_INFO = true;
public boolean GENERATE_NO_WARNINGS = false;
public boolean DEPRECATION = true;