[svn] r6204: nemerle/trunk: ncc/external/LibrariesLoader.n ncc/main.n tools/msbuild-task/MSBuildTask.n

[nazgul]

Log:
Use code proposed by Vlad to read assembly system path

Author: nazgul
Date: Thu Apr 27 20:21:10 2006
New Revision: 6204

Modified:
   nemerle/trunk/ncc/external/LibrariesLoader.n
   nemerle/trunk/ncc/main.n
   nemerle/trunk/tools/msbuild-task/MSBuildTask.n

Modified: nemerle/trunk/ncc/external/LibrariesLoader.n
==============================================================================
--- nemerle/trunk/ncc/external/LibrariesLoader.n	(original)
+++ nemerle/trunk/ncc/external/LibrariesLoader.n	Thu Apr 27 20:21:10 2006
@@ -60,7 +60,7 @@
      */
     this () {
       def assembly_dir (t) {
-        DirectoryOfCodebase (t.Assembly.Location);
+        DirectoryOfCodebase (System.Uri(t.Assembly.CodeBase).LocalPath);
       };
       
       // include current directory and directories where 

Modified: nemerle/trunk/ncc/main.n
==============================================================================
--- nemerle/trunk/ncc/main.n	(original)
+++ nemerle/trunk/ncc/main.n	Thu Apr 27 20:21:10 2006
@@ -74,7 +74,7 @@
     main_with_catching () : void
     {
       try {
-        def this_dir = typeof (MainClass).Assembly.Location;
+        def this_dir = System.Uri (typeof (MainClass).Assembly.CodeBase).LocalPath;
         LibraryReferenceManager.AddSearchDirectory
           (LibraryReferenceManager.DirectoryOfCodebase (this_dir));
         

Modified: nemerle/trunk/tools/msbuild-task/MSBuildTask.n
==============================================================================
--- nemerle/trunk/tools/msbuild-task/MSBuildTask.n	(original)
+++ nemerle/trunk/tools/msbuild-task/MSBuildTask.n	Thu Apr 27 20:21:10 2006
@@ -49,7 +49,7 @@
     }
     
     protected override GenerateFullPathToTool () : string {
-      def my_file = typeof(Ncc).Assembly.Location;
+      def my_file = Uri(typeof(Ncc).Assembly.CodeBase).LocalPath;
       def ncc_file = Path.Combine (Path.GetDirectoryName(my_file), ToolName);
       ncc_file
     }