* gacutil.cs: Allow a prefix to be specified. This is only for

	packaging if you install to some wack prefix it wont work.

svn path=/trunk/mcs/; revision=26369

diff --git a/mcs/tools/gacutil/ChangeLog b/mcs/tools/gacutil/ChangeLog
index 59f9d0017c97cc4eebd2ecf5f1eb794c788d2a10..425ee2b84483d947e51b274feea1814eee148338 100644 (file)
--- a/mcs/tools/gacutil/ChangeLog
+++ b/mcs/tools/gacutil/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-29  Jackson Harper  <jackson@ximian.com>
+
+       * gacutil.cs: Allow a prefix to be specified. This is only for
+       packaging if you install to some wack prefix it wont work.
+       
 2004-04-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * gacutil.cs: return non-zero when something fails.

diff --git a/mcs/tools/gacutil/gacutil.cs b/mcs/tools/gacutil/gacutil.cs
index d9023725da807aabe23ffc3324b87ab3602219e4..0e8fb84c525785ea7b04579935d9261449ff7c56 100644 (file)
--- a/mcs/tools/gacutil/gacutil.cs
+++ b/mcs/tools/gacutil/gacutil.cs
@@ -262,16 +262,17 @@ namespace Mono.Tools
 
                        bool force = false;
 
-                       if(args.Length == 2 && (args[1] == "/f" || args[1] == "--force"))
+                       if(args.Length >= 2 && (args[1] == "/f" || args[1] == "--force"))
                                force = true;
-
+                        if (args.Length == 4 && (args [2] == "/prefix"))
+                                gac_path = args [3];
                
                        string version_token = an.Version + "_" +
                                an.CultureInfo.Name.ToLower () +
                                "_" + GetStringToken (an.GetPublicKeyToken ());
-
+                        
                        string fullPath = String.Format ("{0}{3}{1}{3}{2}{3}", gac_path, an.Name, version_token, Path.DirectorySeparatorChar);
-
+                        Console.WriteLine ("installing to fullpath:  " + fullPath);
                        if (File.Exists (fullPath + an.Name + ".dll") && force == false) {
                                Hashtable assemInfo = GetAssemblyInfo (fullPath + "__AssemblyInfo__");
                                assemInfo["RefCount"] = ((int) Convert.ToInt32 (assemInfo["RefCount"]) + 1).ToString ();