diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2010-03-01 02:24:49 +0300 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2010-03-01 02:24:49 +0300 |
| commit | 2778fd63180903e87caade07d7eb975301273648 (patch) | |
| tree | e6a8f6d60991e803b9b8aae2478ceb2ca73036a5 /mcs/tools | |
| parent | 901a2d36f9b164ebbb5e4a9753cd817e4e5d26a1 (diff) | |
* Makefile: Remove System.Core.dll reference.
* Monodoc/provider.cs: Fix the build: monodoc.dll is build for the 1.1
profile in Mono 2.6, so remove use of generics/etc.
svn path=/branches/mono-2-6/mcs/; revision=152639
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/monodoc/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/tools/monodoc/Makefile | 1 | ||||
| -rw-r--r-- | mcs/tools/monodoc/Monodoc/provider.cs | 17 |
3 files changed, 19 insertions, 5 deletions
diff --git a/mcs/tools/monodoc/ChangeLog b/mcs/tools/monodoc/ChangeLog index c2c291722e8..3ae5ad6f238 100644 --- a/mcs/tools/monodoc/ChangeLog +++ b/mcs/tools/monodoc/ChangeLog @@ -1,3 +1,9 @@ +2010-02-28 Jonathan Pryor <jpryor@novell.com> + + * Makefile: Remove System.Core.dll reference. + * Monodoc/provider.cs: Fix the build: monodoc.dll is build for the 1.1 + profile in Mono 2.6, so remove use of generics/etc. + 2010-02-26 Jonathan Pryor <jpryor@novell.com> * Makefile: Add a System.Core.dll reference; embed monodoc.xml as a diff --git a/mcs/tools/monodoc/Makefile b/mcs/tools/monodoc/Makefile index f605e3310b5..d4a37199e6b 100644 --- a/mcs/tools/monodoc/Makefile +++ b/mcs/tools/monodoc/Makefile @@ -64,7 +64,6 @@ LIB_MCS_FLAGS = \ /r:ICSharpCode.SharpZipLib \ /r:$(corlib) \ /r:System.dll \ - /r:System.Core.dll \ /r:System.Web \ /r:System.Web.Services \ /r:System.Xml.dll diff --git a/mcs/tools/monodoc/Monodoc/provider.cs b/mcs/tools/monodoc/Monodoc/provider.cs index 9092241decb..34ec0cd57bb 100644 --- a/mcs/tools/monodoc/Monodoc/provider.cs +++ b/mcs/tools/monodoc/Monodoc/provider.cs @@ -880,11 +880,20 @@ public class RootTree : Tree { doc.Load (layout); return LoadTree (basedir, doc, - Directory.GetFiles (Path.Combine (basedir, "sources")) - .Where (file => file.EndsWith (".source"))); + Where (Directory.GetFiles (Path.Combine (basedir, "sources")), + delegate (object file) {return file.ToString ().EndsWith (".source");})); } - public static RootTree LoadTree (string indexDir, XmlDocument docTree, IEnumerable<string> sourceFiles) + delegate bool WherePredicate (object o); + + static IEnumerable Where (IEnumerable source, WherePredicate predicate) + { + foreach (var e in source) + if (predicate (e)) + yield return e; + } + + public static RootTree LoadTree (string indexDir, XmlDocument docTree, IEnumerable/*<string>*/ sourceFiles) { if (docTree == null) { docTree = new XmlDocument (); @@ -916,7 +925,7 @@ public class RootTree : Tree { // // Load the sources // - foreach (var sourceFile in sourceFiles) + foreach (string sourceFile in sourceFiles) root.AddSourceFile (sourceFile); foreach (string path in UncompiledHelpSources) { |