From 6b870efa2d6b52f7c85a8f2918fe7b79e79d5aeb Mon Sep 17 00:00:00 2001 From: Phil Garcia Date: Sat, 22 Jun 2019 12:20:29 -0700 Subject: [PATCH] - Updated Visual Studio Project (#640) --- Compile.bat | 2 + Source/Inno-Setup-Script/Mosa-Installer.iss | 2 +- Source/Mosa.ClassLib/Mosa.ClassLib.nuspec | 7 +-- .../Mosa.ClassLib/Properties/AssemblyInfo.cs | 2 +- Source/Mosa.Kernel.x86/Debugger.cs | 43 ++++--------------- Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj | 4 -- Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec | 14 +++--- Source/Mosa.Korlib/Mosa.Korlib.nuspec | 5 ++- .../Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec | 11 ++--- .../Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec | 9 ++-- Source/Mosa.Runtime/Mosa.Runtime.nuspec | 9 ++-- .../Properties/AssemblyInfo.cs | 2 +- .../Mosa.Tools.Package.nuspec | 7 ++- .../MOSA Project/Boot.cs | 40 ++++++++--------- .../MOSA Project/Mosa.Starter.x86.csproj | 11 +++++ .../MOSA Project/packages.config | 11 +++-- Source/Scripts/install-vs-template.bat | 6 +-- appveyor.yml | 5 ++- 18 files changed, 91 insertions(+), 99 deletions(-) diff --git a/Compile.bat b/Compile.bat index eed167de4a..23b0f31205 100644 --- a/Compile.bat +++ b/Compile.bat @@ -1,2 +1,4 @@ cd Source CALL Compile-Debug.bat +cd Inno-Setup-Script +CALL Create-Installer.bat diff --git a/Source/Inno-Setup-Script/Mosa-Installer.iss b/Source/Inno-Setup-Script/Mosa-Installer.iss index 05df15c3ee..637671786c 100644 --- a/Source/Inno-Setup-Script/Mosa-Installer.iss +++ b/Source/Inno-Setup-Script/Mosa-Installer.iss @@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName} DisableDirPage=yes DisableReadyPage=yes DefaultGroupName={#MyAppName} -OutputDir=..\..\bin\MOSA Installer +OutputDir=..\..\bin OutputBaseFilename=MOSA-Installer SolidCompression=yes MinVersion=0,6.0 diff --git a/Source/Mosa.ClassLib/Mosa.ClassLib.nuspec b/Source/Mosa.ClassLib/Mosa.ClassLib.nuspec index d6a289d8db..ef9cd107c9 100644 --- a/Source/Mosa.ClassLib/Mosa.ClassLib.nuspec +++ b/Source/Mosa.ClassLib/Mosa.ClassLib.nuspec @@ -2,7 +2,7 @@ Mosa.ClassLib - 1.0.0.1 + 1.0.0.5 Mosa.ClassLib Library MOSA Project MOSA Project @@ -10,9 +10,10 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false - MOSA common libraries + MOSA Common Library + MOSA Common Library - Copyright © 2017 + Copyright © 2019 MOSA Compiler diff --git a/Source/Mosa.ClassLib/Properties/AssemblyInfo.cs b/Source/Mosa.ClassLib/Properties/AssemblyInfo.cs index a15ec8d2b9..00558fdd1a 100644 --- a/Source/Mosa.ClassLib/Properties/AssemblyInfo.cs +++ b/Source/Mosa.ClassLib/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Mosa.ClassLib")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Source/Mosa.Kernel.x86/Debugger.cs b/Source/Mosa.Kernel.x86/Debugger.cs index 7d71720054..8f961ea799 100644 --- a/Source/Mosa.Kernel.x86/Debugger.cs +++ b/Source/Mosa.Kernel.x86/Debugger.cs @@ -1,6 +1,5 @@ // Copyright (c) MOSA Project. Licensed under the New BSD License. -using Mosa.ClassLib; using Mosa.Runtime; using Mosa.Runtime.x86; using System; @@ -315,7 +314,6 @@ private static void ProcessCommand() case DebugCode.ClearMemory: ClearMemory(); return; case DebugCode.HardJump: HardJump(); return; case DebugCode.ExecuteUnitTest: QueueUnitTest(); return; - case DebugCode.GetMemoryCRC: GetMemoryCRC(); return; default: return; } } @@ -399,11 +397,10 @@ private static void CompressedWriteMemory() uint address = GetDataUInt32(0); uint length = GetDataUInt32(4); uint size = GetDataUInt32(8); - uint uncompresscrc = GetDataUInt32(12); - LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size); + //uint uncompresscrc = GetDataUInt32(12); - uint computedcrc = ComputeMemoryCRC(address, size); + LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size); Screen.Goto(15, 0); Screen.ClearRow(); @@ -419,12 +416,13 @@ private static void CompressedWriteMemory() Screen.Write(" Size: "); Screen.Write(size, 10, 5); Screen.Write(" CRC: "); - Screen.Write(uncompresscrc, 16, 8); - if (uncompresscrc == computedcrc) - Screen.Write(" OK"); - else - Screen.Write(" BAD"); + //Screen.Write(uncompresscrc, 16, 8); + + //if (uncompresscrc == computedcrc) + // Screen.Write(" OK"); + //else + // Screen.Write(" BAD"); SendResponse(id, DebugCode.CompressedWriteMemory); } @@ -454,31 +452,6 @@ private static void ClearMemory() SendResponse(id, DebugCode.ClearMemory); } - private static void GetMemoryCRC() - { - uint id = GetID(); - uint start = GetDataUInt32(0); - uint length = GetDataUInt32(4); - - uint crc = ComputeMemoryCRC(start, length); - - SendResponseStart(id, DebugCode.GetMemoryCRC, 4); - SendInteger(crc); - } - - private static uint ComputeMemoryCRC(uint start, uint length) - { - uint crc = CRC.InitialCRC; - - for (uint i = 0; i < length; i++) - { - byte b = Intrinsic.Load8(new IntPtr(start), i); - crc = CRC.Update(crc, b); - } - - return crc; - } - private static void QueueUnitTest() { uint id = GetID(); diff --git a/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj b/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj index 99f8ee7b6c..0ed0c819a1 100644 --- a/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj +++ b/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj @@ -105,10 +105,6 @@ - - {27a3c89c-1967-45ff-a77e-94f44995c42c} - Mosa.ClassLib - {631bc4f3-e2d8-4319-814c-13904caa17ce} Mosa.Korlib diff --git a/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec b/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec index ed31c4605b..8ec0e0e133 100644 --- a/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec +++ b/Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec @@ -2,7 +2,7 @@ Mosa.Kernel.x86 - 1.0.0.1 + 1.0.0.5 Mosa.Kernel.x86 Library MOSA Project MOSA Project @@ -10,15 +10,15 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false - MOSA kernel for x86 + MOSA Kernel for x86 + MOSA Kernel for x86 - Copyright © 2017 + Copyright © 2019 MOSA Compiler - - - - + + + diff --git a/Source/Mosa.Korlib/Mosa.Korlib.nuspec b/Source/Mosa.Korlib/Mosa.Korlib.nuspec index ded4826cb0..a162a9cdf4 100644 --- a/Source/Mosa.Korlib/Mosa.Korlib.nuspec +++ b/Source/Mosa.Korlib/Mosa.Korlib.nuspec @@ -2,7 +2,7 @@ Mosa.Korlib - 1.0.0.1 + 1.0.0.5 Mosa.Korlib Library MOSA Project MOSA Project @@ -10,9 +10,10 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false + MOSA Corlib MOSA implementation of corlib - Copyright © 2017 + Copyright © 2019 MOSA Compiler corlib diff --git a/Source/Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec b/Source/Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec index e56462069e..a416ab74ca 100644 --- a/Source/Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec +++ b/Source/Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec @@ -2,7 +2,7 @@ Mosa.Runtime.x86 - 1.0.0.1 + 1.0.0.5 Mosa.Runtime.x64 Library MOSA Project MOSA Project @@ -10,13 +10,14 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false - MOSA runtime libraries for x64 platform + MOSA x64 Runtime Library + MOSA Runtime Libraries x64 Platform - Copyright © 2017 + Copyright © 2019 MOSA Compiler - - + + diff --git a/Source/Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec b/Source/Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec index 1173e97957..2d8d2a7cea 100644 --- a/Source/Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec +++ b/Source/Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec @@ -2,7 +2,7 @@ Mosa.Runtime.x86 - 1.0.0.1 + 1.0.0.5 Mosa.Runtime.x86 Library MOSA Project MOSA Project @@ -10,13 +10,14 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false + MOSA x86 Runtime Library MOSA runtime libraries for x86 platform - Copyright © 2017 + Copyright © 2019 MOSA Compiler - - + + diff --git a/Source/Mosa.Runtime/Mosa.Runtime.nuspec b/Source/Mosa.Runtime/Mosa.Runtime.nuspec index 56a16f4d15..e053b26012 100644 --- a/Source/Mosa.Runtime/Mosa.Runtime.nuspec +++ b/Source/Mosa.Runtime/Mosa.Runtime.nuspec @@ -2,7 +2,7 @@ Mosa.Runtime - 1.0.0.1 + 1.0.0.5 Mosa.Runtime Library MOSA Project MOSA Project @@ -10,12 +10,13 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false - MOSA runtime libraries + MOSA Runtime Library + MOSA Runtime Library - Copyright © 2017 + Copyright © 2019 MOSA Compiler - + diff --git a/Source/Mosa.Tool.Explorer/Properties/AssemblyInfo.cs b/Source/Mosa.Tool.Explorer/Properties/AssemblyInfo.cs index 762df47e02..9dd4135dea 100644 --- a/Source/Mosa.Tool.Explorer/Properties/AssemblyInfo.cs +++ b/Source/Mosa.Tool.Explorer/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("MOSA Project")] [assembly: AssemblyProduct("Mosa.Tool.Explorer")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Source/Mosa.Tools.Package/Mosa.Tools.Package.nuspec b/Source/Mosa.Tools.Package/Mosa.Tools.Package.nuspec index dff4340489..088a1722f5 100644 --- a/Source/Mosa.Tools.Package/Mosa.Tools.Package.nuspec +++ b/Source/Mosa.Tools.Package/Mosa.Tools.Package.nuspec @@ -2,7 +2,7 @@ Mosa.Tools.Package - $version$ + 1.0.0.5 Mosa.Tools.Package MOSA Project MOSA Project @@ -10,6 +10,7 @@ http://www.mosa-project.org https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png false + MOSA Tools Package MOSA Tools Package Copyright © 2019 @@ -23,6 +24,7 @@ + @@ -40,11 +42,12 @@ + + - diff --git a/Source/Mosa.VisualStudio.Template/MOSA Project/Boot.cs b/Source/Mosa.VisualStudio.Template/MOSA Project/Boot.cs index 9ad2f1f124..0d10bef5b6 100644 --- a/Source/Mosa.VisualStudio.Template/MOSA Project/Boot.cs +++ b/Source/Mosa.VisualStudio.Template/MOSA Project/Boot.cs @@ -4,29 +4,29 @@ namespace Mosa.Starter.x86 { - public static class Boot - { - public static void Main() - { - Mosa.Kernel.x86.Kernel.Setup(); + public static class Boot + { + public static void Main() + { + Mosa.Kernel.x86.Kernel.Setup(); - IDT.SetInterruptHandler(ProcessInterrupt); + IDT.SetInterruptHandler(ProcessInterrupt); - Screen.Clear(); - Screen.Goto(0, 0); - Screen.Color = Color.White; + Screen.Clear(); + Screen.Goto(0, 0); + Screen.Color = ScreenColor.White; - Program.Setup(); + Program.Setup(); - while (true) - { - Program.Loop(); - } - } + while (true) + { + Program.Loop(); + } + } - public static void ProcessInterrupt(uint interrupt, uint errorCode) - { - Program.OnInterrupt(); - } - } + public static void ProcessInterrupt(uint interrupt, uint errorCode) + { + Program.OnInterrupt(); + } + } } diff --git a/Source/Mosa.VisualStudio.Template/MOSA Project/Mosa.Starter.x86.csproj b/Source/Mosa.VisualStudio.Template/MOSA Project/Mosa.Starter.x86.csproj index ea21745fb6..22dcfef540 100644 --- a/Source/Mosa.VisualStudio.Template/MOSA Project/Mosa.Starter.x86.csproj +++ b/Source/Mosa.VisualStudio.Template/MOSA Project/Mosa.Starter.x86.csproj @@ -85,6 +85,17 @@ True + ..\packages\Mosa.Runtime.x86.1.0.0.0\lib\Mosa.Runtime.x86.dll + + ..\packages\Mosa.Kernel.x86.1.0.0.5\lib\net472\Mosa.Kernel.x86.dll + True + + + ..\packages\Mosa.Runtime.1.0.0.5\lib\net472\Mosa.Runtime.dll + True + + + ..\packages\Mosa.Runtime.x86.1.0.0.5\lib\net472\Mosa.Runtime.x86.dll ..\packages\Mosa.Runtime.x86.1.0.0.1\lib\net472\Mosa.Runtime.x86.dll True diff --git a/Source/Mosa.VisualStudio.Template/MOSA Project/packages.config b/Source/Mosa.VisualStudio.Template/MOSA Project/packages.config index f6198110c7..6790f4c968 100644 --- a/Source/Mosa.VisualStudio.Template/MOSA Project/packages.config +++ b/Source/Mosa.VisualStudio.Template/MOSA Project/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + diff --git a/Source/Scripts/install-vs-template.bat b/Source/Scripts/install-vs-template.bat index 2cc91593bf..22fb94d00e 100644 --- a/Source/Scripts/install-vs-template.bat +++ b/Source/Scripts/install-vs-template.bat @@ -1,5 +1,5 @@ -rem %USERPROFILE%\Documents\Visual Studio 2017\Templates\ProjectTemplates\MOSA Project - mkdir "%USERPROFILE%\Documents\Visual Studio 2017\Templates\ProjectTemplates\MOSA Project" -xcopy /E /C /Y /Q "..\..\bin\MOSA Project" "%USERPROFILE%\Documents\Visual Studio 2017\Templates\ProjectTemplates\MOSA Project" +mkdir "%USERPROFILE%\Documents\Visual Studio 2019\Templates\ProjectTemplates\MOSA Project" +xcopy /E /C /Y /Q "..\..\bin\MOSA Project" "%USERPROFILE%\Documents\Visual Studio 2017\Templates\ProjectTemplates\MOSA Project" +xcopy /E /C /Y /Q "..\..\bin\MOSA Project" "%USERPROFILE%\Documents\Visual Studio 2019\Templates\ProjectTemplates\MOSA Project" diff --git a/appveyor.yml b/appveyor.yml index 0dfcd27170..31927a51a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,9 @@ shallow_clone: true build: off +environment: + nuget: + secure: aTaYVizieVZLoxu3Cys6R6lAk3OvG5vtLp3ly4MBz6kwEr9I6HJfhFPNjeLpEa+Y for: # Windows Build - Visual Studio 2017: @@ -77,7 +80,7 @@ for: publish_nuget: true after_build: - - cmd: ISCC.exe Source/Inno-Setup-Script/Mosa-Installer.iss +# - cmd: ISCC.exe Source/Inno-Setup-Script/Mosa-Installer.iss - ps: ./mosactl.ps1 unittest # - ps: ./mosactl.ps1 test