Author: zoltan
Date: 2005-03-29 04:10:19 -0500 (Tue, 29 Mar 2005)
New Revision: 42324

Modified:
   trunk/monocov/ChangeLog
   trunk/monocov/Makefile
   trunk/monocov/symbols.cs
Log:
2005-03-29  Zoltan Varga  <[EMAIL PROTECTED]>

        * symbols.cs: Update to latest Mono.CompilerServices.SymbolWriter.

        * Makefile: Disable building of nunit-console.exe for now.


Modified: trunk/monocov/ChangeLog
===================================================================
--- trunk/monocov/ChangeLog     2005-03-29 07:55:38 UTC (rev 42323)
+++ trunk/monocov/ChangeLog     2005-03-29 09:10:19 UTC (rev 42324)
@@ -1,3 +1,9 @@
+2005-03-29  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * symbols.cs: Update to latest Mono.CompilerServices.SymbolWriter.
+
+       * Makefile: Disable building of nunit-console.exe for now.
+
 2004-12-06  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * coverage.c *.cs Makefile: Applied patch from Mike Tindal ([EMAIL 
PROTECTED]). Fix compilation problems on HEAD.

Modified: trunk/monocov/Makefile
===================================================================
--- trunk/monocov/Makefile      2005-03-29 07:55:38 UTC (rev 42323)
+++ trunk/monocov/Makefile      2005-03-29 09:10:19 UTC (rev 42324)
@@ -3,7 +3,7 @@
 GUI = gtk
 MONO_ROOT = ../mono
 
-all: monocov.exe libmono-profiler-monocov.so symbols.exe nunit-console.exe
+all: monocov.exe libmono-profiler-monocov.so symbols.exe
 
 ifeq ($(GUI), gtk)
 GUI_SRCS = \
@@ -47,7 +47,7 @@
        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 nunit.core -r nunit.util -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 $@ $^

Modified: trunk/monocov/symbols.cs
===================================================================
--- trunk/monocov/symbols.cs    2005-03-29 07:55:38 UTC (rev 42323)
+++ trunk/monocov/symbols.cs    2005-03-29 09:10:19 UTC (rev 42324)
@@ -16,7 +16,7 @@
                string assemblyName = args [0];
                string methodNamePattern = args [1];
 
-               Assembly assembly = Assembly.LoadFrom (args [0]);
+               Assembly assembly = Assembly.LoadFrom (assemblyName);
 
                Console.WriteLine ("Reading symbols for " + assembly + " ...");
                MonoSymbolFile symbolFile = MonoSymbolFile.ReadSymbolFile 
(assembly);
@@ -31,9 +31,11 @@
 
                        LineNumberEntry[] lines = entry.LineNumbers;
 
-                       if (entry.Name.IndexOf (methodNamePattern) != -1) {
-                               Console.WriteLine ("METHOD: " + entry.Name + 
"[" + entry.Token + "]");
+                       MethodBase mi = MonoDebuggerSupport.GetMethod 
(assembly, entry.Token);
 
+                       if (mi.Name.IndexOf (methodNamePattern) != -1) {
+                               Console.WriteLine (mi.DeclaringType.FullName + 
":" + mi.Name + " " + entry);
+
                                foreach (LineNumberEntry line in lines)
                                        Console.WriteLine ("\t" + line);
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to