[Monodevelop-patches-list] r2158 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/ProgressMonitoring Internal/Project/Project Services/Project

[commit-watcher at mono-cvs.ximian.com]

Author: lluis
Date: 2005-01-24 20:49:10 -0500 (Mon, 24 Jan 2005)
New Revision: 2158

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/ProgressMonitoring/BaseProgressMonitor.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/DefaultProjectService.cs
Log:
2005-01-24  Lluis Sanchez Gual <lluis at novell.com>

	* Services/Project/DefaultProjectService.cs: Don't raise the combine
	opened event until all is done.
	* Internal/ProgressMonitoring/BaseProgressMonitor.cs: Add the exception
	message to the log.
	* Internal/Project/Project/DotNetProject.cs: Execute mono through sh.
	This is a workaround to what seems like a bug in mono.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-01-24 23:40:43 UTC (rev 2157)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-01-25 01:49:10 UTC (rev 2158)
@@ -1,3 +1,12 @@
+2005-01-24  Lluis Sanchez Gual <lluis at novell.com>
+
+	* Services/Project/DefaultProjectService.cs: Don't raise the combine
+	opened event until all is done.
+	* Internal/ProgressMonitoring/BaseProgressMonitor.cs: Add the exception
+	message to the log.
+	* Internal/Project/Project/DotNetProject.cs: Execute mono through sh.
+	This is a workaround to what seems like a bug in mono.
+
 2005-01-24  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Services/ParserService/DefaultParserService.cs:

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/ProgressMonitoring/BaseProgressMonitor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/ProgressMonitoring/BaseProgressMonitor.cs	2005-01-24 23:40:43 UTC (rev 2157)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/ProgressMonitoring/BaseProgressMonitor.cs	2005-01-25 01:49:10 UTC (rev 2158)
@@ -101,6 +101,8 @@
 		{
 			if (message == null && ex != null)
 				message = ex.Message;
+			else if (message != null && ex != null)
+				message += "\n" + ex.Message;
 			errorsMessages.Add (message);
 		}
 		

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs	2005-01-24 23:40:43 UTC (rev 2157)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs	2005-01-25 01:49:10 UTC (rev 2158)
@@ -137,11 +137,11 @@
 			DotNetProjectConfiguration configuration = (DotNetProjectConfiguration) ActiveConfiguration;
 			monitor.Log.WriteLine ("Running " + configuration.CompiledOutputName + " ...");
 			
-			string runtimeStarter = "/home/lluis/install/bin/mono";
+			string runtimeStarter = "mono";
 			
 			switch (configuration.NetRuntime) {
 				case NetRuntime.Mono:
-					runtimeStarter = "/home/lluis/install/bin/mono";
+					runtimeStarter = "mono";
 					break;
 				case NetRuntime.MonoInterpreter:
 					runtimeStarter = "mint";
@@ -160,16 +160,18 @@
 							Path.GetDirectoryName (configuration.CompiledOutputName), 
 							configuration.PauseConsoleOutput, null);
 				else
+					// The use of 'sh' is a workaround. Looks like there is a bug
+					// in mono, Process can't start a "mono" process.
 					p = Runtime.ProcessService.StartProcess (
-							runtimeStarter, 
-							args, 
+							"sh", 
+							string.Format ("-c \"{0} {1}\"", runtimeStarter, args),
 							Path.GetDirectoryName (configuration.CompiledOutputName), 
 							monitor.Log, monitor.Log, null);
 						
 				p.WaitForOutput ();
 				monitor.Log.WriteLine ("The application exited with code: {0}", p.ExitCode);
 			} catch (Exception ex) {
-				monitor.ReportError ("Can not execute " + "\"" + configuration.CompiledOutputName + "\"\n(Try restarting MonoDevelop or start your app manually)", ex);
+				monitor.ReportError ("Can not execute " + "\"" + configuration.CompiledOutputName + "\"", ex);
 			}
 		}
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/DefaultProjectService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/DefaultProjectService.cs	2005-01-24 23:40:43 UTC (rev 2157)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/DefaultProjectService.cs	2005-01-25 01:49:10 UTC (rev 2158)
@@ -246,7 +246,6 @@
 				
 				Runtime.FileService.RecentOpen.AddLastProject (filename, openCombine.Name);
 				
-				OnCombineOpened(new CombineEventArgs(openCombine));
 				openCombine.FileAddedToProject += new ProjectFileEventHandler (NotifyFileAddedToProject);
 				openCombine.FileRemovedFromProject += new ProjectFileEventHandler (NotifyFileRemovedFromProject);
 				openCombine.FileChangedInProject += new ProjectFileEventHandler (NotifyFileChangedInProject);
@@ -255,6 +254,8 @@
 		
 				RestoreCombinePreferences (CurrentOpenCombine);
 				monitor.ReportSuccess (GettextCatalog.GetString ("Combine loaded."));
+
+				OnCombineOpened(new CombineEventArgs(openCombine));
 			}
 		}