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

[Joshua Tauberer]

Author: joshua
Date: 2005-07-03 08:59:24 -0400 (Sun, 03 Jul 2005)
New Revision: 2621

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
Log:
Pre/post build steps have their working directories set to the project base path.

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-01 23:56:15 UTC (rev 2620)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-03 12:59:24 UTC (rev 2621)
@@ -1,3 +1,9 @@
+2005-07-01  Joshua Tauberer  <tauberer at for.net>
+
+	* Internal/Project/Project/Project.cs: Pre/Post build tasks
+	set up the ProcessStartInfo through the same function, set
+	the working directory to the project base path.
+
 2005-07-01  Jacob Ilsø Christensen  <jacobilsoe at gmail.com>
 
 	* Services/Tasks/Task.cs:
@@ -28,7 +34,6 @@
 	* Makefile.am: Added new files.
 	* MonoDevelopCore.addin.xml: Registered search/replace commands.
 	
-
 2005-06-15  John Luke  <john.luke at gmail.com>
 
 	* Services/File/RecentFiles.cs: catch exception when writing to

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-07-01 23:56:15 UTC (rev 2620)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-07-03 12:59:24 UTC (rev 2621)
@@ -434,9 +434,7 @@
 			
 			if (conf != null && conf.ExecuteBeforeBuild != "" && File.Exists(conf.ExecuteBeforeBuild)) {
 				monitor.Log.WriteLine (String.Format (GettextCatalog.GetString ("Executing: {0}"), conf.ExecuteBeforeBuild));
-				ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteBeforeBuild);
-				ps.UseShellExecute = false;
-				ps.RedirectStandardOutput = true;
+				ProcessStartInfo ps = GetBuildTaskStartInfo(conf.ExecuteBeforeBuild);
 				Process process = new Process();
 				process.StartInfo = ps;
 				process.Start();
@@ -457,9 +455,7 @@
 			if (conf != null && conf.ExecuteAfterBuild != "" && File.Exists(conf.ExecuteAfterBuild)) {
 				monitor.Log.WriteLine ();
 				monitor.Log.WriteLine (String.Format (GettextCatalog.GetString ("Executing: {0}"), conf.ExecuteAfterBuild));
-				ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteAfterBuild);
-				ps.UseShellExecute = false;
-				ps.RedirectStandardOutput = true;
+				ProcessStartInfo ps = GetBuildTaskStartInfo(conf.ExecuteAfterBuild);
 				Process process = new Process();
 				process.StartInfo = ps;
 				process.Start();
@@ -467,6 +463,14 @@
 			}
 		}
 		
+		private ProcessStartInfo GetBuildTaskStartInfo(string file) {
+			ProcessStartInfo ps = new ProcessStartInfo(file);
+			ps.UseShellExecute = false;
+			ps.RedirectStandardOutput = true;
+			ps.WorkingDirectory = BaseDirectory;
+			return ps;
+		}
+		
 		public override void Execute (IProgressMonitor monitor)
 		{
 			if (Runtime.TaskService.Errors != 0) return;