Remove old dependancies

.github/workflows/pr.yml

@@ -75,8 +75,6 @@ jobs:
 
       - name: Copy Output - Cosmos
         run: |
-          xcopy /Y "Cosmos\source\Cosmos.Build.Tasks\tools\grub2\boot\grub\i386-pc\*.*" "$($env:USER_KIT_PATH)Build\ISO\boot\grub\i386-pc\"
-          xcopy /Y "Cosmos\Build\grub2\boot\grub\grub.cfg" "$($env:USER_KIT_PATH)Build\ISO\boot\grub"
           xcopy /Y /S "Cosmos\Build\VMware\*" "$($env:USER_KIT_PATH)Build\VMware\"
           xcopy /Y /S "Cosmos\Build\Tools" "$($env:USER_KIT_PATH)Build\Tools\"
           xcopy /Y /S "Cosmos\Resources\Bochs\*.*" "%ProgramFiles(x86)%\Bochs-2.6.8\"
@@ -87,6 +85,7 @@ jobs:
 
       - name: Test - Cosmos
         run: |
+          md "$($env:USER_KIT_PATH)Build\ISO\boot\"
           dotnet test Cosmos\Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj --logger "trx;LogFileName=$($env:USER_KIT_PATH)TestResult.xml"
 
       - name: Upload Test Logs

Build.sln

@@ -85,7 +85,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.TestContr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3C4B0261-3B1D-4503-97F1-AC0252D500E6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YASM", "Tools\YASM\YASM.csproj", "{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spruce", "..\XSharp\source\Spruce\Spruce.csproj", "{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}"
 EndProject

Docs/articles/Directories.md

@@ -48,7 +48,7 @@ This directory contains the Cosmos assembler, the thing that writes generated as
 
 This directory contains code related to the building process of Cosmos with the exception of
 IL2CPU which is however executed from here, it's contains code for executing ld,
-nasm, makeiso, MSBuild, and others.
+yasm, makeiso, MSBuild, and others.
 
 #### \Source\Cosmos.Common
 

Setup/Cosmos.iss

@@ -86,7 +86,6 @@ Type: filesandordirs; Name: "{app}"
 Source: ".\Build\Tools\*.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\Tools\Yasm\*.exe"; DestDir: "{app}\Build\Tools\Yasm"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\Tools\Cygwin\*"; DestDir: "{app}\Build\Tools\cygwin"; Flags: ignoreversion uninsremovereadonly overwritereadonly
-Source: ".\Build\Tools\mkisofs\*"; DestDir: "{app}\Build\Tools\mkisofs"; Flags: ignoreversion uninsremovereadonly overwritereadonly
 Source: ".\Build\VSIP\IL2CPU\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly recursesubdirs
 ;Source: ".\Build\VSIP\XSharp\*"; DestDir: "{app}\Build\XSharp"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.Deploy.USB.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly

Test.sln

@@ -60,7 +60,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{170A7D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{65532163-618F-41F2-B39C-6F6022483158}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YASM", "Tools\YASM\YASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}"
 EndProject

Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs

@@ -262,19 +262,19 @@ private void RunIL2CPU(string kernelFileName, string outputFile)
             }
         }
 
-        private void RunNasm(string inputFile, string outputFile, bool isElf)
+        private void RunYasm(string inputFile, string outputFile, bool isElf)
         {
             bool xUsingUserkit = false;
-            //Path to nasm starter
-            string xNasmPath = Path.Combine(FindCosmosRoot(), "Tools", "Nasm");
-            if (!Directory.Exists(xNasmPath))
+            //Path to yasm starter
+            string xYasmPath = Path.Combine(FindCosmosRoot(), "Tools", "Yasm");
+            if (!Directory.Exists(xYasmPath))
             {
                 xUsingUserkit = true;
-                xNasmPath = Path.Combine(GetCosmosUserkitFolder(), "Build", "Nasm");
+                xYasmPath = Path.Combine(GetCosmosUserkitFolder(), "Build", "Yasm");
             }
-            if (!Directory.Exists(xNasmPath))
+            if (!Directory.Exists(xYasmPath))
             {
-                throw new DirectoryNotFoundException("NASM path not found.");
+                throw new DirectoryNotFoundException("YASM path not found.");
             }
 
             var xArgs = new List<string>
@@ -287,13 +287,13 @@ private void RunNasm(string inputFile, string outputFile, bool isElf)
 
             if (xUsingUserkit)
             {
-                RunProcess("NASM.exe", xNasmPath, xArgs);
+                RunProcess("YASM.exe", xYasmPath, xArgs);
             }
             else
             {
                 xArgs.Insert(0, "run");
                 xArgs.Insert(1, " -- ");
-                RunProcess("dotnet", xNasmPath, xArgs);
+                RunProcess("dotnet", xYasmPath, xArgs);
             }
         }
 

Tests/Cosmos.TestRunner.Core/Engine.Run.cs

@@ -23,8 +23,10 @@ private bool ExecuteKernel(
             {
                 RunTask("TheRingMaster", () => RunTheRingMaster(assemblyFileName));
             }
+
             RunTask("IL2CPU", () => RunIL2CPU(assemblyFileName, xAssemblyFile));
-            RunTask("Nasm", () => RunNasm(xAssemblyFile, xObjectFile, configuration.IsELF));
+            RunTask("Yasm", () => RunYasm(xAssemblyFile, xObjectFile, configuration.IsELF));
+
             if (configuration.IsELF)
             {
                 File.Move(xObjectFile, xTempObjectFile);
@@ -33,7 +35,8 @@ private bool ExecuteKernel(
                 RunTask("ExtractMapFromElfFile", () => RunExtractMapFromElfFile(workingDirectory, xObjectFile));
             }
 
-            string xHarddiskPath;
+            string xHarddiskPath = string.Empty;
+
             if (configuration.RunTarget == RunTargetEnum.HyperV)
             {
                 xHarddiskPath = Path.Combine(workingDirectory, "Harddisk.vhdx");

Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj

@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\TheRingMaster\TheRingMaster.csproj" ReferenceOutputAssembly="False" />
-        <ProjectReference Include="..\..\Tools\NASM\NASM.csproj" ReferenceOutputAssembly="False" />
+        <ProjectReference Include="..\..\Tools\YASM\YASM.csproj" ReferenceOutputAssembly="False" />
         <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj" />
         <ProjectReference Include="$(IL2CPURepoRoot)source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
         <ProjectReference Include="$(IL2CPURepoRoot)source\IL2CPU\IL2CPU.csproj" ReferenceOutputAssembly="False" />

Tools/NASM/Program.cs → Tools/YASM/Program.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace NASM
+namespace YASM
 {
     public class Program
     {

appveyor.yml

@@ -26,8 +26,6 @@ build_script:
 
     dotnet publish ..\IL2CPU\source\IL2CPU -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
 
-    xcopy /Y "source\Cosmos.Build.Tasks\tools\grub2\boot\grub\i386-pc\*.*" "c:\CosmosRun\Build\ISO\boot\grub\i386-pc\"
-    xcopy /Y "Build\grub2\boot\grub\grub.cfg" "c:\CosmosRun\Build\ISO\boot\grub"
     xcopy /Y /S "Build\VMware\*" "c:\CosmosRun\Build\VMware\"
     xcopy /Y /S "Build\Tools" "c:\CosmosRun\Build\Tools\"
     xcopy /Y "..\IL2CPU\source\Cosmos.Core.DebugStub\*.xs" "c:\CosmosRun\XSharp\DebugStub\"

source/Cosmos.Build.Tasks/ReadNasmMapToDebugInfo.cs → source/Cosmos.Build.Tasks/ReadYasmMapToDebugInfo.cs

@@ -10,7 +10,7 @@
 
 namespace Cosmos.Build.Tasks
 {
-    public class ReadNasmMapToDebugInfo : Task
+    public class ReadYasmMapToDebugInfo : Task
     {
         [Required]
         public string MapFile { get; set; }
@@ -50,7 +50,7 @@ public override bool Execute()
             finally
             {
                 xSW.Stop();
-                Log.LogMessage(MessageImportance.High, "ReadNasmMapToDebugInfo task took {0}", xSW.Elapsed);
+                Log.LogMessage(MessageImportance.High, "ReadYasmMapToDebugInfo task took {0}", xSW.Elapsed);
             }
         }
 
@@ -60,6 +60,7 @@ private static List<Label> ParseMapFile(string aMapFile)
             var xSource = new List<Label>();
             uint xIndex = 0;
             DebugInfo.SetRange(DebugInfo.NAsmMapExtractionRange);
+
             for (xIndex = 0; xIndex < xSourceStrings.Length; xIndex++)
             {
                 if (xSourceStrings[xIndex].StartsWith("Real "))

source/Cosmos.Build.Tasks/Nasm.cs → source/Cosmos.Build.Tasks/Yasm.cs

@@ -7,7 +7,7 @@
 
 namespace Cosmos.Build.Tasks
 {
-    public class Nasm : ToolTask
+    public class Yasm : ToolTask
     {
         enum OutputFormatEnum
         {