[svn] r7266: nemerle/trunk/ncc/generation/HierarchyEmitter.n

nazgul svnadmin at nemerle.org
Sun Jan 14 00:27:13 CET 2007


Log:
Fix names of resources

Author: nazgul
Date: Sun Jan 14 00:27:08 2007
New Revision: 7266

Modified:
   nemerle/trunk/ncc/generation/HierarchyEmitter.n

Modified: nemerle/trunk/ncc/generation/HierarchyEmitter.n
==============================================================================
--- nemerle/trunk/ncc/generation/HierarchyEmitter.n	(original)
+++ nemerle/trunk/ncc/generation/HierarchyEmitter.n	Sun Jan 14 00:27:08 2007
@@ -125,17 +125,8 @@
         if (cp != -1)
           (x.Substring (0, cp), x.Substring (cp + 1))
         else
-          // change name from /bar/bar/file to bar.bar.file namespace  
-          (x, x.Replace ('/','.').Replace ('\\', '.'));
-      }
-
-      def escape_linked_resource (x : string) {
-        def cp = x.IndexOf (',');
-        if (cp != -1)
-          // change name from /bar/bar/file to bar.bar.file namespace          
-          (x.Substring (0, cp), x.Substring (cp + 1))
-        else
-          (x, x);
+          // change name from /bar/bar/file.png to file.png namespace  
+          (x, Path.GetFileName (x));
       }
 
       /* we can embed resources only on mono or .NET 2.0 */
@@ -183,7 +174,7 @@
       }
 
       foreach (element in Manager.Options.LinkedResources) {
-        def (file, name) = escape_linked_resource (element);
+        def (file, name) = escape_resource (element);
         try {
           _assembly_builder.AddResourceFile (name, file);
         }



More information about the svn mailing list