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. svn path=/trunk/mcs/; revision=30472
baulig · Jun 28, 2004 · 28ff9d2 · 28ff9d2
1 parent 6982122
commit 28ff9d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
@@ -59,7 +59,12 @@ static CSharpCodeCompiler ()
 				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
@@ -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