Skip to content

Commit 6b870ef

Browse files
tgiphiltgiphil
authored
- Updated Visual Studio Project (#640)
1 parent 474997e commit 6b870ef

File tree

18 files changed

+91
-99
lines changed

18 files changed

+91
-99
lines changed

‎Compile.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
cd Source
22
CALL Compile-Debug.bat
3+
cd Inno-Setup-Script
4+
CALL Create-Installer.bat

‎Source/Inno-Setup-Script/Mosa-Installer.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName}
2222
DisableDirPage=yes
2323
DisableReadyPage=yes
2424
DefaultGroupName={#MyAppName}
25-
OutputDir=..\..\bin\MOSA Installer
25+
OutputDir=..\..\bin
2626
OutputBaseFilename=MOSA-Installer
2727
SolidCompression=yes
2828
MinVersion=0,6.0

‎Source/Mosa.ClassLib/Mosa.ClassLib.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<package >
33
<metadata>
44
<id>Mosa.ClassLib</id>
5-
<version>1.0.0.1</version>
5+
<version>1.0.0.5</version>
66
<title>Mosa.ClassLib Library</title>
77
<authors>MOSA Project</authors>
88
<owners>MOSA Project</owners>
99
<license type="expression">BSD-3-Clause-Clear</license>
1010
<projectUrl>http://www.mosa-project.org</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>MOSA common libraries</description>
13+
<summary>MOSA Common Library</summary>
14+
<description>MOSA Common Library</description>
1415
<releaseNotes></releaseNotes>
15-
<copyright>Copyright © 2017</copyright>
16+
<copyright>Copyright © 2019</copyright>
1617
<tags>MOSA Compiler</tags>
1718
</metadata>
1819
<files>

‎Source/Mosa.ClassLib/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("")]
1414
[assembly: AssemblyProduct("Mosa.ClassLib")]
15-
[assembly: AssemblyCopyright("Copyright © 2017")]
15+
[assembly: AssemblyCopyright("Copyright © 2019")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

‎Source/Mosa.Kernel.x86/Debugger.cs‎

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright (c) MOSA Project. Licensed under the New BSD License.
22

3-
using Mosa.ClassLib;
43
using Mosa.Runtime;
54
using Mosa.Runtime.x86;
65
using System;
@@ -315,7 +314,6 @@ private static void ProcessCommand()
315314
case DebugCode.ClearMemory: ClearMemory(); return;
316315
case DebugCode.HardJump: HardJump(); return;
317316
case DebugCode.ExecuteUnitTest: QueueUnitTest(); return;
318-
case DebugCode.GetMemoryCRC: GetMemoryCRC(); return;
319317
default: return;
320318
}
321319
}
@@ -399,11 +397,10 @@ private static void CompressedWriteMemory()
399397
uint address = GetDataUInt32(0);
400398
uint length = GetDataUInt32(4);
401399
uint size = GetDataUInt32(8);
402-
uint uncompresscrc = GetDataUInt32(12);
403400

404-
LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size);
401+
//uint uncompresscrc = GetDataUInt32(12);
405402

406-
uint computedcrc = ComputeMemoryCRC(address, size);
403+
LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size);
407404

408405
Screen.Goto(15, 0);
409406
Screen.ClearRow();
@@ -419,12 +416,13 @@ private static void CompressedWriteMemory()
419416
Screen.Write(" Size: ");
420417
Screen.Write(size, 10, 5);
421418
Screen.Write(" CRC: ");
422-
Screen.Write(uncompresscrc, 16, 8);
423419

424-
if (uncompresscrc == computedcrc)
425-
Screen.Write(" OK");
426-
else
427-
Screen.Write(" BAD");
420+
//Screen.Write(uncompresscrc, 16, 8);
421+
422+
//if (uncompresscrc == computedcrc)
423+
// Screen.Write(" OK");
424+
//else
425+
// Screen.Write(" BAD");
428426

429427
SendResponse(id, DebugCode.CompressedWriteMemory);
430428
}
@@ -454,31 +452,6 @@ private static void ClearMemory()
454452
SendResponse(id, DebugCode.ClearMemory);
455453
}
456454

457-
private static void GetMemoryCRC()
458-
{
459-
uint id = GetID();
460-
uint start = GetDataUInt32(0);
461-
uint length = GetDataUInt32(4);
462-
463-
uint crc = ComputeMemoryCRC(start, length);
464-
465-
SendResponseStart(id, DebugCode.GetMemoryCRC, 4);
466-
SendInteger(crc);
467-
}
468-
469-
private static uint ComputeMemoryCRC(uint start, uint length)
470-
{
471-
uint crc = CRC.InitialCRC;
472-
473-
for (uint i = 0; i < length; i++)
474-
{
475-
byte b = Intrinsic.Load8(new IntPtr(start), i);
476-
crc = CRC.Update(crc, b);
477-
}
478-
479-
return crc;
480-
}
481-
482455
private static void QueueUnitTest()
483456
{
484457
uint id = GetID();

‎Source/Mosa.Kernel.x86/Mosa.Kernel.x86.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@
105105
<Compile Include="Logger.cs" />
106106
</ItemGroup>
107107
<ItemGroup>
108-
<ProjectReference Include="..\Mosa.ClassLib\Mosa.ClassLib.csproj">
109-
<Project>{27a3c89c-1967-45ff-a77e-94f44995c42c}</Project>
110-
<Name>Mosa.ClassLib</Name>
111-
</ProjectReference>
112108
<ProjectReference Include="..\Mosa.Korlib\Mosa.Korlib.csproj">
113109
<Project>{631bc4f3-e2d8-4319-814c-13904caa17ce}</Project>
114110
<Name>Mosa.Korlib</Name>

‎Source/Mosa.Kernel.x86/Mosa.Kernel.x86.nuspec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<package >
33
<metadata>
44
<id>Mosa.Kernel.x86</id>
5-
<version>1.0.0.1</version>
5+
<version>1.0.0.5</version>
66
<title>Mosa.Kernel.x86 Library</title>
77
<authors>MOSA Project</authors>
88
<owners>MOSA Project</owners>
99
<license type="expression">BSD-3-Clause-Clear</license>
1010
<projectUrl>http://www.mosa-project.org</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>MOSA kernel for x86</description>
13+
<summary>MOSA Kernel for x86</summary>
14+
<description>MOSA Kernel for x86</description>
1415
<releaseNotes></releaseNotes>
15-
<copyright>Copyright © 2017</copyright>
16+
<copyright>Copyright © 2019</copyright>
1617
<tags>MOSA Compiler</tags>
1718
<dependencies>
18-
<dependency id="Mosa.Korlib" version="1.0.0.1" />
19-
<dependency id="Mosa.ClassLib" version="1.0.0.1" />
20-
<dependency id="Mosa.Runtime" version="1.0.0.1" />
21-
<dependency id="Mosa.Runtime.x86" version="1.0.0.1" />
19+
<dependency id="Mosa.Korlib" version="1.0.0.5" />
20+
<dependency id="Mosa.Runtime" version="1.0.0.5" />
21+
<dependency id="Mosa.Runtime.x86" version="1.0.0.5" />
2222
</dependencies>
2323
</metadata>
2424
<files>

‎Source/Mosa.Korlib/Mosa.Korlib.nuspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<package >
33
<metadata minClientVersion="3.3.0">
44
<id>Mosa.Korlib</id>
5-
<version>1.0.0.1</version>
5+
<version>1.0.0.5</version>
66
<title>Mosa.Korlib Library</title>
77
<authors>MOSA Project</authors>
88
<owners>MOSA Project</owners>
99
<license type="expression">BSD-3-Clause-Clear</license>
1010
<projectUrl>http://www.mosa-project.org</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<summary>MOSA Corlib</summary>
1314
<description>MOSA implementation of corlib</description>
1415
<releaseNotes></releaseNotes>
15-
<copyright>Copyright © 2017</copyright>
16+
<copyright>Copyright © 2019</copyright>
1617
<tags>MOSA Compiler corlib</tags>
1718
</metadata>
1819
<files>

‎Source/Mosa.Runtime.x64/Mosa.Runtime.x64.nuspec‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
<package >
33
<metadata>
44
<id>Mosa.Runtime.x86</id>
5-
<version>1.0.0.1</version>
5+
<version>1.0.0.5</version>
66
<title>Mosa.Runtime.x64 Library</title>
77
<authors>MOSA Project</authors>
88
<owners>MOSA Project</owners>
99
<license type="expression">BSD-3-Clause-Clear</license>
1010
<projectUrl>http://www.mosa-project.org</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>MOSA runtime libraries for x64 platform</description>
13+
<summary>MOSA x64 Runtime Library</summary>
14+
<description>MOSA Runtime Libraries x64 Platform</description>
1415
<releaseNotes></releaseNotes>
15-
<copyright>Copyright © 2017</copyright>
16+
<copyright>Copyright © 2019</copyright>
1617
<tags>MOSA Compiler</tags>
1718
<dependencies>
18-
<dependency id="Mosa.Korlib" version="1.0.0.1" />
19-
<dependency id="Mosa.Runtime" version="1.0.0.1" />
19+
<dependency id="Mosa.Korlib" version="1.0.0.5" />
20+
<dependency id="Mosa.Runtime" version="1.0.0.5" />
2021
</dependencies>
2122
</metadata>
2223
<files>

‎Source/Mosa.Runtime.x86/Mosa.Runtime.x86.nuspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
<package >
33
<metadata>
44
<id>Mosa.Runtime.x86</id>
5-
<version>1.0.0.1</version>
5+
<version>1.0.0.5</version>
66
<title>Mosa.Runtime.x86 Library</title>
77
<authors>MOSA Project</authors>
88
<owners>MOSA Project</owners>
99
<license type="expression">BSD-3-Clause-Clear</license>
1010
<projectUrl>http://www.mosa-project.org</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<summary>MOSA x86 Runtime Library</summary>
1314
<description>MOSA runtime libraries for x86 platform</description>
1415
<releaseNotes></releaseNotes>
15-
<copyright>Copyright © 2017</copyright>
16+
<copyright>Copyright © 2019</copyright>
1617
<tags>MOSA Compiler</tags>
1718
<dependencies>
18-
<dependency id="Mosa.Korlib" version="1.0.0.1" />
19-
<dependency id="Mosa.Runtime" version="1.0.0.1" />
19+
<dependency id="Mosa.Korlib" version="1.0.0.5" />
20+
<dependency id="Mosa.Runtime" version="1.0.0.5" />
2021
</dependencies>
2122
</metadata>
2223
<files>

0 commit comments

Comments
 (0)