Author: lluis
Date: 2007-03-28 16:53:39 -0500 (Wed, 28 Mar 2007)
New Revision: 75114

Modified:
   trunk/mono-addins/Mono.Addins/ChangeLog
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
   trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
Log:
* Mono.Addins.mdp: Generate a winexe, to avoid showing a console in
  windows.
* Mono.Addins/Addin.cs: Null check.
* Mono.Addins/AddinSessionService.cs, Mono.Addins/AddinManager.cs,
  Mono.Addins.Database/AddinScanner.cs: Use Assembly.CodeBase, since
  Assembly.Location will return the wrong value when the assembly is
  loaded using shadow copy.
* Mono.Addins/AddinRegistry.cs, Mono.Addins.Database/SetupProcess.cs:
  Windows portability fixes.
* Mono.Addins.Description/ExtensionNodeSet.cs: Workaround for mono bug.
* Mono.Addins.Database/Util.cs, Mono.Addins.Database/FileDatabase.cs:
  Use a custom method for getting a string hash, to make sure we get
  consistent results.

Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog     2007-03-28 21:50:03 UTC (rev 
75113)
+++ trunk/mono-addins/Mono.Addins/ChangeLog     2007-03-28 21:53:39 UTC (rev 
75114)
@@ -1,3 +1,19 @@
+2007-03-28  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * Mono.Addins.mdp: Generate a winexe, to avoid showing a console in
+         windows.
+       * Mono.Addins/Addin.cs: Null check.
+       * Mono.Addins/AddinSessionService.cs, Mono.Addins/AddinManager.cs,
+         Mono.Addins.Database/AddinScanner.cs: Use Assembly.CodeBase, since
+         Assembly.Location will return the wrong value when the assembly is
+         loaded using shadow copy.
+       * Mono.Addins/AddinRegistry.cs, Mono.Addins.Database/SetupProcess.cs:
+         Windows portability fixes.
+       * Mono.Addins.Description/ExtensionNodeSet.cs: Workaround for mono bug.
+       * Mono.Addins.Database/Util.cs, Mono.Addins.Database/FileDatabase.cs:
+         Use a custom method for getting a string hash, to make sure we get
+         consistent results.
+
 2007-03-23  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Mono.Addins.mdp: Updated.

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-03-28 21:50:03 UTC 
(rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-03-28 21:53:39 UTC 
(rev 75114)
@@ -147,6 +147,8 @@
                                else
                                        database.ReadAddinDescription (null, 
configFile, out m);
                                
+                               if (m == null)
+                                       throw new InvalidOperationException 
("Could not read add-in description");
                                if (addin == null) {
                                        addin = AddinInfo.ReadFromDescription 
(m);
                                        sourceFile = m.AddinFile;

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs   2007-03-28 
21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs   2007-03-28 
21:53:39 UTC (rev 75114)
@@ -61,7 +61,8 @@
                        if (initialized)
                                return;
                        
-                       startupDirectory = Path.GetDirectoryName 
(Assembly.GetCallingAssembly ().Location);
+                       startupDirectory = new Uri (Assembly.GetCallingAssembly 
().CodeBase).LocalPath;
+                       startupDirectory = Path.GetDirectoryName 
(startupDirectory);
                        
                        string customDir = Environment.GetEnvironmentVariable 
("MONO_ADDINS_REGISTRY");
                        if (customDir != null && customDir.Length > 0)
@@ -72,7 +73,8 @@
                        else
                                registry = new AddinRegistry (configDir, 
startupDirectory);
 
-                       if (registry.CreateHostAddinsFile 
(Assembly.GetCallingAssembly ().Location))
+                       string asmFile = new Uri (Assembly.GetCallingAssembly 
().CodeBase).LocalPath;
+                       if (registry.CreateHostAddinsFile (asmFile))
                                registry.Update (new ConsoleProgressStatus 
(false));
                        
                        initialized = true;

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs  2007-03-28 
21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs  2007-03-28 
21:53:39 UTC (rev 75114)
@@ -75,7 +75,7 @@
                
                internal static string GlobalRegistryPath {
                        get {
-                               string path = System.IO.Path.Combine 
(Environment.GetEnvironmentVariable ("HOME"), ".config");
+                               string path = Environment.GetFolderPath 
(Environment.SpecialFolder.ApplicationData); 
                                path = Path.Combine (path, "mono.addins");
                                return Util.GetFullPath (path);
                        }

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs    
2007-03-28 21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs    
2007-03-28 21:53:39 UTC (rev 75114)
@@ -281,6 +281,7 @@
                                if (nt.Id == name)
                                        return nt;
                        }
+                       
                        foreach (string ns in nset.NodeSets) {
                                ExtensionNodeSet regSet = (ExtensionNodeSet) 
nodeSets [ns];
                                if (regSet == null) {
@@ -324,7 +325,8 @@
                {
                        if (AddinDatabase.RunningSetupProcess || asm is 
System.Reflection.Emit.AssemblyBuilder)
                                return;
-                       Addin ainfo = 
AddinManager.Registry.GetAddinForHostAssembly (asm.Location);
+                       string asmFile = new Uri (asm.CodeBase).LocalPath;
+                       Addin ainfo = 
AddinManager.Registry.GetAddinForHostAssembly (asmFile);
                        if (ainfo != null && !IsAddinLoaded (ainfo.Id))
                                InsertAddin (null, ainfo);
                }

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs  
2007-03-28 21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs  
2007-03-28 21:53:39 UTC (rev 75114)
@@ -308,7 +308,7 @@
                        StringCollection directories = new StringCollection ();
                        StringCollection directoriesWithSubdirs = new 
StringCollection ();
                        try {
-                               r = new XmlTextReader (file);
+                               r = new XmlTextReader (new StreamReader (file));
                                r.MoveToContent ();
                                if (r.IsEmptyElement)
                                        return;
@@ -400,7 +400,8 @@
                                
                                if (configFile != null) {
                                        using (Stream s = 
asm.GetManifestResourceStream (configFile)) {
-                                               config = AddinDescription.Read 
(s, Path.GetDirectoryName (asm.Location));
+                                               string asmFile = new Uri 
(asm.CodeBase).LocalPath;
+                                               config = AddinDescription.Read 
(s, Path.GetDirectoryName (asmFile));
                                        }
                                }
                                else {
@@ -416,9 +417,9 @@
                                config.BasePath = Path.GetDirectoryName 
(filePath);
                                config.AddinFile = filePath;
                                
-                               string asmFile = Path.GetFileName (filePath);
-                               if (!config.MainModule.Assemblies.Contains 
(asmFile))
-                                       config.MainModule.Assemblies.Add 
(asmFile);
+                               string rasmFile = Path.GetFileName (filePath);
+                               if (!config.MainModule.Assemblies.Contains 
(rasmFile))
+                                       config.MainModule.Assemblies.Add 
(rasmFile);
                                
                                return ScanDescription (monitor, config, asm, 
scanResult);
                        }
@@ -457,8 +458,10 @@
                                
                                if (config.IsRoot && scanResult.HostIndex != 
null) {
                                        // If the add-in is a root, register 
its assemblies
-                                       foreach (Assembly asm in assemblies)
-                                               
scanResult.HostIndex.RegisterAssembly (asm.Location, config.AddinId, 
config.AddinFile);
+                                       foreach (Assembly asm in assemblies) {
+                                               string asmFile = new Uri 
(asm.CodeBase).LocalPath;
+                                               
scanResult.HostIndex.RegisterAssembly (asmFile, config.AddinId, 
config.AddinFile);
+                                       }
                                }
                                
                        } catch (Exception ex) {
@@ -495,8 +498,10 @@
                                
                                                if (config.IsRoot && 
scanResult.HostIndex != null) {
                                                        // If the add-in is a 
root, register its assemblies
-                                                       foreach (Assembly asm 
in assemblies)
-                                                               
scanResult.HostIndex.RegisterAssembly (asm.Location, config.AddinId, 
config.AddinFile);
+                                                       foreach (Assembly asm 
in assemblies) {
+                                                               string asmFile 
= new Uri (asm.CodeBase).LocalPath;
+                                                               
scanResult.HostIndex.RegisterAssembly (asmFile, config.AddinId, 
config.AddinFile);
+                                                       }
                                                }
                                                
                                        } catch (Exception ex) {

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs  
2007-03-28 21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/FileDatabase.cs  
2007-03-28 21:53:39 UTC (rev 75114)
@@ -294,7 +294,7 @@
                
                object ReadSharedObject (string directory, string 
sharedFileName, string extension, string objectId, BinaryXmlTypeMap typeMap, 
bool checkOnly, out string fileName)
                {
-                       string name = sharedFileName + "_" + 
objectId.GetHashCode ().ToString ("x");
+                       string name = sharedFileName + "_" + 
Util.GetStringHashCode (objectId).ToString ("x");
                        string file = Path.Combine (directory, name + 
extension);
 
                        object result;
@@ -348,7 +348,7 @@
                        
                        if (file == null) {
                                int count = 1;
-                               string name = sharedFileName + "_" + 
objectId.GetHashCode ().ToString ("x");
+                               string name = sharedFileName + "_" + 
Util.GetStringHashCode (objectId).ToString ("x");
                                file = Path.Combine (directory, name + 
extension);
                                
                                while (Exists (file)) {

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs  
2007-03-28 21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/SetupProcess.cs  
2007-03-28 21:53:39 UTC (rev 75114)
@@ -39,11 +39,14 @@
        {
                internal static void ExecuteCommand (IProgressStatus monitor, 
string registryPath, string startupDir, string name, params string[] args)
                {
-                       string asm = typeof(SetupProcess).Assembly.Location;
+                       string asm = new Uri 
(typeof(SetupProcess).Assembly.CodeBase).LocalPath;
                        string verboseParam = monitor.VerboseLog ? "v " : "nv";
                        
                        Process process = new Process ();
-                       process.StartInfo = new ProcessStartInfo ("mono", 
"--debug " + asm + " " + verboseParam + " " + name + " " + string.Join (" ", 
args));
+                       if (Util.IsWindows)
+                               process.StartInfo = new ProcessStartInfo (asm, 
verboseParam + " " + name + " " + string.Join (" ", args));
+                       else
+                               process.StartInfo = new ProcessStartInfo 
("mono", "--debug " + asm + " " + verboseParam + " " + name + " " + string.Join 
(" ", args));
                        process.StartInfo.WorkingDirectory = 
AppDomain.CurrentDomain.BaseDirectory;
                        process.StartInfo.UseShellExecute = false;
                        process.StartInfo.RedirectStandardInput = true;

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs  2007-03-28 
21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs  2007-03-28 
21:53:39 UTC (rev 75114)
@@ -113,5 +113,18 @@
                        }
                        return root + string.Join (new string 
(Path.DirectorySeparatorChar, 1), newParts, 0, i);
                }
+               
+               public static int GetStringHashCode (string s)
+               {
+                       int h = 0;
+                       int n = 0;
+                       for (; n < s.Length - 1; n+=2) {
+                               h = (h << 5) - h + s[n];
+                               h = (h << 5) - h + s[n+1];
+                       }
+                       if (n < s.Length)
+                               h = (h << 5) - h + s[n];
+                       return h;
+               }
        }
 }

Modified: 
trunk/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs   
2007-03-28 21:50:03 UTC (rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Description/ExtensionNodeSet.cs   
2007-03-28 21:53:39 UTC (rev 75114)
@@ -220,8 +220,10 @@
                
                public IEnumerator GetEnumerator ()
                {
+                       ArrayList ll = new ArrayList (list.Count);
                        foreach (string[] ns in list)
-                               yield return ns [0];
+                               ll.Add (ns [0]);
+                       return ll.GetEnumerator ();
                }
                
                public void Add (string nodeSetId)

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.mdp       2007-03-28 21:50:03 UTC 
(rev 75113)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.mdp       2007-03-28 21:53:39 UTC 
(rev 75114)
@@ -2,7 +2,7 @@
   <Configurations active="Default">
     <Configuration name="Default" ctype="DotNetProjectConfiguration">
       <Output directory="../bin" assembly="Mono.Addins.dll" />
-      <Build debugmode="True" target="Exe" />
+      <Build debugmode="True" target="WinExe" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" 
clr-version="Net_1_1" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" 
unsafecodeallowed="False" generateoverflowchecks="True" 
mainclass="Mono.Addins.Database.SetupProcess" generatexmldocumentation="False" 
win32Icon="./" ctype="CSharpCompilerParameters" />
     </Configuration>

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

Reply via email to