mono
/
mail-archives
зеркало из https://github.com/mono/mail-archives.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
mail-archives/monodevelop-patches-list/2004-May/001164.html

188 строки
9.3 KiB
HTML
Исходник Постоянная ссылка Ответственный История

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Monodevelop-patches-list] r1557 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs/ReferenceDialog Internal/Project/Project Services/ParserService
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1557%20-%20in%20trunk/MonoDevelop/src/Main/Base%3A%20.%20Gui/Dialogs/ReferenceDialog%20Internal/Project/Project%20Services/ParserService&In-Reply-To=">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="001163.html">
<LINK REL="Next" HREF="001165.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Monodevelop-patches-list] r1557 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs/ReferenceDialog Internal/Project/Project Services/ParserService</H1>
<B>commit-watcher at mono-cvs.ximian.com</B>
<A HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1557%20-%20in%20trunk/MonoDevelop/src/Main/Base%3A%20.%20Gui/Dialogs/ReferenceDialog%20Internal/Project/Project%20Services/ParserService&In-Reply-To="
TITLE="[Monodevelop-patches-list] r1557 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs/ReferenceDialog Internal/Project/Project Services/ParserService">commit-watcher at mono-cvs.ximian.com
</A><BR>
<I>Sun May 2 00:28:31 EDT 2004</I>
<P><UL>
<LI>Previous message: <A HREF="001163.html">[Monodevelop-patches-list] r1556 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Internal/Project/Project Services/ParserService
</A></li>
<LI>Next message: <A HREF="001165.html">[Monodevelop-patches-list] r1558 - in trunk/MonoDevelop: . build/AddIns po src/Main/Base src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Services/Project
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1164">[ date ]</a>
<a href="thread.html#1164">[ thread ]</a>
<a href="subject.html#1164">[ subject ]</a>
<a href="author.html#1164">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Author: tberman
Date: 2004-05-02 00:28:30 -0400 (Sun, 02 May 2004)
New Revision: 1557
Modified:
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs
Log:
lots of crap, blah blah blah
(soooo bored)
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-05-02 04:28:30 UTC (rev 1557)
@@ -1,3 +1,14 @@
+2004-05-02 Todd Berman &lt;<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">tberman at sevenl.net</A>&gt;
+
+ * Services/ParserService/DefaultParserService.cs: expose gac lib
+ location finder
+ * Services/ParserService/AssemblyInformation.cs: remove previous fix
+ * Services/ParserService/IParserService.cs: expose gac lib location
+ finder
+ * Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs: sort properly
+ * Internal/Project/Project/ProjectReference.cs: Use parser method to
+ find gac lib location.
+
2004-05-01 Todd Berman &lt;<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">tberman at sevenl.net</A>&gt;
* Gui/Dialogs/TreeViewOptions.cs: notify main window that gui effecting
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-05-02 04:28:30 UTC (rev 1557)
@@ -51,7 +51,8 @@
treeView.AppendColumn (firstColumn);
treeView.AppendColumn (GettextCatalog.GetString (&quot;Version&quot;), new CellRendererText (), &quot;text&quot;, 1);
treeView.AppendColumn (GettextCatalog.GetString (&quot;Path&quot;), new CellRendererText (), &quot;text&quot;, 2);
-
+
+ store.SetSortColumnId (0, SortType.Ascending);
PrintCache();
ScrolledWindow sc = new ScrolledWindow ();
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-05-02 04:28:30 UTC (rev 1557)
@@ -9,6 +9,7 @@
using System.IO;
using System.Diagnostics;
using System.Xml;
+using MonoDevelop.Core.Services;
using MonoDevelop.Services;
using System.ComponentModel;
using MonoDevelop.Gui.Components;
@@ -96,10 +97,9 @@
case ReferenceType.Assembly:
return reference;
- case ReferenceType.Gac:
- //return GetPathToGACAssembly(this);
- // TODO: gac on linux
- return reference;
+ case ReferenceType.Gac:
+ string file = ((IParserService)ServiceManager.Services.GetService (typeof (IParserService))).LoadAssemblyFromGac (reference);
+ return file == String.Empty ? reference : file;
case ReferenceType.Project:
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
string projectOutputLocation = projectService.GetOutputAssemblyName(reference);
Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs 2004-05-02 04:28:30 UTC (rev 1557)
@@ -17,7 +17,10 @@
//using ICSharpCode.SharpAssembly.PE;
//using ICSharpCode.SharpAssembly;
using System.Reflection;
+using MonoDevelop.Services;
+using MonoDevelop.Core.Services;
+
namespace MonoDevelop.Services {
/// &lt;summary&gt;
@@ -94,7 +97,7 @@
//FIXME: Re-enable this code when the mono bug goes away, 0.32
//hopefully
//System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
- Assembly asm = null;
+ Assembly asm = null;
try {
asm = Assembly.LoadFrom (fileName);
if (asm == null)
Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-05-02 04:28:30 UTC (rev 1557)
@@ -104,7 +104,7 @@
}
}
- string LoadAssemblyFromGac (string name) {
+ public string LoadAssemblyFromGac (string name) {
MethodInfo gac_get = typeof (System.Environment).GetMethod (&quot;internalGetGacPath&quot;, BindingFlags.Static|BindingFlags.NonPublic);
if (gac_get == null)
Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs 2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs 2004-05-02 04:28:30 UTC (rev 1557)
@@ -71,6 +71,7 @@
ArrayList IsAsResolve (string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent);
ArrayList CtrlSpace(IParserService parserService, int caretLine, int caretColumn, string fileName);
void AddReferenceToCompletionLookup(IProject project, ProjectReference reference);
+ string LoadAssemblyFromGac (string name);
event ParseInformationEventHandler ParseInformationAdded;
event ParseInformationEventHandler ParseInformationRemoved;
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001163.html">[Monodevelop-patches-list] r1556 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Internal/Project/Project Services/ParserService
</A></li>
<LI>Next message: <A HREF="001165.html">[Monodevelop-patches-list] r1558 - in trunk/MonoDevelop: . build/AddIns po src/Main/Base src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Services/Project
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1164">[ date ]</a>
<a href="thread.html#1164">[ thread ]</a>
<a href="subject.html#1164">[ subject ]</a>
<a href="author.html#1164">[ author ]</a>
</LI>
</UL>
<hr>
<a href="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">More information about the Monodevelop-patches-list
mailing list</a><br>
</body></html>
Ссылка в новой задаче Показать git blame Копировать постоянную ссылку