2004-12-06 Zoltan Varga <vargaz@freemail.hu>

* coverage.c *.cs Makefile: Applied patch from Mike Tindal (mtindal@paradoxpoint.com). Fix compilation problems on HEAD.

svn path=/trunk/monocov/; revision=37229

ChangeLog

@@ -1,3 +1,7 @@
+2004-12-06  Zoltan Varga  <vargaz@freemail.hu>
+
+	* coverage.c *.cs Makefile: Applied patch from Mike Tindal (mtindal@paradoxpoint.com). Fix compilation problems on HEAD.
+
 2004-05-13  Zoltan Varga  <vargaz@freemail.hu>
 
 	* CoverageModel.cs: Invoke GetGuid dynamically since it is no longer

CoverageModel.cs

@@ -5,8 +5,7 @@ using System.Xml;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-
-using Mono.CSharp.Debugger;
+using Mono.CompilerServices.SymbolWriter;
 
 namespace MonoCov {
 

Makefile

@@ -10,7 +10,7 @@ GUI_SRCS = \
 	gui/gtk/MonoCov.cs \
 	gui/gtk/CoverageView.cs \
 	gui/gtk/SourceWindow.cs
-GUI_LIBS = -r gtk-sharp.dll -r gdk-sharp.dll -r glib-sharp.dll -r glade-sharp.dll -r gnome-sharp.dll -r System.Drawing -resource:gui/gtk/monocov.glade,monocov.glade
+GUI_LIBS = -pkg:gtk-sharp -pkg:gnome-sharp -pkg:glade-sharp -r System.Drawing -resource:gui/gtk/monocov.glade,monocov.glade
 else
 GUI_SRCS = \
 	gui/qt/MonoCov.cs \
@@ -33,7 +33,7 @@ SRCS = \
 	$(GUI_SRCS)
 
 monocov.exe: $(SRCS) style.xsl .gui-$(GUI)
-	mcs -g /target:exe /out:$@ -define:GUI_$(GUI) -r Mono.CSharp.Debugger -r Mono.GetOptions $(GUI_LIBS) $(SRCS) -resource:style.xsl,style.xsl -resource:trans.gif,trans.gif
+	mcs -g /target:exe /out:$@ -define:GUI_$(GUI) -r Mono.CompilerServices.SymbolWriter -r Mono.GetOptions $(GUI_LIBS) $(SRCS) -resource:style.xsl,style.xsl -resource:trans.gif,trans.gif
 
 .gui-gtk:
 	@rm -f .gui-*
@@ -44,10 +44,10 @@ monocov.exe: $(SRCS) style.xsl .gui-$(GUI)
 	@touch .gui-qt
 
 symbols.exe: symbols.cs
-	mcs -g /target:exe /out:$@ -r Mono.CSharp.Debugger symbols.cs
+	mcs -g /target:exe /out:$@ -r Mono.CompilerServices.SymbolWriter symbols.cs
 
 nunit-console.exe: nunit-console.cs
-	mcs -r NUnit.Framework -r Mono.GetOptions nunit-console.cs
+	mcs -r nunit.framework -r Mono.GetOptions nunit-console.cs
 
 libmono-profiler-monocov.so: coverage.c
 	$(CC) -g -I$(MONO_ROOT) `pkg-config --cflags glib-2.0` --shared -o $@ $^

MethodCoverageItem.cs

@@ -1,7 +1,7 @@
 
 using System;
 using System.Collections;
-using Mono.CSharp.Debugger;
+using Mono.CompilerServices.SymbolWriter;
 
 namespace MonoCov {
 

coverage.c

@@ -9,6 +9,9 @@
 #include "mono/metadata/debug-helpers.h"
 #include "mono/metadata/profiler.h"
 
+#include "mono/metadata/metadata-internals.h"
+#include "mono/metadata/class-internals.h"
+
 struct _MonoProfiler {
 	/* Contains the methods for which we have coverage data */
 	GHashTable *methods;

gui/gtk/MonoCov.cs

@@ -9,6 +9,7 @@
 //  - Why can't I inherit from Widget as in Qt ???
 //
 
+using GLib;
 using Gtk;
 using Gnome;
 using Glade;

symbols.cs

@@ -4,7 +4,7 @@ using System.Collections;
 using System.Xml;
 using System.IO;
 using System.Reflection;
-using Mono.CSharp.Debugger;
+using Mono.CompilerServices.SymbolWriter;
 
 public class SymbolDumper {