[Monodevelop-patches-list] r2063 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding Main/Base Main/Base/Internal/Project/Combine

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

Author: tberman
Date: 2004-12-08 03:51:48 -0500 (Wed, 08 Dec 2004)
New Revision: 2063

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
Log:
2004-12-08  Everaldo Canuto  <everaldo_canuto at yahoo.com.br>

	* CSharpBindingCompilerManager.cs: Add support to multiple compilers
	in Makefiles generated by MonoDevelop.

2004-12-08  Everaldo Canuto  <everaldo_canuto at yahoo.com.br>

	* Internal/Project/Combine/Combine.cs: Add support to multiple runtime
	in Makefiles generated by MonoDevelop.
	


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-12-08 00:39:15 UTC (rev 2062)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-12-08 08:51:48 UTC (rev 2063)
@@ -470,7 +470,8 @@
 				stream.WriteLine ();
 			}
 
-			stream.Write ("MCS_OPTIONS = ");
+			stream.WriteLine ("COMPILER = mcs");
+			stream.Write ("COMPILER_OPTIONS = ");
 			if (compilerparameters.UnsafeCode) {
 				stream.Write ("-unsafe ");
 			}
@@ -493,7 +494,7 @@
 				stream.WriteLine ();
 			}
 			
-			stream.Write ("\tmcs $(MCS_OPTIONS) -target:{0} -out:\"{1}\"", target, outputName);
+			stream.Write ("\t$(COMPILER) $(COMPILER_OPTIONS) -target:{0} -out:\"{1}\"", target, outputName);
 			if (resources.Count > 0) {
 				stream.Write (" $(RESOURCES_BUILD)");
 			}

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-12-08 00:39:15 UTC (rev 2062)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-12-08 08:51:48 UTC (rev 2063)
@@ -1,3 +1,8 @@
+2004-12-08  Everaldo Canuto  <everaldo_canuto at yahoo.com.br>
+
+	* CSharpBindingCompilerManager.cs: Add support to multiple compilers
+	in Makefiles generated by MonoDevelop.
+
 2004-12-07  Alexandre Gomes <alexmipego at hotmail.com>
 
 	* CSharpLanguageBinding.cs: Added CommentTag to be used by (Un)CommentCode

Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-08 00:39:15 UTC (rev 2062)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-08 08:51:48 UTC (rev 2063)
@@ -1,3 +1,8 @@
+2004-12-08  Everaldo Canuto  <everaldo_canuto at yahoo.com.br>
+
+	* Internal/Project/Combine/Combine.cs: Add support to multiple runtime
+	in Makefiles generated by MonoDevelop.
+	
 2004-12-07  Alexandre Gomes <alexmipego at hotmail.com>
 
 	*  Gui/ContentInterfaces/ICodeStyleOperations.cs: Added to rule style changes in code like (Un)Comment Code

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-12-08 00:39:15 UTC (rev 2062)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-12-08 08:51:48 UTC (rev 2063)
@@ -664,6 +664,8 @@
 			stream.WriteLine ("# Do not edit it.");
 			stream.WriteLine ();
 
+			stream.WriteLine ("RUNTIME := mono");
+			stream.WriteLine ();
 			stream.WriteLine ("OUTPUTDIR := {0}", rel_outputdir);
 			stream.WriteLine ();
 			stream.Write ("all: depcheck __init ");
@@ -696,7 +698,7 @@
 				stream.WriteLine ("\t at echo `run'ning multiple startup projects is not yet support");
 			} else {
 				if (SingleStartProjectName != null && GetEntry (SingleStartProjectName) != null)
-					stream.WriteLine ("\tcd $(OUTPUTDIR) && mono {0}", GetEntry (SingleStartProjectName).GetOutputName ());
+					stream.WriteLine ("\tcd $(OUTPUTDIR) && $(RUNTIME) {0}", GetEntry (SingleStartProjectName).GetOutputName ());
 				else
 					stream.WriteLine ("\t at echo No startup project defined");
 			}