Skip to content
Permalink
Browse files

030 New Tool: mosactl (#589)

* WIP

* WIP

* WIP

* added ps script

* WIP

* WIP

* clean up packages Part 1

* WIP

* added tool.debugger to mosactl

* removed hardcoded helloworld from mosactl

* WIP

* link source file

* link source file

* added linux mosactl stub script

* fixed casing

* follow naming convention

* WIP

* gdb script generation

* removed demo scripts

* source view fix

* clean up

* updated help
  • Loading branch information...
Arakis authored and tgiphil committed Feb 8, 2019
1 parent a9be607 commit 371f5acb0c8ab38008b1ef7be9cc2b69ddbf2670
Showing with 777 additions and 324 deletions.
  1. +2 −0 .gitignore
  2. +2 −5 Demos/unix/debug-helloworld.gdb → Ressources/settings.gdb
  3. +9 −0 Source/.vscode/launch.json
  4. +70 −52 Source/.vscode/tasks.json
  5. +5 −7 Source/Mosa.Tool.Compiler/Mosa.Tool.Compiler.csproj
  6. +0 −17 Source/Mosa.Tool.Compiler/packages.config
  7. +5 −7 Source/Mosa.Tool.CreateBootImage/Mosa.Tool.CreateBootImage.csproj
  8. +0 −17 Source/Mosa.Tool.CreateBootImage/packages.config
  9. +8 −10 Source/Mosa.Tool.Disassembler.Intel/Mosa.Tool.Disassembler.Intel.csproj
  10. +0 −18 Source/Mosa.Tool.Disassembler.Intel/packages.config
  11. +11 −14 Source/Mosa.Tool.Explorer/Mosa.Tool.Explorer.csproj
  12. +0 −18 Source/Mosa.Tool.Explorer/packages.config
  13. +4 −2 Source/Mosa.Tool.GDBDebugger/MainForm.cs
  14. +14 −16 Source/Mosa.Tool.GDBDebugger/Mosa.Tool.GDBDebugger.csproj
  15. +0 −20 Source/Mosa.Tool.GDBDebugger/packages.config
  16. +9 −24 Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj
  17. +0 −18 Source/Mosa.Tool.Launcher/packages.config
  18. +17 −0 Source/Mosa.Tool.Mosactl.sln
  19. +340 −0 Source/Mosa.Tool.Mosactl/Application.cs
  20. +33 −0 Source/Mosa.Tool.Mosactl/Help/usage.txt
  21. +90 −0 Source/Mosa.Tool.Mosactl/Mosa.Tool.Mosactl.csproj
  22. +13 −0 Source/Mosa.Tool.Mosactl/Options.cs
  23. +21 −0 Source/Mosa.Tool.Mosactl/Program.cs
  24. +34 −0 Source/Mosa.Tool.Mosactl/Properties/AssemblyInfo.cs
  25. +3 −0 Source/Mosa.Tool.Mosactl/readme.md
  26. +1 −39 Source/Mosa.Tools.Package/Mosa.Tools.Package.csproj
  27. +0 −13 Source/Mosa.Tools.Package/packages.config
  28. +1 −0 Source/Mosa.Utility.BootImage/ImageFormat.cs
  29. +3 −4 Source/Mosa.Utility.GUI.Common/Mosa.Utility.GUI.Common.csproj
  30. +0 −4 Source/Mosa.Utility.GUI.Common/packages.config
  31. +20 −0 Source/Mosa.Utility.Launcher/AppLocations.cs
  32. +0 −3 Source/Mosa.Utility.Launcher/Mosa.Utility.Launcher.csproj
  33. +19 −2 Source/Mosa.Utility.Launcher/Options.cs
  34. +4 −1 Source/Mosa.Utility.Launcher/Starter.cs
  35. +0 −13 Source/Mosa.Utility.Launcher/packages.config
  36. 0 Source/{MOSA.sln → Mosa.sln}
  37. +10 −0 mosactl
  38. +29 −0 mosactl.ps1
@@ -55,3 +55,5 @@ build.force
.test/

.gdb_history
NuGetUpgradeLog.html
MigrationBackup/
@@ -16,12 +16,9 @@ end
########################
# specific configuration

file bin/Mosa.HelloWorld.x86.bin
target remote | Demos/unix/debug-helloworld-internal.sh
#file bin/Mosa.HelloWorld.x86.bin
#target remote | Demos/unix/debug-helloworld-internal.sh
b *0x0
# b *0xc010609f

hbreak System.Void Mosa.HelloWorld.x86.Boot::Main()

####################
# continue debugging
@@ -30,6 +30,15 @@
],
"cwd": "${workspaceRoot}/../bin",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Tool.Mosactl",
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/../bin/Mosa.Tool.Mosactl.exe",
"args": [],
"cwd": "${workspaceRoot}/../bin",
"internalConsoleOptions": "openOnSessionStart"
}
/*
{
@@ -1,53 +1,71 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build solution",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build"
],
"group": "build",
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build tool.compiler",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build",
"Mosa.Tool.Compiler/Mosa.Tool.Compiler.csproj"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build solution",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build"
],
"group": "build",
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
]
}
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build solution",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build"
],
"group": "build",
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build tool.compiler",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build",
"Mosa.Tool.Compiler/Mosa.Tool.Compiler.csproj"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build tool.mosactl",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build",
"Mosa.Tool.Mosactl/Mosa.Tool.Mosactl.csproj"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build solution",
"type": "shell",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/t:build"
],
"group": "build",
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
]
}
@@ -65,14 +65,8 @@
<StartupObject>Mosa.Tool.Compiler.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Compiler.cs">
@@ -114,7 +108,11 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

This file was deleted.

Oops, something went wrong.
@@ -59,17 +59,15 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

This file was deleted.

Oops, something went wrong.
@@ -100,27 +100,25 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
</Reference>
<Reference Include="SharpDisasm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDisasm.1.1.11\lib\net45\SharpDisasm.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mosa.Compiler.Common\Mosa.Compiler.Common.csproj">
<Project>{0B1011A6-8FCD-4F9E-BBB8-8DB86E23D2E8}</Project>
<Name>Mosa.Compiler.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="SharpDisasm">
<Version>1.1.11</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

This file was deleted.

Oops, something went wrong.
@@ -56,23 +56,10 @@
<ApplicationIcon>magnifier.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
</Reference>
<Reference Include="dnlib, Version=1.0.1.0, Culture=neutral, PublicKeyToken=50e96378b6e77999, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdParty\dnlib.dll</HintPath>
</Reference>
<Reference Include="SharpDisasm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDisasm.1.1.11\lib\net45\SharpDisasm.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -142,7 +129,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -162,5 +148,16 @@
<ItemGroup>
<Content Include="magnifier.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="dnlib">
<Version>3.1.0</Version>
</PackageReference>
<PackageReference Include="SharpDisasm">
<Version>1.1.11</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 371f5ac

Please sign in to comment.
You can’t perform that action at this time.