SF.net SVN: ccnet:[4567] trunk/project/core/tasks
willem...@users.sourceforge.net
http://ccnet.svn.sourceforge.net/ccnet/?rev=4567&view=rev
Author: willemsruben
Date: 2009-01-20 11:32:44 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
CCNet-1332 New configuration element for task blocks: <taskDescription>
Modified Paths:
--------------
trunk/project/core/tasks/DevenvTask.cs
trunk/project/core/tasks/ExecutableTask.cs
trunk/project/core/tasks/FinalBuilderTask.cs
trunk/project/core/tasks/MsBuildTask.cs
trunk/project/core/tasks/NAntTask.cs
trunk/project/core/tasks/RakeTask.cs
Modified: trunk/project/core/tasks/DevenvTask.cs
===================================================================
--- trunk/project/core/tasks/DevenvTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/DevenvTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -139,9 +139,17 @@
[ReflectorProperty("project", Required = false)]
public string Project = DEFAULT_PROJECT;
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
+
+
public virtual void Run(IIntegrationResult result)
{
- result.BuildProgressInformation.SignalStartRunTask(string.Format("Executing Devenv :{0}", GetArguments()));
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description : string.Format("Executing Devenv :{0}", GetArguments()));
ProcessResult processResult = TryToRun(result);
result.AddTaskResult(new DevenvTaskResult(processResult));
Log.Info("Devenv build complete. Status: " + result.Status);
Modified: trunk/project/core/tasks/ExecutableTask.cs
===================================================================
--- trunk/project/core/tasks/ExecutableTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/ExecutableTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -34,6 +34,13 @@
[ReflectorProperty("buildArgs", Required = false)]
public string BuildArgs = string.Empty;
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
+
/// <summary>
/// A set of environment variables set for commands that are executed.
/// </summary>
@@ -98,7 +105,7 @@
/// <param name="result">the IIntegrationResult object for the build</param>
public override void Run(IIntegrationResult result)
{
- result.BuildProgressInformation.SignalStartRunTask(string.Format("Executing {0}", Executable));
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description : string.Format("Executing {0}", Executable));
ProcessInfo info = CreateProcessInfo(result);
SetConfiguredEnvironmentVariables(info.EnvironmentVariables, EnvironmentVariables);
Modified: trunk/project/core/tasks/FinalBuilderTask.cs
===================================================================
--- trunk/project/core/tasks/FinalBuilderTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/FinalBuilderTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -104,9 +104,18 @@
[ReflectorProperty("Timeout", Required = false)]
public int Timeout;
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
+
+
+
public void Run(IIntegrationResult result)
{
- result.BuildProgressInformation.SignalStartRunTask(
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description :
string.Format("Executing FinalBuilder : BuildFile: {0} ", ProjectFile));
ProcessResult processResult = AttemptToExecute(NewProcessInfoFrom(result), result.ProjectName);
Modified: trunk/project/core/tasks/MsBuildTask.cs
===================================================================
--- trunk/project/core/tasks/MsBuildTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/MsBuildTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -43,6 +43,13 @@
[ReflectorProperty("timeout", Required=false)]
public int Timeout = DefaultTimeout;
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
+
protected override string GetProcessFilename()
{
return Executable;
@@ -86,7 +93,7 @@
public override void Run(IIntegrationResult result)
{
- result.BuildProgressInformation.SignalStartRunTask(
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description :
string.Format("Executing MSBuild :BuildFile: {0}", ProjectFile));
ProcessResult processResult = executor.Execute(CreateProcessInfo(result));
Modified: trunk/project/core/tasks/NAntTask.cs
===================================================================
--- trunk/project/core/tasks/NAntTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/NAntTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -48,6 +48,14 @@
[ReflectorProperty("buildTimeoutSeconds", Required = false)]
public int BuildTimeoutSeconds = DefaultBuildTimeout;
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
+
+
/// <summary>
/// Runs the integration using NAnt. The build number is provided for labelling, build
/// timeouts are enforced. The specified targets are used for the specified NAnt build file.
@@ -55,8 +63,8 @@
/// </summary>
/// <param name="result">For storing build output.</param>
public override void Run(IIntegrationResult result)
- {
- result.BuildProgressInformation.SignalStartRunTask (
+ {
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description :
string.Format("Executing Nant :BuildFile: {0} Targets: {1} ", BuildFile, string.Join(", ", Targets)));
ProcessResult processResult = TryToRun(CreateProcessInfo(result));
Modified: trunk/project/core/tasks/RakeTask.cs
===================================================================
--- trunk/project/core/tasks/RakeTask.cs 2009-01-20 05:49:15 UTC (rev 4566)
+++ trunk/project/core/tasks/RakeTask.cs 2009-01-20 11:32:44 UTC (rev 4567)
@@ -36,6 +36,13 @@
[ReflectorProperty("trace", Required = false)]
public bool Trace;
+
+ /// <summary>
+ /// Description used for the visualisation of the buildstage, if left empty the process name will be shown
+ /// </summary>
+ [ReflectorProperty("description", Required = false)]
+ public string Description = string.Empty;
+
public RakeTask()
: this(new ProcessExecutor()) {}
@@ -47,7 +54,7 @@
public override void Run(IIntegrationResult result)
{
ProcessInfo processInfo = CreateProcessInfo(result);
- result.BuildProgressInformation.SignalStartRunTask(string.Format("Executing Rake: {0}", processInfo.Arguments));
+ result.BuildProgressInformation.SignalStartRunTask(Description != string.Empty ? Description : string.Format("Executing Rake: {0}", processInfo.Arguments));
ProcessResult processResult = TryToRun(processInfo);
if (!StringUtil.IsWhitespace(processResult.StandardOutput + processResult.StandardError))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.