CLJCLR-196 Make compilation respect *compile-path*

Author: dmiller

Clojure/Clojure/CljCompiler/Context/GenContext.cs

@@ -9,9 +9,7 @@
  **/
 
 using clojure.lang.Runtime;
-using Microsoft.Scripting.Generation;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.SymbolStore;
 using System.Linq.Expressions;
@@ -197,10 +195,16 @@ private GenContext(AssemblyType assemblyType, string directory, AssemblyName ana
 
 #if NETFRAMEWORK
             if (_isDebuggable)
+            {
                 _docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid, ClojureContext.Default.VendorGuid, Guid.Empty);
+                //_assyGen.DocWriter = _docWriter;
+            }
 #elif NET9_0_OR_GREATER
             if (_isDebuggable && assemblyType == AssemblyType.External)
+            {
                 _docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid); 
+                _assyGen.SetDocWriter(_docWriter);
+            }
 #endif
         }
 
@@ -245,7 +249,7 @@ public GenContext WithTypeBuilder(TypeBuilder tb)
             return newContext;
         }
 
-#endregion
+        #endregion
 
         #region Other
 

Clojure/Clojure/CljCompiler/Context/MyAssemblyGen.cs

@@ -51,6 +51,7 @@ public sealed class MyAssemblyGen
 #if NET9_0_OR_GREATER
     MethodBuilder _entryPointMethodBuilder;     // non-null means we have an entry point
     ISymbolDocumentWriter _docWriter = null;    // non-null means we are writing debug info
+    public void SetDocWriter(ISymbolDocumentWriter dw) => _docWriter = dw;
 #endif
 
     internal AssemblyBuilder AssemblyBuilder => _myAssembly;
@@ -196,29 +197,31 @@ public string SaveAssembly()
         }
 
 #if NETFRAMEWORK
-        _myAssembly.Save(_outFileName, PortableExecutableKinds.ILOnly, ImageFileMachine.I386);
-        return Path.Combine(_outDir, _outFileName);
+        var savePath = Path.Combine(_outDir, _outFileName);
+        _myAssembly.Save(savePath, PortableExecutableKinds.ILOnly, ImageFileMachine.I386);
+        return savePath;
 #elif NET9_0_OR_GREATER
+        var savePath = Path.Combine(_outDir, _outFileName);
         if ( _entryPointMethodBuilder is not null || _docWriter is not null)
-            SavePersistedAssemblyHard();
+            SavePersistedAssemblyHard(savePath);
         else
-            ((PersistedAssemblyBuilder)_myAssembly).Save(_outFileName);
-        return Path.Combine(_outDir, _outFileName);
+            ((PersistedAssemblyBuilder)_myAssembly).Save(savePath);
+        return savePath;
 #else
         return null;
 #endif
 
     }
 
 #if NET9_0_OR_GREATER
-    private void SavePersistedAssemblyHard()
+    private void SavePersistedAssemblyHard(string savePath )
     {
         PersistedAssemblyBuilder ab = (PersistedAssemblyBuilder)_myAssembly;
         MetadataBuilder metadataBuilder = ab.GenerateMetadata(out BlobBuilder ilStream, out BlobBuilder fieldData, out MetadataBuilder pdbBuilder);
 
         MethodDefinitionHandle entryPointHandle = 
             _entryPointMethodBuilder is null 
-            ? default(MethodDefinitionHandle)
+            ? default
             : MetadataTokens.MethodDefinitionHandle(_entryPointMethodBuilder.MetadataToken);
         DebugDirectoryBuilder debugDirectoryBuilder = GeneratePdb(pdbBuilder, metadataBuilder.GetRowCounts(), entryPointHandle);
 
@@ -234,7 +237,7 @@ _entryPointMethodBuilder is null
         peBuilder.Serialize(peBlob);
 
         // Create the executable:
-        using FileStream fileStream = new(_outFileName, FileMode.Create, FileAccess.Write);
+        using FileStream fileStream = new(savePath, FileMode.Create, FileAccess.Write);
         peBlob.WriteContentTo(fileStream);
     }
 
@@ -244,13 +247,13 @@ static DebugDirectoryBuilder GeneratePdb(MetadataBuilder pdbBuilder, ImmutableAr
         PortablePdbBuilder portablePdbBuilder = new PortablePdbBuilder(pdbBuilder, rowCounts, entryPointHandle);
         BlobContentId pdbContentId = portablePdbBuilder.Serialize(portablePdbBlob);
         // In case saving PDB to a file
-        using FileStream fileStream = new FileStream("MyAssemblyEmbeddedSource.pdb", FileMode.Create, FileAccess.Write);
-        portablePdbBlob.WriteContentTo(fileStream);
+        //using FileStream fileStream = new FileStream("MyAssemblyEmbeddedSource.pdb", FileMode.Create, FileAccess.Write);
+        //portablePdbBlob.WriteContentTo(fileStream);
 
         DebugDirectoryBuilder debugDirectoryBuilder = new DebugDirectoryBuilder();
         debugDirectoryBuilder.AddCodeViewEntry("MyAssemblyEmbeddedSource.pdb", pdbContentId, portablePdbBuilder.FormatVersion);
         // In case embedded in PE:
-        // debugDirectoryBuilder.AddEmbeddedPortablePdbEntry(portablePdbBlob, portablePdbBuilder.FormatVersion);
+         debugDirectoryBuilder.AddEmbeddedPortablePdbEntry(portablePdbBlob, portablePdbBuilder.FormatVersion);
         return debugDirectoryBuilder;
     }
 #endif