[Monodevelop-patches-list] r1209 - in trunk/MonoDevelop: build/AddIns src/AddIns/DebuggerAddIn src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Services/File

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-03-20 21:04:39 -0500 (Sat, 20 Mar 2004)
New Revision: 1209

Modified:
   trunk/MonoDevelop/build/AddIns/Makefile.am
   trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/CreatingGenerator.cs
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
   trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
Log:
oddly enough this all makes sense
the debugger is now conditionally compiled and installed


Modified: trunk/MonoDevelop/build/AddIns/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/AddIns/Makefile.am	2004-03-21 01:12:28 UTC (rev 1208)
+++ trunk/MonoDevelop/build/AddIns/Makefile.am	2004-03-21 02:04:39 UTC (rev 1209)
@@ -6,3 +6,7 @@
 addin_DATA = MonoDevelopNewEditor.addin SharpDevelopCore.addin
 
 EXTRA_DIST = $(addin_DATA)
+
+# for conditionally built addins
+CLEANFILES = MonoDevelopDebugger.addin MonoDevelopDebugger.dll
+

Modified: trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am	2004-03-21 01:12:28 UTC (rev 1208)
+++ trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am	2004-03-21 02:04:39 UTC (rev 1209)
@@ -1,8 +1,12 @@
+
+CSC = mcs /debug
+
 if ENABLE_DEBUGGER
 
-all: $(DLL)
+all: $(ASSEMBLY)
 
-DLL = MonoDevelop.Debugger.dll
+ASSEMBLY = MonoDevelop.Debugger.dll
+ADDIN = MonoDevelopDebugger.addin
 
 FILES = \
 DebuggerCommands.cs \
@@ -12,17 +16,26 @@
 
 build_sources = $(addprefix $(srcdir)/, $(FILES))
 
-../../../build/AddIns/MonoDevelopDebugger.addin:
-	cp MonoDevelopDebugger.addin ../../../build/AddIns/
+../../../build/AddIns/$(ADDIN):
+	cp $(ADDIN) ../../../build/AddIns/.
 
-MonoDevelop.Debugger.dll: $(build_sources) ../../../build/AddIns/MonoDevelopDebugger.addin
-	mcs /out:$(DLL) /target:library \
-	/r:gtk-sharp \
-	/r:glib-sharp \
+$(ASSEMBLY): $(build_sources) $(ADDIN)
+	$(CSC) /out:$(ASSEMBLY) /target:library \
+	/r:gtk-sharp /r:glib-sharp \
 	/r:$(debugger_prefix)/lib/Mono.Debugger.dll \
 	/r:../../../build/bin/MonoDevelop.Base.dll \
 	/r:../../../build/bin/MonoDevelop.Core.dll \
 	$(build_sources) \
-	&& cp $(DLL) ../../../build/AddIns/
+	&& cp $(ASSEMBLY) ../../../build/AddIns/
+
+assemblydir = $(libdir)/monodevelop/AddIns
+assembly_DATA = $(ASSEMBLY) $(ADDIN)
+
+CLEANFILES = $(ASSEMBLY)
+
+EXTRA_DIST = $(FILES) MonoDevelopDebugger.addin
+
 else
+all:
+
 endif

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/CreatingGenerator.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/CreatingGenerator.cs	2004-03-21 01:12:28 UTC (rev 1208)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/CreatingGenerator.cs	2004-03-21 02:04:39 UTC (rev 1209)
@@ -17,7 +17,7 @@
 		{
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-			string path = fileUtilityService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory) + "CodeCompletionData";
+			string path = Path.Combine (fileUtilityService.GetDirectoryNameWithSeparator(propertyService.ConfigDirectory), "CodeCompletionData");
 			if (!Directory.Exists (path))
 				Directory.CreateDirectory (path);
 			propertyService.SetProperty ("SharpDevelop.CodeCompletion.DataDirectory", path);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs	2004-03-21 01:12:28 UTC (rev 1208)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs	2004-03-21 02:04:39 UTC (rev 1209)
@@ -32,6 +32,7 @@
 		Title = "Select Generation Style";
 		heavy = new RadioButton("Heavy process");
 		light = new RadioButton(heavy, "Light process");
+
 		AppendItem("", heavy, "This process is slower and more memory-intensive than the light process, but will enable faster code completion");
 		AppendItem("", light, "This process will take less time and memory to produce the code completion database, but code completion will be slower");
 	}
@@ -164,7 +165,7 @@
 	internal DruidPageEdge GetEndPage()
 	{
 		DruidPageEdge page = new DruidPageEdge(EdgePosition.Finish);
-		page.Text = "Click Accept to start the database creation process";
+		page.Text = "Click Apply to start the database creation process";
 		page.BackClicked += new BackClickedHandler(GoToPrev);
 		page.FinishClicked += new FinishClickedHandler(EndOfWizard);
 		return page;

Modified: trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-03-21 01:12:28 UTC (rev 1208)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-03-21 02:04:39 UTC (rev 1209)
@@ -29,7 +29,7 @@
 			// TODO: uri sanity check
 			this.uri = uri;
 			this.mime = Vfs.GetMimeType (uri);
-			DateTime now = DateTime.Now.ToUniversalTime ();
+			DateTime now = DateTime.UtcNow;
 			this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
 		}