MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

using new StopBuildException

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-04-20 13:53:39 +04:00
parent 9e1558d72a
commit ec4f3edd82
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
+2 -5
View File
@@ -39,10 +39,7 @@ import org.jetbrains.jps.builders.BuildOutputConsumer;
import org.jetbrains.jps.builders.BuildRootDescriptor;
import org.jetbrains.jps.builders.DirtyFilesHolder;
import org.jetbrains.jps.cmdline.ClasspathBootstrap;
import org.jetbrains.jps.incremental.CompileContext;
import org.jetbrains.jps.incremental.ExternalProcessUtil;
import org.jetbrains.jps.incremental.ProjectBuildException;
import org.jetbrains.jps.incremental.TargetBuilder;
import org.jetbrains.jps.incremental.*;
import org.jetbrains.jps.incremental.messages.BuildMessage;
import org.jetbrains.jps.incremental.messages.CompilerMessage;
import org.jetbrains.jps.incremental.messages.ProgressMessage;
@@ -77,7 +74,7 @@ public class AndroidDexBuilder extends TargetBuilder<BuildRootDescriptor, Androi
try {
if (!doDexBuild(buildTarget, context, holder.hasDirtyFiles())) {
throw new ProjectBuildException();
throw new StopBuildException();
}
}
catch (ProjectBuildException e) {
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java
+4 -7
View File
@@ -22,10 +22,7 @@ import org.jetbrains.jps.builders.BuildOutputConsumer;
import org.jetbrains.jps.builders.BuildRootDescriptor;
import org.jetbrains.jps.builders.DirtyFilesHolder;
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
import org.jetbrains.jps.incremental.CompileContext;
import org.jetbrains.jps.incremental.ModuleBuildTarget;
import org.jetbrains.jps.incremental.ProjectBuildException;
import org.jetbrains.jps.incremental.TargetBuilder;
import org.jetbrains.jps.incremental.*;
import org.jetbrains.jps.incremental.messages.BuildMessage;
import org.jetbrains.jps.incremental.messages.CompilerMessage;
import org.jetbrains.jps.incremental.messages.ProgressMessage;
@@ -80,15 +77,15 @@ public class AndroidPackagingBuilder extends TargetBuilder<BuildRootDescriptor,
fillStates(modules, resourcesStates, assetsStates, manifestFiles);
if (!doCaching(context, modules, resourcesStates)) {
throw new ProjectBuildException();
throw new StopBuildException();
}
if (!doResourcePackaging(context, modules, resourcesStates, assetsStates, manifestFiles)) {
throw new ProjectBuildException();
throw new StopBuildException();
}
if (!doPackaging(context, modules, outputConsumer)) {
throw new ProjectBuildException();
throw new StopBuildException();
}
}
catch (ProjectBuildException e) {