diff options
| -rw-r--r-- | mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs | 7 | ||||
| -rw-r--r-- | mcs/class/System/Microsoft.CSharp/ChangeLog | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs index f4ced045dae..a09a812bedc 100644 --- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs +++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs @@ -59,7 +59,12 @@ namespace Mono.CSharp windowsMonoPath = Path.Combine ( Path.GetDirectoryName ( Path.GetDirectoryName (p)), - "bin\\mono.exe"); + "bin\\mono.bat"); + if (!File.Exists (windowsMonoPath)) + windowsMonoPath = Path.Combine ( + Path.GetDirectoryName ( + Path.GetDirectoryName (p)), + "bin\\mono.exe"); windowsMcsPath = Path.Combine (p, "1.0\\mcs.exe"); } diff --git a/mcs/class/System/Microsoft.CSharp/ChangeLog b/mcs/class/System/Microsoft.CSharp/ChangeLog index 63022fff97b..b9e06652430 100644 --- a/mcs/class/System/Microsoft.CSharp/ChangeLog +++ b/mcs/class/System/Microsoft.CSharp/ChangeLog @@ -1,3 +1,8 @@ +2004-06-28 Atsushi Enomoto <atsushi@ximian.com> + + * CSharpCodeCompiler.cs : (only for windows) First check mcs.bat, then + check mcs.exe. It enables xsp working with mono windows installer. + 2004-06-24 Atsushi Enomoto <atsushi@ximian.com> * CSharpCodeCompiler.cs : On windows we use fixed mono.exe and mcs.exe |