Author: miguel
Date: 2006-03-20 15:02:04 -0500 (Mon, 20 Mar 2006)
New Revision: 58198

Modified:
   branches/mono-1-1-13/mcs/tools/prj2make/ChangeLog
   branches/mono-1-1-13/mcs/tools/prj2make/CsprojInfo.cs
Log:
2006-03-20  Miguel de Icaza  <[EMAIL PROTECTED]>

        * CsprojInfo.cs: Handle spaces and () in filenames



Modified: branches/mono-1-1-13/mcs/tools/prj2make/ChangeLog
===================================================================
--- branches/mono-1-1-13/mcs/tools/prj2make/ChangeLog   2006-03-20 20:01:37 UTC 
(rev 58197)
+++ branches/mono-1-1-13/mcs/tools/prj2make/ChangeLog   2006-03-20 20:02:04 UTC 
(rev 58198)
@@ -1,3 +1,7 @@
+2006-03-20  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * CsprojInfo.cs: Handle spaces and () in filenames
+
 2005-11-05  Kornél Pál  <[EMAIL PROTECTED]>
 
        * AssemblyInfo.cs: Use Consts.MonoVersion as AssemblyVersion.

Modified: branches/mono-1-1-13/mcs/tools/prj2make/CsprojInfo.cs
===================================================================
--- branches/mono-1-1-13/mcs/tools/prj2make/CsprojInfo.cs       2006-03-20 
20:01:37 UTC (rev 58197)
+++ branches/mono-1-1-13/mcs/tools/prj2make/CsprojInfo.cs       2006-03-20 
20:02:04 UTC (rev 58198)
@@ -68,6 +68,28 @@
                        return (prjObj);
                }
 
+               // Character to quote
+               
+               char [] quotable = new char [] { ' ', '(', ')' };
+
+               public string Quote (string s)
+               {
+                       if (s.IndexOfAny (quotable) == -1)
+                               return s;
+                       else {
+                               StringBuilder sb = new StringBuilder ();
+                               foreach (char c in s){
+                                       switch (c){
+                                       case ' ': case '(': case ')':
+                                               sb.Append ('\\');
+                                               break;
+                                       }
+                                       sb.Append (c);
+                               }
+                               return sb.ToString ();
+                       }
+               }
+               
                public CsprojInfo(bool isUnixMode, bool isMcsMode, string name, 
string guid, string csprojpath)
                {
                        this.name = name;
@@ -190,7 +212,7 @@
                                                path = path.Replace (@"\", "/");
                                                if (SlnMaker.slash != "/")
                                                        path = 
path.Replace("/", SlnMaker.slash);
-                                               resgen += String.Format ("{0} 
", path);
+                                               resgen += String.Format ("{0} 
", Quote (path));
                                                s = Path.ChangeExtension (s, 
".resources");
                                                relPath = Path.ChangeExtension 
(relPath, ".resources");
                                        }

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

Reply via email to