[Mono-patches] r52561 - in trunk/monodevelop/Core/src/MonoDevelop.Projects: . MonoDevelop.Projects

[Lluis Sanchez (lluis at ximian.com)]

Author: lluis
Date: 2005-11-04 07:01:53 -0500 (Fri, 04 Nov 2005)
New Revision: 52561

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs
   trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
Log:


Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog	2005-11-04 11:49:51 UTC (rev 52560)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog	2005-11-04 12:01:53 UTC (rev 52561)
@@ -1,3 +1,8 @@
+2005-11-04 Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* MonoDevelop.Projects/Combine.cs: Fix a warning and a NRE.
+	* MonoDevelop.Projects/BuildTool.cs: Added some minimal help.
+
 2005-10-25 Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* MonoDevelop.Projects.Parser/ProjectCodeCompletionDatabase.cs:

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs	2005-11-04 11:49:51 UTC (rev 52560)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs	2005-11-04 12:01:53 UTC (rev 52561)
@@ -47,6 +47,14 @@
 			foreach (string s in arguments)
 				ReadArgument (s);
 			
+			if (help) {
+				Console.WriteLine ("build [options] [project-file]");
+				Console.WriteLine ("--f --buildfile:FILE   Project or solution file to build.");
+				Console.WriteLine ("--p --project:PROJECT  Name of the project to build.");
+				Console.WriteLine ();
+				return 0;
+			}
+			
 			if (file == null) {
 				string[] files = Directory.GetFiles (".", "*.mds");
 				if (files.Length == 0)
@@ -77,7 +85,7 @@
 			
 			ICompilerResult res = centry.Build (monitor);
 			
-			return 0;
+			return (res.ErrorCount == 0) ? 0 : 1;
 		}
 		
 		void ReadArgument (string argument)

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs	2005-11-04 11:49:51 UTC (rev 52560)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs	2005-11-04 12:01:53 UTC (rev 52561)
@@ -16,7 +16,7 @@
 using System.ComponentModel;
 using System.Threading;
 
-using Mono.Unix;
+using Mono.Unix.Native;
 using FileMode = Mono.Unix.FilePermissions;
 
 using MonoDevelop.Core;
@@ -539,6 +539,10 @@
 		
 		public override ICompilerResult Build (IProgressMonitor monitor)
 		{
+			if (ActiveConfiguration == null) {
+				monitor.ReportError (GettextCatalog.GetString ("The solution does not have an active configuration."), null);
+				return new DefaultCompilerResult (new CompilerResults (null), "", 0, 1);
+			}
 			CombineEntryCollection allProjects = GetAllBuildableEntries (ActiveConfiguration.Name);
 			monitor.BeginTask (string.Format (GettextCatalog.GetString ("Building Solution {0}"), Name), allProjects.Count);
 			try {
@@ -683,7 +687,7 @@
 			buildstream.Flush ();
 			buildstream.Close ();
 			
-			Syscall.chmod (Path.Combine (BaseDirectory, "make.sh"), FileMode.S_IRUSR | FileMode.S_IWUSR | FileMode.S_IXUSR | FileMode.S_IRGRP | FileMode.S_IWGRP | FileMode.S_IROTH);
+			Syscall.chmod (Path.Combine (BaseDirectory, "make.sh"), FilePermissions.S_IRUSR | FilePermissions.S_IWUSR | FilePermissions.S_IXUSR | FilePermissions.S_IRGRP | FilePermissions.S_IWGRP | FilePermissions.S_IROTH);
 
 			StreamWriter stream = new StreamWriter (Path.Combine (BaseDirectory, "Makefile.solution." + Name.Replace (" ", "")));
 			stream.WriteLine ("# This file is autogenerated by MonoDevelop");