Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/CosmosOS/Cosmos
Browse files Browse the repository at this point in the history
  • Loading branch information
@fanoI
fanoI committed Aug 16, 2017
2 parents aaf06d7 + 63b7159 commit 2831abb
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 107 deletions.
194 changes: 97 additions & 97 deletions Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystemBoot.Cosmos
View file
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<BinFormat>elf</BinFormat>
<DebugEnabled>True</DebugEnabled>
<DebugMode>Source</DebugMode>
<TraceMode>User</TraceMode>
<EnableGDB>False</EnableGDB>
<StartCosmosGDB>False</StartCosmosGDB>
<Deployment>ISO</Deployment>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
<StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
<IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
<Launch>Bochs</Launch>
<Profile>Bochs</Profile>
<Description>Use Bochs emulator to deploy and debug.</Description>
<PxeInterface>192.168.0.8</PxeInterface>
<VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
<VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
<VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
<VMware_Deployment>ISO</VMware_Deployment>
<VMware_Launch>VMware</VMware_Launch>
<VMware_DebugEnabled>True</VMware_DebugEnabled>
<VMware_DebugMode>Source</VMware_DebugMode>
<VMware_IgnoreDebugStubAttribute>False</VMware_IgnoreDebugStubAttribute>
<VMware_CosmosDebugPort>Serial: COM1</VMware_CosmosDebugPort>
<VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
<VMware_PxeInterface>192.168.0.8</VMware_PxeInterface>
<VMware_OutputPath>bin\Debug\net462\</VMware_OutputPath>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<Bochs_StackCorruptionDetectionEnabled>True</Bochs_StackCorruptionDetectionEnabled>
<Bochs_StackCorruptionDetectionLevel>MethodFooters</Bochs_StackCorruptionDetectionLevel>
<Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
<Bochs_Deployment>ISO</Bochs_Deployment>
<Bochs_Launch>Bochs</Bochs_Launch>
<Bochs_DebugEnabled>True</Bochs_DebugEnabled>
<Bochs_DebugMode>Source</Bochs_DebugMode>
<Bochs_IgnoreDebugStubAttribute>False</Bochs_IgnoreDebugStubAttribute>
<Bochs_CosmosDebugPort>Serial: COM1</Bochs_CosmosDebugPort>
<Bochs_VisualStudioDebugPort>Pipe: Cosmos\Serial</Bochs_VisualStudioDebugPort>
<Bochs_PxeInterface>192.168.0.8</Bochs_PxeInterface>
<Bochs_OutputPath>bin\Debug\net462\</Bochs_OutputPath>
<Bochs_EnableGDB>False</Bochs_EnableGDB>
<Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
<USB_StackCorruptionDetectionEnabled>True</USB_StackCorruptionDetectionEnabled>
<USB_StackCorruptionDetectionLevel>MethodFooters</USB_StackCorruptionDetectionLevel>
<USB_Description>Makes a USB device such as a flash drive or external hard disk bootable.</USB_Description>
<USB_Deployment>USB</USB_Deployment>
<USB_Launch>None</USB_Launch>
<USB_DebugEnabled>False</USB_DebugEnabled>
<USB_DebugMode>Source</USB_DebugMode>
<USB_IgnoreDebugStubAttribute>False</USB_IgnoreDebugStubAttribute>
<USB_CosmosDebugPort>Serial: COM1</USB_CosmosDebugPort>
<USB_VisualStudioDebugPort>Pipe: Cosmos\Serial</USB_VisualStudioDebugPort>
<USB_PxeInterface>192.168.0.8</USB_PxeInterface>
<USB_OutputPath>bin\Debug\net462\</USB_OutputPath>
<USB_EnableGDB>False</USB_EnableGDB>
<USB_StartCosmosGDB>False</USB_StartCosmosGDB>
<Name>CosmosGraphicSubsystemBoot</Name>
</PropertyGroup>
<ItemGroup>
<None Remove="*" />
<Compile Remove="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\source\Cosmos.Core.Plugs.Asm\Cosmos.Core.Plugs.Asm.csproj">
<Name>Cosmos.Core.Plugs.Asm</Name>
<Project>{3c186d37-21c3-417c-95f1-19be538af88a}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
<Name>Cosmos.Core.Plugs</Name>
<Project>{1132e689-18b0-4d87-94e8-934d4802c540}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj">
<Name>Cosmos.Debug.Kernel.Plugs.Asm</Name>
<Project>{7e450662-b34c-49b0-a826-f45ad3a18891}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.System.Plugs\Cosmos.System.Plugs.csproj">
<Name>Cosmos.System.Plugs</Name>
<Project>{9431ff1f-ad75-4a1e-b38a-46e0f109411d}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\CosmosGraphicSubsystem\CosmosGraphicSubsystem.csproj">
<Name>CosmosGraphicSubsystem</Name>
<Project>{49f2c01d-d2c5-4564-810b-1ae92236c5c1}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
</Project>
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<BinFormat>elf</BinFormat>
<DebugEnabled>True</DebugEnabled>
<DebugMode>Source</DebugMode>
<TraceMode>User</TraceMode>
<EnableGDB>False</EnableGDB>
<StartCosmosGDB>False</StartCosmosGDB>
<Deployment>ISO</Deployment>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
<StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
<IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
<Launch>Bochs</Launch>
<Profile>Bochs</Profile>
<Description>Use Bochs emulator to deploy and debug.</Description>
<PxeInterface>192.168.0.8</PxeInterface>
<VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
<VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
<VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
<VMware_Deployment>ISO</VMware_Deployment>
<VMware_Launch>VMware</VMware_Launch>
<VMware_DebugEnabled>True</VMware_DebugEnabled>
<VMware_DebugMode>Source</VMware_DebugMode>
<VMware_IgnoreDebugStubAttribute>False</VMware_IgnoreDebugStubAttribute>
<VMware_CosmosDebugPort>Serial: COM1</VMware_CosmosDebugPort>
<VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
<VMware_PxeInterface>192.168.0.8</VMware_PxeInterface>
<VMware_OutputPath>bin\Debug\net462\</VMware_OutputPath>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<Bochs_StackCorruptionDetectionEnabled>True</Bochs_StackCorruptionDetectionEnabled>
<Bochs_StackCorruptionDetectionLevel>MethodFooters</Bochs_StackCorruptionDetectionLevel>
<Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
<Bochs_Deployment>ISO</Bochs_Deployment>
<Bochs_Launch>Bochs</Bochs_Launch>
<Bochs_DebugEnabled>True</Bochs_DebugEnabled>
<Bochs_DebugMode>Source</Bochs_DebugMode>
<Bochs_IgnoreDebugStubAttribute>False</Bochs_IgnoreDebugStubAttribute>
<Bochs_CosmosDebugPort>Serial: COM1</Bochs_CosmosDebugPort>
<Bochs_VisualStudioDebugPort>Pipe: Cosmos\Serial</Bochs_VisualStudioDebugPort>
<Bochs_PxeInterface>192.168.0.8</Bochs_PxeInterface>
<Bochs_OutputPath>bin\Debug\net462\</Bochs_OutputPath>
<Bochs_EnableGDB>False</Bochs_EnableGDB>
<Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
<USB_StackCorruptionDetectionEnabled>True</USB_StackCorruptionDetectionEnabled>
<USB_StackCorruptionDetectionLevel>MethodFooters</USB_StackCorruptionDetectionLevel>
<USB_Description>Makes a USB device such as a flash drive or external hard disk bootable.</USB_Description>
<USB_Deployment>USB</USB_Deployment>
<USB_Launch>None</USB_Launch>
<USB_DebugEnabled>False</USB_DebugEnabled>
<USB_DebugMode>Source</USB_DebugMode>
<USB_IgnoreDebugStubAttribute>False</USB_IgnoreDebugStubAttribute>
<USB_CosmosDebugPort>Serial: COM1</USB_CosmosDebugPort>
<USB_VisualStudioDebugPort>Pipe: Cosmos\Serial</USB_VisualStudioDebugPort>
<USB_PxeInterface>192.168.0.8</USB_PxeInterface>
<USB_OutputPath>bin\Debug\net462\</USB_OutputPath>
<USB_EnableGDB>False</USB_EnableGDB>
<USB_StartCosmosGDB>False</USB_StartCosmosGDB>
<Name>CosmosGraphicSubsystemBoot</Name>
</PropertyGroup>
<ItemGroup>
<None Remove="*" />
<Compile Remove="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\source\Cosmos.Core.Plugs.Asm\Cosmos.Core.Plugs.Asm.csproj">
<Name>Cosmos.Core.Plugs.Asm</Name>
<Project>{3c186d37-21c3-417c-95f1-19be538af88a}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
<Name>Cosmos.Core.Plugs</Name>
<Project>{1132e689-18b0-4d87-94e8-934d4802c540}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj">
<Name>Cosmos.Debug.Kernel.Plugs.Asm</Name>
<Project>{7e450662-b34c-49b0-a826-f45ad3a18891}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\source\Cosmos.System.Plugs\Cosmos.System.Plugs.csproj">
<Name>Cosmos.System.Plugs</Name>
<Project>{9431ff1f-ad75-4a1e-b38a-46e0f109411d}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\CosmosGraphicSubsystem\CosmosGraphicSubsystem.csproj">
<Name>CosmosGraphicSubsystem</Name>
<Project>{49f2c01d-d2c5-4564-810b-1ae92236c5c1}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
</Project>
4 changes: 4 additions & 0 deletions Demos/CosmosGraphicSubsystem/Kernel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ protected override void Run()
pen.Color = Color.LimeGreen;
canvas.DrawRectangle(pen, 450, 450, 80, 60);

/* A filled rectange */
pen.Color = Color.Chocolate;
canvas.DrawFilledRectangle(pen, 200, 150, 400, 300);

/*
* It will be really beautiful to do here:
* canvas.DrawString(pen, "Please press any key to end the Demo...");
Expand Down
11 changes: 5 additions & 6 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ platform: AnyCPU
shallow_clone: true
clone_folder: c:\Cosmos

init:
- cmd: |
git clone https://github.com/CosmosOS/XSharp.git c:\XSharp --depth 1
git clone https://github.com/CosmosOS/IL2CPU.git c:\IL2CPU --depth 1
build_script:
- cmd: >-
rem %APPVEYOR_BUILD_FOLDER%
git clone https://github.com/CosmosOS/XSharp.git c:\XSharp
git clone https://github.com/CosmosOS/IL2CPU.git c:\IL2CPU
nuget restore "Builder.sln"
nuget restore "..\XSharp\XSharp.sln"
Expand All @@ -35,8 +36,6 @@ build_script:
dotnet publish source\Cosmos.Build.MSBuild -f net462 -r win7-x86 -o "c:\CosmosRun\Build\VSIP\"
dotnet publish ..\IL2CPU\source\IL2CPU -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
dotnet publish ..\XSharp\source\XSharp.XSC -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\XSharp\"
xcopy /Y "Build\VSIP\Cosmos.Debug.Kernel.*" "c:\CosmosRun\Kernel\"
Expand Down
2 changes: 1 addition & 1 deletion install-VS2017.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ if exist %MSBuild% (
%MSBuild% Builder.sln /nologo /maxcpucount /nodeReuse:false /p:Configuration="Debug" /p:Platform="Any CPU"
)

start "Cosmos Builder" "source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe" "-VSPATH=%InstallDir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
start "Cosmos Builder" "source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe" "-VSPATH=%InstallDir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 2 additions & 3 deletions source/Cosmos.System2/Graphics/Canvas.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,9 @@ public virtual void DrawRectangle(Pen pen, int x, int y, int width, int height)

public virtual void DrawFilledRectangle(Pen pen, int x_start, int y_start, int width, int height)
{
for (int i = 0; i != width; i++)
for (int y = y_start; y < y_start + height; y++)
{
DrawLine(pen, x_start, y_start, x_start + height, y_start);
y_start++;
DrawLine(pen, x_start, y, x_start + width - 1, y);
}
}

Expand Down

0 comments on commit 2831abb

Please sign in to comment.