Author: lluis
Date: 2007-08-09 05:12:02 -0400 (Thu, 09 Aug 2007)
New Revision: 83721
Modified:
trunk/mono-addins/Mono.Addins/ChangeLog
trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
Log:
* Mono.Addins/AddinRegistry.cs: Create host addin files in a directory
inside the database.
* Mono.Addins.Database/AddinDatabase.cs: Bump add-in database version.
Removed debug code.
Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog 2007-08-09 09:05:52 UTC (rev
83720)
+++ trunk/mono-addins/Mono.Addins/ChangeLog 2007-08-09 09:12:02 UTC (rev
83721)
@@ -1,3 +1,10 @@
+2007-08-09 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Mono.Addins/AddinRegistry.cs: Create host addin files in a directory
+ inside the database.
+ * Mono.Addins.Database/AddinDatabase.cs: Bump add-in database version.
+ Removed debug code.
+
2007-08-08 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Mono.Addins/TreeNodeCollection.cs, Mono.Addins/TreeNode.cs: Clone the
node
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs 2007-08-09
09:05:52 UTC (rev 83720)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs 2007-08-09
09:12:02 UTC (rev 83721)
@@ -53,11 +53,17 @@
{
basePath = Util.GetFullPath (registryPath);
database = new AddinDatabase (this);
+
+ // Look for add-ins in the hosts directory and in the
default
+ // addins directory
addinDirs = new StringCollection ();
- addinDirs.Add (Path.Combine (basePath, "addins"));
+ addinDirs.Add (database.HostsPath);
+ addinDirs.Add (DefaultAddinsFolder);
+
+ // Get the domain corresponding to the startup folder
if (startupDirectory != null) {
+ this.startupDirectory = startupDirectory;
currentDomain = database.GetFolderDomain (null,
startupDirectory);
- this.startupDirectory = startupDirectory;
} else
currentDomain = AddinDatabase.GlobalDomain;
}
@@ -231,10 +237,10 @@
{
hostFile = Util.GetFullPath (hostFile);
string baseName = Path.GetFileNameWithoutExtension
(hostFile);
- if (!Directory.Exists (DefaultAddinsFolder))
- Directory.CreateDirectory (DefaultAddinsFolder);
+ if (!Directory.Exists (database.HostsPath))
+ Directory.CreateDirectory (database.HostsPath);
- foreach (string s in Directory.GetFiles
(DefaultAddinsFolder, baseName + "*.host.addins")) {
+ foreach (string s in Directory.GetFiles
(database.HostsPath, baseName + "*.addins")) {
try {
using (StreamReader sr = new
StreamReader (s)) {
XmlTextReader tr = new
XmlTextReader (sr);
@@ -249,10 +255,10 @@
}
}
- string file = Path.Combine (DefaultAddinsFolder,
baseName) + ".host.addins";
+ string file = Path.Combine (database.HostsPath,
baseName) + ".addins";
int n=1;
while (File.Exists (file)) {
- file = Path.Combine (DefaultAddinsFolder,
baseName) + "_" + n + ".host.addins";
+ file = Path.Combine (database.HostsPath,
baseName) + "_" + n + ".addins";
n++;
}
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
2007-08-09 09:05:52 UTC (rev 83720)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
2007-08-09 09:12:02 UTC (rev 83721)
@@ -42,7 +42,7 @@
{
public const string GlobalDomain = "global";
- const string VersionTag = "000";
+ const string VersionTag = "001";
ArrayList allSetupInfos;
ArrayList addinSetupInfos;
@@ -81,6 +81,10 @@
get { return Path.Combine (AddinDbDir,
"addin-priv-data"); }
}
+ public string HostsPath {
+ get { return Path.Combine (AddinDbDir, "hosts"); }
+ }
+
string HostIndexFile {
get { return Path.Combine (AddinDbDir, "host-index"); }
}
@@ -1421,8 +1425,9 @@
if (descs.Count > 0) {
foreach (AddinDescription sd in
descs)
InsertSortedAddin
(inserted, lists, sd);
- } else
- Console.WriteLine ("NOT FOUND:
" + adep.FullAddinId + " " + desc.Domain);
+ }
+// else
+// Console.WriteLine ("NOT FOUND:
" + adep.FullAddinId + " " + desc.Domain + " from " + sid);
}
}
ArrayList list = (ArrayList) lists [desc.Domain];
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
