[svn] r7107: nemerle/trunk: misc/packages/msi/msi.build ncc/external/LibrariesLoader.n ncc/passes.n

[nazgul]

Log:
Make it possible to load nemerle macros with strong assembly name

Author: nazgul
Date: Sun Dec 17 12:24:07 2006
New Revision: 7107

Modified:
   nemerle/trunk/misc/packages/msi/msi.build
   nemerle/trunk/ncc/external/LibrariesLoader.n
   nemerle/trunk/ncc/passes.n

Modified: nemerle/trunk/misc/packages/msi/msi.build
==============================================================================
--- nemerle/trunk/misc/packages/msi/msi.build	(original)
+++ nemerle/trunk/misc/packages/msi/msi.build	Sun Dec 17 12:24:07 2006
@@ -58,7 +58,7 @@
                     <key file="ncc.exe" />
                     <fileset basedir="${source.dir}/bin">
                         <include name="*.exe" />
-                        <include name="Nemerle.Macros.dll" />
+<!--                        <include name="Nemerle.Macros.dll" />  -->
                         <include name="Nemerle.NAnt.Tasks.dll" />
                         <include name="Nemerle.MSBuild.Tasks.dll" />                        
                         <include name="Nemerle.MSBuild.targets" />
@@ -69,7 +69,7 @@
                     <key file="Nemerle.dll" />
                     <fileset basedir="${source.dir}/bin">
                         <include name="*.dll" />
-                        <exclude name="Nemerle.Macros.dll" />
+<!--                        <exclude name="Nemerle.Macros.dll" />  -->
                         <exclude name="Nemerle.NAnt.Tasks.dll" />
                         <exclude name="Nemerle.MSBuild.Tasks.dll" />
                     </fileset>

Modified: nemerle/trunk/ncc/external/LibrariesLoader.n
==============================================================================
--- nemerle/trunk/ncc/external/LibrariesLoader.n	(original)
+++ nemerle/trunk/ncc/external/LibrariesLoader.n	Sun Dec 17 12:24:07 2006
@@ -319,12 +319,8 @@
     {
       mutable assembly = LookupAssembly (name);
       
-      // If assembly not loaded try load it by partial name (may be it in GAC).
-      // It's a hack!!! LoadWithPartialName is obsolete!
-#pragma warning disable 618      
-      when (assembly == null)
-        assembly = SR.Assembly.LoadWithPartialName (if (strongPart == null) name else name + strongPart);
-#pragma warning restore 618      
+      when (assembly == null && strongPart != null)
+        assembly = SR.Assembly.Load (name + strongPart);
       if (assembly == null)
         Message.Error ("cannot load assembly with macros `" + name + "'")
       else

Modified: nemerle/trunk/ncc/passes.n
==============================================================================
--- nemerle/trunk/ncc/passes.n	(original)
+++ nemerle/trunk/ncc/passes.n	Sun Dec 17 12:24:07 2006
@@ -359,7 +359,7 @@
         LibrariesManager.LoadExtensions ();
 
         unless (Options.DoNotLoadMacros)
-          LibrariesManager.LoadMacrosFrom ("Nemerle.Macros");
+          LoadNemerleMacros ();
           
         CoreEnv = GlobalEnv.CreateCore (NameTree);                    
       }
@@ -367,6 +367,13 @@
         LibrariesManager.RemoveInternalExtensionMethods();
     }
 
+    protected virtual LoadNemerleMacros () : void {
+      // release mode
+      //LibrariesManager.LoadMacrosFrom ("Nemerle.Macros", ", Version=0.9.4.0, Culture=neutral, PublicKeyToken=5291d186334f6101");
+      
+      // dev mode
+      LibrariesManager.LoadMacrosFrom ("Nemerle.Macros");
+    }
     
     /** 
      * Run passes of the compiler.