# HG changeset patch # User Ed Swartz # Date 1263999938 21600 # Node ID 8c7fa6db96c0ac483159f339c2869272fb1ba903 # Parent 14f323806705d2e15a2d455455134a47de43761c# Parent 43d328ced5343d9943b105f73b16030e59c0c051 Merge commit diff -r 43d328ced534 -r 8c7fa6db96c0 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Wed Jan 20 08:28:47 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Wed Jan 20 09:05:38 2010 -0600 @@ -94,6 +94,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -157,6 +159,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -213,6 +217,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -265,6 +271,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() {