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

CHUNK_REBUILD_REQUIRED exit code for module-level builder

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-01-31 19:23:07 +01:00
parent 23018d51ee
commit d64e881809
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
+1
View File
@@ -88,6 +88,7 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler
}
public void markDirty(final ModuleChunk chunk) throws Exception {
myFsState.clearContextRoundData();
final Set<Module> modules = chunk.getModules();
for (Module module : modules) {
markDirtyFiles(module, myTsStorage, true, isCompilingTests()? DirtyMarkScope.TESTS : DirtyMarkScope.PRODUCTION, null);
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+22
View File
@@ -367,6 +367,7 @@ public class IncProjectBuilder {
return;
}
boolean rebuildFromScratchRequested = false;
float stageCount = myTotalBuilderCount;
int stagesPassed = 0;
final int modulesInChunk = chunk.getModules().size();
@@ -398,6 +399,27 @@ public class IncProjectBuilder {
}
nextPassRequired = true;
}
else if (buildResult == ModuleLevelBuilder.ExitCode.CHUNK_REBUILD_REQUIRED) {
if (!rebuildFromScratchRequested) {
// allow rebuild from scratch only once per chunk
rebuildFromScratchRequested = true;
try {
// forcibly mark all files in the chunk dirty
context.markDirty(chunk);
// reverting to the beginning
myModulesProcessed -= (stagesPassed * modulesInChunk) / stageCount;
stagesPassed = 0;
nextPassRequired = true;
break;
}
catch (Exception e) {
throw new ProjectBuildException(e);
}
}
else {
LOG.info("Builder " + builder.getDescription() + " requested second chunk rebuild");
}
}
stagesPassed++;
final float fraction = updateFractionBuilderFinished(modulesInChunk / (stageCount));
jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java
+1 -1
View File
@@ -24,7 +24,7 @@ public abstract class ModuleLevelBuilder extends Builder {
private static final Key<Set<File>> ALL_COMPILED_FILES_KEY = Key.create("_all_compiled_files_");
public static enum ExitCode {
OK, ABORT, ADDITIONAL_PASS_REQUIRED
OK, ABORT, ADDITIONAL_PASS_REQUIRED, CHUNK_REBUILD_REQUIRED
}
public abstract ExitCode build(CompileContext context, ModuleChunk chunk) throws ProjectBuildException;
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+19 -12
View File
@@ -35,8 +35,7 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.EmptyVisitor;
import javax.tools.Diagnostic;
import javax.tools.JavaFileObject;
import javax.tools.*;
import java.io.*;
import java.net.MalformedURLException;
import java.net.ServerSocket;
@@ -257,7 +256,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
if (hasSourcesToCompile) {
final Set<File> sourcePath = TEMPORARY_SOURCE_ROOTS_KEY.get(context, Collections.<File>emptySet());
final boolean compiledOk = compileJava(files, classpath, platformCp, sourcePath, outs, context, diagnosticSink, outputSink);
final boolean compiledOk = compileJava(chunk, files, classpath, platformCp, sourcePath, outs, context, diagnosticSink, outputSink);
final Map<File, String> chunkSourcePath = ProjectPaths.getSourceRootsWithDependents(chunk, context.isCompilingTests());
final ClassLoader compiledClassesLoader = createInstrumentationClassLoader(classpath, platformCp, chunkSourcePath, outputSink);
@@ -312,7 +311,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
return exitCode;
}
private boolean compileJava(Collection<File> files,
private boolean compileJava(ModuleChunk chunk, Collection<File> files,
Collection<File> classpath,
Collection<File> platformCp,
Collection<File> sourcePath,
@@ -320,18 +319,20 @@ public class JavaBuilder extends ModuleLevelBuilder {
CompileContext context,
DiagnosticOutputConsumer diagnosticSink,
final OutputFileConsumer outputSink) throws Exception {
final List<String> options = getCompilationOptions(context);
final List<String> options = getCompilationOptions(context, chunk);
final ClassProcessingConsumer classesConsumer = new ClassProcessingConsumer(context, outputSink);
try {
final boolean rc;
if (USE_EMBEDDED_JAVAC) {
rc = JavacMain
.compile(options, files, classpath, platformCp, sourcePath, outs, diagnosticSink, classesConsumer, context.getCancelStatus());
rc = JavacMain.compile(
options, files, classpath, platformCp, sourcePath, outs, diagnosticSink, classesConsumer, context.getCancelStatus()
);
}
else {
final JavacServerClient client = ensureJavacServerLaunched(context);
final RequestFuture<JavacServerResponseHandler> future =
client.sendCompileRequest(options, files, classpath, platformCp, sourcePath, outs, diagnosticSink, classesConsumer);
final RequestFuture<JavacServerResponseHandler> future = client.sendCompileRequest(
options, files, classpath, platformCp, sourcePath, outs, diagnosticSink, classesConsumer
);
try {
future.get();
}
@@ -361,8 +362,9 @@ public class JavaBuilder extends ModuleLevelBuilder {
final int port = findFreePort();
final int heapSize = getJavacServerHeapSize(context);
final BaseOSProcessHandler processHandler =
JavacServerBootstrap.launchJavacServer(vmExecPath, heapSize, port, Paths.getSystemRoot(), getCompilationVMOptions(context));
final BaseOSProcessHandler processHandler = JavacServerBootstrap.launchJavacServer(
vmExecPath, heapSize, port, Paths.getSystemRoot(), getCompilationVMOptions(context)
);
final JavacServerClient client = new JavacServerClient();
try {
client.connect(hostString, port);
@@ -445,13 +447,18 @@ public class JavaBuilder extends ModuleLevelBuilder {
return cached;
}
private static List<String> getCompilationOptions(CompileContext context) {
private static List<String> getCompilationOptions(CompileContext context, ModuleChunk chunk) {
List<String> cached = JAVAC_OPTIONS.get(context);
if (cached == null) {
loadJavacOptions(context);
cached = JAVAC_OPTIONS.get(context);
}
return cached;
//final List<String> options = new ArrayList<String>(cached);
//final Module module = chunk.getModules().iterator().next();
//final String langlevel = module.getLanguageLevel();
//final Sdk sdk = module.getSdk();
//return options;
}
private static void loadJavacOptions(CompileContext context) {