Merge commit
authorEd Swartz <ed.swartz@nokia.com>
Wed, 20 Jan 2010 09:05:38 -0600
changeset 799 8c7fa6db96c0
parent 798 14f323806705 (diff)
parent 791 43d328ced534 (current diff)
child 800 7395fd14bbe1
Merge commit
--- 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() {