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

external build: better names in API [rev by Jeka]

Browse Source
This commit is contained in:
nik
2013-03-19 13:33:28 +04:00
parent 9a5eff6eb2
commit 644930d5ce
11 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/proto/cmdline_remote_proto.proto
+1 -1
View File
@@ -50,7 +50,7 @@ message Message {
required string type_id = 1;
optional bool all_targets = 2;
repeated string target_id = 3;
optional bool force_build = 4;
required bool force_build = 4;
}
enum Type {
jps/jps-builders/src/org/jetbrains/jps/api/CmdlineRemoteProto.java
+11 -3
View File
@@ -2385,7 +2385,7 @@ public final class CmdlineRemoteProto {
int getTargetIdCount();
String getTargetId(int index);
// optional bool force_build = 4;
// required bool force_build = 4;
boolean hasForceBuild();
boolean getForceBuild();
}
@@ -2464,7 +2464,7 @@ public final class CmdlineRemoteProto {
return targetId_.get(index);
}
// optional bool force_build = 4;
// required bool force_build = 4;
public static final int FORCE_BUILD_FIELD_NUMBER = 4;
private boolean forceBuild_;
public boolean hasForceBuild() {
@@ -2489,6 +2489,10 @@ public final class CmdlineRemoteProto {
memoizedIsInitialized = 0;
return false;
}
if (!hasForceBuild()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1;
return true;
}
@@ -2731,6 +2735,10 @@ public final class CmdlineRemoteProto {
return false;
}
if (!hasForceBuild()) {
return false;
}
return true;
}
@@ -2890,7 +2898,7 @@ public final class CmdlineRemoteProto {
}
// optional bool force_build = 4;
// required bool force_build = 4;
private boolean forceBuild_ ;
public boolean hasForceBuild() {
return ((bitField0_ & 0x00000008) == 0x00000008);
jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
+6 -5
View File
@@ -139,7 +139,7 @@ public class JavaBuilderUtil {
for (File file : newlyAffectedFiles) {
FSOperations.markDirtyIfNotDeleted(context, file);
}
additionalPassRequired = !isForcedRecompilationJava(context) && chunkContainsAffectedFiles(context, chunk, newlyAffectedFiles);
additionalPassRequired = isCompileJavaIncrementally(context) && chunkContainsAffectedFiles(context, chunk, newlyAffectedFiles);
}
}
else {
@@ -147,7 +147,7 @@ public class JavaBuilderUtil {
LOG.info("Non-incremental mode: " + messageText);
context.processMessage(new ProgressMessage(messageText));
additionalPassRequired = !isForcedRecompilationJava(context);
additionalPassRequired = isCompileJavaIncrementally(context);
FSOperations.markDirtyRecursively(context, chunk);
}
}
@@ -191,12 +191,13 @@ public class JavaBuilderUtil {
public static boolean isForcedRecompilationAllJavaModules(CompileContext context) {
CompileScope scope = context.getScope();
return scope.isRecompilationForcedForAllTargets(JavaModuleBuildTargetType.PRODUCTION) && scope.isRecompilationForcedForAllTargets(JavaModuleBuildTargetType.TEST);
return scope.isBuildForcedForAllTargets(JavaModuleBuildTargetType.PRODUCTION) && scope.isBuildForcedForAllTargets(
JavaModuleBuildTargetType.TEST);
}
public static boolean isForcedRecompilationJava(CompileContext context) {
public static boolean isCompileJavaIncrementally(CompileContext context) {
CompileScope scope = context.getScope();
return scope.isRecompilationForcedForTargetsOfType(JavaModuleBuildTargetType.PRODUCTION) && scope.isRecompilationForcedForTargetsOfType(JavaModuleBuildTargetType.TEST);
return scope.isBuildIncrementally(JavaModuleBuildTargetType.PRODUCTION) || scope.isBuildIncrementally(JavaModuleBuildTargetType.TEST);
}
private static List<Pair<File, JpsModule>> checkAffectedFilesInCorrectModules(CompileContext context,
jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class BuildOperations {
pd.fsState.markInitialScanPerformed(target);
configuration.save(context);
}
else if (context.getScope().isRecompilationForced(target) || configuration.isTargetDirty(context) || configuration.outputRootWasDeleted(context)) {
else if (context.getScope().isBuildForced(target) || configuration.isTargetDirty(context) || configuration.outputRootWasDeleted(context)) {
initTargetFSState(context, target, true);
IncProjectBuilder.clearOutputFiles(context, target);
pd.dataManager.cleanTargetStorages(target);
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
+1 -1
View File
@@ -32,7 +32,7 @@ public interface CompileContext extends UserDataHolder, MessageHandler {
CompileScope getScope();
/**
* @deprecated use {@link org.jetbrains.jps.builders.java.JavaBuilderUtil#isForcedRecompilationJava(CompileContext)} for java-related usages
* @deprecated use {@link org.jetbrains.jps.builders.java.JavaBuilderUtil#isCompileJavaIncrementally(CompileContext)} for java-related usages
*/
boolean isMake();
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContextImpl.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class CompileContextImpl extends UserDataHolderBase implements CompileCon
@Override
public boolean isMake() {
return !JavaBuilderUtil.isForcedRecompilationJava(this);
return JavaBuilderUtil.isCompileJavaIncrementally(this);
}
@Override
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScope.java
+3 -3
View File
@@ -30,9 +30,9 @@ public abstract class CompileScope {
public abstract boolean isAffected(@NotNull BuildTarget<?> target);
public abstract boolean isRecompilationForced(@NotNull BuildTarget<?> target);
public abstract boolean isBuildForced(@NotNull BuildTarget<?> target);
public abstract boolean isRecompilationForcedForAllTargets(@NotNull BuildTargetType<?> targetType);
public abstract boolean isBuildForcedForAllTargets(@NotNull BuildTargetType<?> targetType);
public abstract boolean isRecompilationForcedForTargetsOfType(@NotNull BuildTargetType<?> targetType);
public abstract boolean isBuildIncrementally(@NotNull BuildTargetType<?> targetType);
}
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java
+4 -4
View File
@@ -66,19 +66,19 @@ public class CompileScopeImpl extends CompileScope {
}
@Override
public boolean isRecompilationForced(@NotNull BuildTarget<?> target) {
public boolean isBuildForced(@NotNull BuildTarget<?> target) {
BuildTargetType<?> type = target.getTargetType();
return myTypesToForceBuild.contains(type) && (myTypes.contains(type) || myTargets.contains(target) || isAffectedByAssociatedModule(target));
}
@Override
public boolean isRecompilationForcedForAllTargets(@NotNull BuildTargetType<?> targetType) {
public boolean isBuildForcedForAllTargets(@NotNull BuildTargetType<?> targetType) {
return myTypesToForceBuild.contains(targetType) && myTypes.contains(targetType);
}
@Override
public boolean isRecompilationForcedForTargetsOfType(@NotNull BuildTargetType<?> targetType) {
return myTypesToForceBuild.contains(targetType);
public boolean isBuildIncrementally(@NotNull BuildTargetType<?> targetType) {
return !myTypesToForceBuild.contains(targetType);
}
@Override
jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class FSOperations {
markDirtyFiles(context, target, timestamps, true, null, null);
}
if (!JavaBuilderUtil.isForcedRecompilationJava(context)) {
if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
// mark as non-incremental only the module that triggered non-incremental change
for (ModuleBuildTarget target : targets) {
context.markNonIncremental(target);
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
}
});
if (!JavaBuilderUtil.isForcedRecompilationJava(context)) {
if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
final ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger();
if (logger.isEnabled()) {
if (filesToCompile.size() > 0) {
plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsInstrumenter.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class FormsInstrumenter extends FormsBuilder {
formsToCompile.addAll(files);
}
if (!JavaBuilderUtil.isForcedRecompilationJava(context)) {
if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
final ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger();
if (logger.isEnabled()) {
logger.logCompiledFiles(formsToCompile, getPresentableName(), "Compiling forms:");