Author: lluis
Date: 2007-04-27 11:39:30 -0400 (Fri, 27 Apr 2007)
New Revision: 76390
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.Autotools/Set.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
Log:
* SolutionMakefileHandler.cs: Make sure that makefiles are generated in
the same order in which they will be built, since there is some
data collected by the context that it is important to get in the
correct order (e.g. list of built files).
* Set.cs: Avoid unneeded boxing.
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-04-27
15:27:15 UTC (rev 76389)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-04-27
15:39:30 UTC (rev 76390)
@@ -1,5 +1,13 @@
2007-04-27 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+ * SolutionMakefileHandler.cs: Make sure that makefiles are generated in
+ the same order in which they will be built, since there is some
+ data collected by the context that it is important to get in the
+ correct order (e.g. list of built files).
+ * Set.cs: Avoid unneeded boxing.
+
+2007-04-27 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
* SimpleProjectMakefileHandler.cs, SolutionDeployer.cs,
templates/Makefile.include, templates/Makefile.am.project.template,
AutotoolsContext.cs: Fixed several problems in the autotools file
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/Set.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/Set.cs 2007-04-27
15:27:15 UTC (rev 76389)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/Set.cs 2007-04-27
15:39:30 UTC (rev 76390)
@@ -28,7 +28,7 @@
public void Add(object o)
{
- hashtable[o] = true;
+ hashtable[o] = this;
}
public void Remove(object o)
@@ -59,7 +59,7 @@
public void Union(Set set)
{
foreach(object o in set) {
- hashtable[o] = true;
+ hashtable[o] = this;
}
}
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
2007-04-27 15:27:15 UTC (rev 76389)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
2007-04-27 15:39:30 UTC (rev 76390)
@@ -50,7 +50,7 @@
StringBuilder subdirs = new StringBuilder();
subdirs.Append ("#Warning: This is an
automatically generated file, do not edit!\n");
- Set children = new Set ();
+ ArrayList children = new ArrayList ();
foreach ( CombineConfiguration config in
combine.Configurations )
{
if ( !ctx.IsSupportedConfiguration (
config.Name ) ) continue;
@@ -73,7 +73,8 @@
subdirs.Append (" ");
subdirs.Append (
AutotoolsContext.EscapeStringForAutomake (path) );
- children.Add ( ce );
+ if (!children.Contains (ce))
+ children.Add ( ce );
}
subdirs.Append ( "\nendif\n" );
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
