xbuild: Use '*mcs.bat' on windows and '*mcs' on other platforms.

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index 67e04f7e551e775122e658f2f43b84c2727bb284..9560e566659c5242602c92556d6bdaa7667e34e4 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-28  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/Microsoft.CSharp.targets: Use '*mcs.bat' on windows.
+
 2010-07-22  Ankit Jain  <jankit@novell.com>
 
        * xbuild/Microsoft.Silverlight.Common.targets(GenerateMoonlightManifest):

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
index 0ca27e20ce86218a890469eb02d1ff5f650e34f2..98401300c762baab09599cbfbb7c2db3d78b973e 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
@@ -14,8 +14,11 @@
                <CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
                <CoreCompileDependsOn></CoreCompileDependsOn>
 
-               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0'">gmcs</CscToolExe>
-               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0'">dmcs</CscToolExe>
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(OS)' != 'Windows_NT'">gmcs</CscToolExe>
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(OS)' == 'Windows_NT'">gmcs.bat</CscToolExe>
+
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' != 'Windows_NT'">dmcs</CscToolExe>
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' == 'Windows_NT'">dmcs.bat</CscToolExe>
 
                <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildAllProjects>
        </PropertyGroup>