[Ccnet-checkins] ccnet/project/core IntegrationRunner.cs,1.1,1.2

[Graham T. <ta...@us...>]

Update of /cvsroot/ccnet/ccnet/project/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21103/project/core

Modified Files:
	IntegrationRunner.cs 
Log Message:
CCNET-411 - Integration status should be Building during GetSource and temporary labelling

Index: IntegrationRunner.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/IntegrationRunner.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegrationRunner.cs	16 Mar 2005 02:28:52 -0000	1.1
--- IntegrationRunner.cs	30 Apr 2005 10:16:02 -0000	1.2
***************
*** 31,34 ****
--- 31,36 ----
  				if (result.ShouldRunBuild(target.ModificationDelaySeconds))
  				{
+ 					target.Activity = ProjectActivity.Building;
+ 
  					CreateWorkingDirectoryIfItDoesntExist();
  					CreateTemporaryLabelIfNeeded(sourceControl);
***************
*** 78,82 ****
  		}
  
! 		internal void CreateTemporaryLabelIfNeeded(ISourceControl sourceControl)
  		{
  			if (sourceControl is ITemporaryLabeller)
--- 80,84 ----
  		}
  
! 		private void CreateTemporaryLabelIfNeeded(ISourceControl sourceControl)
  		{
  			if (sourceControl is ITemporaryLabeller)
***************
*** 88,92 ****
  		private void RunBuild(IIntegrationResult result)
  		{
- 			target.Activity = ProjectActivity.Building;
  			if (result.BuildCondition == BuildCondition.ForceBuild)
  				Log.Info("Build forced");
--- 90,93 ----
***************
*** 99,105 ****
  		private void PostBuild(IIntegrationResult result, IIntegrationResultManager resultManager)
  		{
! 			if (ShouldPublishException(result))
  			{
- 				// Shouldn't this be outside the if?
  				HandleProjectLabelling(result);
  
--- 100,105 ----
  		private void PostBuild(IIntegrationResult result, IIntegrationResultManager resultManager)
  		{
! 			if (ShouldPublishResult(result))
  			{
  				HandleProjectLabelling(result);
  
***************
*** 114,118 ****
  		}
  
! 		private bool ShouldPublishException(IIntegrationResult result)
  		{
  			IntegrationStatus integrationStatus = result.Status;
--- 114,118 ----
  		}
  
! 		private bool ShouldPublishResult(IIntegrationResult result)
  		{
  			IntegrationStatus integrationStatus = result.Status;