Bugfix and some cleanup

MNGoldenEagle · Apr 24, 2019 · 4403f64 · 4403f64
1 parent 39958c6
commit 4403f64
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/Commands/Build.cs b/Commands/Build.cs
@@ -22,7 +22,7 @@ public Build()
 
             HasRequiredOption<string>("o|output=", "Specifies the name of the generated actor file", value => OutputFile = value);
 
-            HasOption<string>("t|target:", "Indicates which version of the ROM to link against.", value => {
+            HasOption<string>("t|target=", "Indicates which version of the ROM to link against.", value => {
                 var target = Target.PAL_MQ_DEBUG;
                 if (!Target.TryParse(value, out target))
                 {
@@ -67,6 +67,7 @@ public override int Run(string[] remainingArguments)
             if (resultCode != 0)
             {
                 Console.Error.WriteLine("Error occurred on Compile step.  Exiting...");
+                CleanupArtifacts();
                 return resultCode;
             }
 
@@ -76,9 +77,11 @@ public override int Run(string[] remainingArguments)
                 OutputFile = Path.GetTempFileName()
             };
             resultCode = assembleStep.Run(null);
+            CleanupCompilerArtifacts();
             if (resultCode != 0)
             {
                 Console.Error.WriteLine("Error occurred on Assemble step.  Exiting...");
+                CleanupArtifacts();
                 return resultCode;
             }
 
@@ -89,26 +92,58 @@ public override int Run(string[] remainingArguments)
                 LinkTarget = Target
             };
             resultCode = linkStep.Run(null);
+            CleanupAssemblerArtifacts();
             if (resultCode != 0)
             {
                 Console.Error.WriteLine("Error occurred on Link step.  Exiting...");
+                CleanupArtifacts();
                 return resultCode;
             }
 
             Overlay overlayStep = new Overlay
             {
                 InputFiles = new string[] { Pipeline.LinkedArtifact },
                 OverlayPath = OutputFile,
-                ShowInitAddress = true
+                ShowInitAddress = true,
+                InitializationVariable = "INIT"
             };
             resultCode = overlayStep.Run(null);
+            CleanupLinkerArtifacts();
             if (resultCode != 0)
             {
                 Console.Error.WriteLine("Error occurred on Overlay step.  Exiting...");
+                CleanupArtifacts();
                 return resultCode;
             }
 
             return 0;
         }
+
+        private void CleanupArtifacts()
+        {
+            CleanupCompilerArtifacts();
+            CleanupAssemblerArtifacts();
+            CleanupLinkerArtifacts();
+        }
+
+        private void CleanupCompilerArtifacts()
+        {
+            foreach (string path in Pipeline.CompiledArtifacts)
+            {
+                File.Delete(path);
+            }
+        }
+
+        private void CleanupAssemblerArtifacts()
+        {
+            if (Pipeline.AssembledArtifact == null) { return; }
+            File.Delete(Pipeline.AssembledArtifact);
+        }
+
+        private void CleanupLinkerArtifacts()
+        {
+            if (Pipeline.LinkedArtifact == null) { return; }
+            File.Delete(Pipeline.LinkedArtifact);
+        }
     }
 }
diff --git a/CoreToolchain/CoreToolchain.csproj b/CoreToolchain/CoreToolchain.csproj
@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="ELFSharp" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Packaging.Tools.Trimming" Version="1.1.0-preview1-26619-01" />
     <PackageReference Include="Mono.Options" Version="5.3.0.1" />
   </ItemGroup>