From adc5db05bb848a188ee70cbfef3e107381de7a88 Mon Sep 17 00:00:00 2001 From: ankit Date: Mon, 9 Nov 2009 22:53:03 +0000 Subject: [PATCH] In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks: * ToolTask.cs (ToolExe): New. * Csc.cs: * AL.cs: Use ToolExe instead of ToolName to construct tool's full path. In tools/xbuild: * xbuild/Microsoft.Common.targets(AL): * xbuild/Microsoft.CSharp.targets (CSC): * xbuild/Microsoft.VisualBasic.targets (Vbc): Set ToolExe and ToolPath to corresponding properties, allowing them to be overridden. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@145782 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- .../Microsoft.Build.Tasks/AL.cs | 2 +- .../Microsoft.Build.Tasks/ChangeLog | 7 +++++++ .../Microsoft.Build.Tasks/Csc.cs | 2 +- .../Microsoft.Build.Tasks/Vbc.cs | 2 +- .../Microsoft.Build.Utilities/ToolTask.cs | 21 +++++++++++++++++++-- tools/xbuild/ChangeLog | 7 +++++++ tools/xbuild/xbuild/Microsoft.CSharp.targets | 5 +++-- tools/xbuild/xbuild/Microsoft.Common.targets | 2 ++ tools/xbuild/xbuild/Microsoft.VisualBasic.targets | 3 ++- 9 files changed, 43 insertions(+), 8 deletions(-) diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs index 56925f4896..9e3426d742 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs @@ -100,7 +100,7 @@ namespace Microsoft.Build.Tasks { protected override string GenerateFullPathToTool () { - return Path.Combine (ToolPath, ToolName); + return Path.Combine (ToolPath, ToolExe); } public string AlgorithmId { diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog index 559bd345a6..2aa9087cf6 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog @@ -1,3 +1,10 @@ +2009-11-10 Ankit Jain + + * ToolTask.cs (ToolExe): New. + * Csc.cs: + * AL.cs: Use ToolExe instead of ToolName to construct + tool's full path. + 2009-11-09 Ankit Jain * GetFrameworkPath.cs (FrameworkVersion11Path): diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs index 4afdea5468..8b4217ab32 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs @@ -116,7 +116,7 @@ namespace Microsoft.Build.Tasks { protected override string GenerateFullPathToTool () { - return Path.Combine (ToolPath, ToolName); + return Path.Combine (ToolPath, ToolExe); } [MonoTODO] diff --git a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs index d6584618a7..66c0889ce9 100644 --- a/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs +++ b/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs @@ -139,7 +139,7 @@ namespace Microsoft.Build.Tasks { [MonoTODO] protected override string GenerateFullPathToTool () { - return Path.Combine (ToolPath, ToolName); + return Path.Combine (ToolPath, ToolExe); } [MonoTODO] diff --git a/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs b/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs index b6b298feca..a0a1dea15d 100644 --- a/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs +++ b/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs @@ -47,7 +47,7 @@ namespace Microsoft.Build.Utilities StringDictionary environmentOverride; int exitCode; int timeout; - string toolPath; + string toolPath, toolExe; Encoding responseFileEncoding; MessageImportance standardErrorLoggingImportance; MessageImportance standardOutputLoggingImportance; @@ -421,6 +421,20 @@ namespace Microsoft.Build.Utilities set { timeout = value; } } + public virtual string ToolExe + { + get { + if (toolExe == null) + return ToolName; + else + return toolExe; + } + set { + if (!String.IsNullOrEmpty (value)) + toolExe = value; + } + } + protected abstract string ToolName { get; @@ -429,7 +443,10 @@ namespace Microsoft.Build.Utilities public string ToolPath { get { return toolPath; } - set { toolPath = value; } + set { + if (!String.IsNullOrEmpty (value)) + toolPath = value; + } } } } diff --git a/tools/xbuild/ChangeLog b/tools/xbuild/ChangeLog index 1014ff122e..9d4e45685c 100644 --- a/tools/xbuild/ChangeLog +++ b/tools/xbuild/ChangeLog @@ -1,3 +1,10 @@ +2009-11-10 Ankit Jain + + * xbuild/Microsoft.Common.targets(AL): + * xbuild/Microsoft.CSharp.targets (CSC): + * xbuild/Microsoft.VisualBasic.targets (Vbc): Set ToolExe and ToolPath to + corresponding properties, allowing them to be overridden. + 2009-11-09 Ankit Jain * xbuild/Microsoft.Common.targets: Set default TargetFrameworkVersion. diff --git a/tools/xbuild/xbuild/Microsoft.CSharp.targets b/tools/xbuild/xbuild/Microsoft.CSharp.targets index 087bd4b148..bb0ffdb39d 100644 --- a/tools/xbuild/xbuild/Microsoft.CSharp.targets +++ b/tools/xbuild/xbuild/Microsoft.CSharp.targets @@ -62,8 +62,9 @@ WarningsAsErrors="$(WarningsAsErrors)" Win32Icon="$(Win32Icon)" Win32Resource="$(Win32Resource)" - Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)" /> - + Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)" + ToolExe="$(CscToolExe)" + ToolPath="$(CscToolPath)" /> diff --git a/tools/xbuild/xbuild/Microsoft.Common.targets b/tools/xbuild/xbuild/Microsoft.Common.targets index e67a08e005..9385200805 100644 --- a/tools/xbuild/xbuild/Microsoft.Common.targets +++ b/tools/xbuild/xbuild/Microsoft.Common.targets @@ -375,6 +375,8 @@ DelaySign="$(DelaySign)" EmbedResources = "@(ManifestResourceWithCulture);@(ManifestNonResxWithCultureOnDisk)" KeyFile="$(KeyOriginatorFile)" + ToolExe="$(AlToolExe)" + ToolPath="$(AlToolPath)" OutputAssembly = "$(IntermediateOutputPath)%(Culture)\$(AssemblyName).resources.dll" > diff --git a/tools/xbuild/xbuild/Microsoft.VisualBasic.targets b/tools/xbuild/xbuild/Microsoft.VisualBasic.targets index 2a7f91152b..eb3c3fd96a 100644 --- a/tools/xbuild/xbuild/Microsoft.VisualBasic.targets +++ b/tools/xbuild/xbuild/Microsoft.VisualBasic.targets @@ -77,8 +77,9 @@ WarningsNotAsErrors="$(WarningsNotAsErrors)" Win32Icon="$(Win32Icon)" Win32Resource="$(Win32Resource)" + ToolExe="$(VbcToolExe)" + ToolPath="$(VbcToolPath)" /> - -- 2.11.4.GIT