[Monodevelop-patches-list] r2491 - trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn

[Chris Toshok]

Author: toshok
Date: 2005-04-28 18:11:27 -0400 (Thu, 28 Apr 2005)
New Revision: 2491

Added:
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggerPaths.cs.in
Modified:
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebugAttributeHandler.cs
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am
Log:
2005-04-28  Chris Toshok  <toshok at ximian.com>

	* DebugAttributeHandler.cs
	(DebugAttributeHandler.ScanDirectory): split out the bulk of
	Rescan and put it here so we can support multiple assembly drop
	points.
	(DebugAttributeHandler.Rescan): call ScanDirectory with
	DebuggerPaths.VisualizerPath.

	* DebuggerPaths.cs.in: new file so we can insert configure'd
	paths.
	
	* Makefile.am (build_sources): add DebuggerPaths.cs
	(DebuggerPaths.cs): add rule to build this file.
	(DISTCLEANFILES): add DebuggerPaths.cs



Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2005-04-28 02:54:48 UTC (rev 2490)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2005-04-28 22:11:27 UTC (rev 2491)
@@ -1,3 +1,19 @@
+2005-04-28  Chris Toshok  <toshok at ximian.com>
+
+	* DebugAttributeHandler.cs
+	(DebugAttributeHandler.ScanDirectory): split out the bulk of
+	Rescan and put it here so we can support multiple assembly drop
+	points.
+	(DebugAttributeHandler.Rescan): call ScanDirectory with
+	DebuggerPaths.VisualizerPath.
+
+	* DebuggerPaths.cs.in: new file so we can insert configure'd
+	paths.
+	
+	* Makefile.am (build_sources): add DebuggerPaths.cs
+	(DebuggerPaths.cs): add rule to build this file.
+	(DISTCLEANFILES): add DebuggerPaths.cs
+
 2005-04-27  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* DebuggingService.cs: Track api changes in IDebuggingServices.

Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebugAttributeHandler.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebugAttributeHandler.cs	2005-04-28 02:54:48 UTC (rev 2490)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebugAttributeHandler.cs	2005-04-28 22:11:27 UTC (rev 2491)
@@ -20,13 +20,9 @@
 
 	public class DebugAttributeHandler
 	{
-		public void Rescan () {
-
-		  display_by_type_name = new Hashtable ();
-		  proxy_by_type_name = new Hashtable ();
-		  visualizers_by_type_name = new Hashtable ();
-
-			DirectoryInfo info = new DirectoryInfo ("/opt/mono/lib/monodevelop/Debugger/");
+		public void ScanDirectory (string dir)
+		{
+			DirectoryInfo info = new DirectoryInfo (dir);
 			FileInfo[] dlls = info.GetFiles ("*.dll");
 
 			foreach (FileInfo dll_info in dlls) {
@@ -62,11 +58,20 @@
 
 					vas.Add (va);
 
-					Console.WriteLine ("VISUALIZER ATTIRBUTE for type {0}", va.TargetTypeName);
+					Console.WriteLine ("VISUALIZER ATTRIBUTE for type {0}", va.TargetTypeName);
 				}
 			}
 		}
 
+		public void Rescan () {
+
+			display_by_type_name = new Hashtable ();
+			proxy_by_type_name = new Hashtable ();
+			visualizers_by_type_name = new Hashtable ();
+
+			ScanDirectory (DebuggerPaths.VisualizerPath);
+		}
+
 		public string EvaluateDebuggerDisplay (ITargetObject obj, string display)
 		{
 			StringBuilder sb = new StringBuilder ("");

Added: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggerPaths.cs.in
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggerPaths.cs.in	2005-04-28 02:54:48 UTC (rev 2490)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggerPaths.cs.in	2005-04-28 22:11:27 UTC (rev 2491)
@@ -0,0 +1,8 @@
+
+namespace MonoDevelop.Debugger
+{
+	public class DebuggerPaths
+	{
+		public static readonly string VisualizerPath = "@pkglibdir@/Debugger";
+	}
+}

Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am	2005-04-28 02:54:48 UTC (rev 2490)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am	2005-04-28 22:11:27 UTC (rev 2491)
@@ -29,21 +29,26 @@
 
 all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
 
-build_sources = $(addprefix $(srcdir)/, $(FILES))
+build_sources = $(addprefix $(srcdir)/, $(FILES)) DebuggerPaths.cs
 
+DebuggerPaths.cs: $(srcdir)/DebuggerPaths.cs.in
+	sed -e 's,@''pkglibdir@,$(pkglibdir),g' $(srcdir)/$< > $@.tmp
+	mv $@.tmp $@
+
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
 	cp $(ADDIN) $(ADDIN_BUILD)/.
 
 $(ASSEMBLY): $(build_sources)
 	mkdir -p $(ADDIN_BUILD)
-	$(CSC) -out:$@ -target:library \
+	$(CSC) -debug -define:NET_2_0 -out:$@ -target:library \
 	$(build_sources) $(DLLS)
 
 assemblydir = $(libdir)/monodevelop/AddIns/DebuggerAddIn
-assembly_DATA = $(ASSEMBLY) $(ADDIN)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(ADDIN)
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+DISTCLEANFILES = DebuggerPaths.cs
 
 else
 all: