dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-09 17:52:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

benk Builder change - minor patch to launch debugger

Browse source
This commit is contained in:
bklooste_cp 2009-05-16 14:23:00 +00:00
parent 61272dd6ff
commit c3fdb104ba
5 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/Cosmos.Build.Windows/Builder/Builder.cs
View file

@ -29,8 +29,8 @@ namespace Cosmos.Compiler.Builder
public event Action<BuildProgress> BuildProgress; public event Action<BuildProgress> BuildProgress;
public event Action<LogSeverityEnum, string> LogMessage; public event Action<LogSeverityEnum, string> LogMessage;
private DebugWindow xDebugWindow = null; //HACK pass in event private DebugWindowController xDebugWindow = null; //HACK pass in event
public DebugWindow DebugWindow { get { return xDebugWindow; } } public DebugWindowController DebugWindow { get { return xDebugWindow; } }
private readonly BuildProgress currentProgress = new BuildProgress(); private readonly BuildProgress currentProgress = new BuildProgress();
@ -305,7 +305,7 @@ namespace Cosmos.Compiler.Builder
} }
private void ProcessDebug(BuildOptions options, ref DebugWindow xDebugWindow, ref Process xQEMU) private void ProcessDebug(BuildOptions options, ref DebugWindowController xDebugWindow, ref Process xQEMU)
{ {
if (options.DebugMode == DebugMode.Source) if (options.DebugMode == DebugMode.Source)
@ -377,9 +377,10 @@ namespace Cosmos.Compiler.Builder
} }
//HACK MUST BE UI //TODO handle passing to UI better
//xDebugWindow = new DebugWindow(); xDebugWindow = new DebugWindowController();
//xDebugWindow.SetSourceInfoMap(xSourceMappings, xDebugConnector); xDebugWindow.mSourceMappings = xSourceMappings;
xDebugWindow.mDebugConnector = xDebugConnector;
} }
else else
{ {

2
source/Cosmos.Build.Windows/Builder/IBuilder.cs
View file

@ -19,7 +19,7 @@ namespace Cosmos.Compiler.Builder
string BuildPath {get;} string BuildPath {get;}
DebugWindow DebugWindow {get;} //HACK pass in event DebugWindowController DebugWindow { get; } //HACK pass in event
//string[] GetPlugs(); //string[] GetPlugs();

1
source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj
View file

@ -155,6 +155,7 @@
<DependentUpon>DebugWindow.xaml</DependentUpon> <DependentUpon>DebugWindow.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UI\DebugWindowController.cs" />
<Compile Include="UI\IBuildProgressUC.cs"> <Compile Include="UI\IBuildProgressUC.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

23
source/Cosmos.Build.Windows/UI/DebugWindowController.cs Normal file
View file

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Cosmos.Compiler.Builder
{
public class DebugWindowController
{
private DebugWindow window;
public SourceInfos mSourceMappings { get; set; }
public DebugConnector mDebugConnector {get; set; }
public void Show()
{
window = new DebugWindow();
window.SetSourceInfoMap(mSourceMappings ,mDebugConnector);
window.Show();
}
}
}

16
source/Cosmos.Build.Windows/UI/MainWindowController.cs
View file

@ -92,24 +92,32 @@ namespace Cosmos.Compiler.Builder
void mBuilder_BuildCompleted() void mBuilder_BuildCompleted()
{ {
mainWindow.Dispatcher.Invoke(new Action(PostBuildUI));
mainWindow.ThreadedClose(); //HACK //TODO consider making the controller survive the window.
}
void PostBuildUI()
{
new ConsoleWindow().HideWindow(); new ConsoleWindow().HideWindow();
//HACK need to fire Debugger window in event //HACK need to fire Debugger window in event
// Problems around with DebugWindow getting stuck, this seems to work // Problems around with DebugWindow getting stuck, this seems to work
//mMainWindow.Hide(); //mMainWindow.Hide();
if (mBuilder.DebugWindow!= null) if (mBuilder.DebugWindow != null)
{ {
// Beginnings of experiment to host QEMU // Beginnings of experiment to host QEMU
//if (xQEMU != null) { //if (xQEMU != null) {
// IntPtr xDbgHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle; // IntPtr xDbgHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
// SetParent(xQEMU.MainWindowHandle, xDbgHandle); // SetParent(xQEMU.MainWindowHandle, xDbgHandle);
//} //}
mBuilder.DebugWindow.ShowDialog(); mBuilder.DebugWindow.Show();
} }
//mMainWindow.Close(); //mMainWindow.Close();
mainWindow.ThreadedClose(); //HACK //TODO consider making the controller survive the window.
} }