Completion of DebugHost changes.

This commit is contained in:
kudzu_cp 2012-07-03 05:25:29 +00:00
parent 9c08683dc1
commit 2650f29802
8 changed files with 21 additions and 50 deletions

View file

@ -1,4 +1,4 @@
<Application x:Class="Cosmos.Deploy.Pixie.GUI.App"
<Application x:Class="Cosmos.Deploy.Pixie.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml" Startup="Application_Startup">

View file

@ -5,7 +5,7 @@ using System.Data;
using System.Linq;
using System.Windows;
namespace Cosmos.Deploy.Pixie.GUI {
namespace Cosmos.Deploy.Pixie {
public partial class App : Application {
static public string PxePath;
static public string IpAddress;

View file

@ -1,7 +1,7 @@
<Window x:Class="Cosmos.Deploy.Pixie.GUI.MainWindow"
<Window x:Class="Cosmos.Deploy.Pixie.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Height="520" Width="525" Loaded="Window_Loaded" Icon="/Cosmos.Deploy.Pixie.GUI;component/Cosmos.ico" ResizeMode="CanMinimize" Closing="Window_Closing">
Height="520" Width="525" Loaded="Window_Loaded" Icon="/Cosmos.Deploy.Pixie;component/Cosmos.ico" ResizeMode="CanMinimize" Closing="Window_Closing">
<Grid>
<Label Content="Network Interface:" Height="28" HorizontalAlignment="Left" Margin="12,12,0,0" Name="label1" VerticalAlignment="Top" />
<Label Content="0.0.0.0" Height="28" HorizontalAlignment="Left" Margin="35,38,0,0" Name="lablNIC" VerticalAlignment="Top" Width="108" />

View file

@ -16,7 +16,7 @@ using System.IO;
using System.Net;
using System.Net.Sockets;
namespace Cosmos.Deploy.Pixie.GUI {
namespace Cosmos.Deploy.Pixie {
public partial class MainWindow : Window {
protected byte[] mNicIP = new byte[4];
protected DispatcherTimer mCloseTimer = new DispatcherTimer();

View file

@ -14,7 +14,7 @@
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
<Profile>User001</Profile>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<Framework>MicrosoftNET</Framework>
@ -28,8 +28,8 @@
<VMwareEdition>Player</VMwareEdition>
<VMwareDeploy>ISO</VMwareDeploy>
<IgnoreDebugStubAttribute />
<Deployment>ISO</Deployment>
<Launch>VMware</Launch>
<Deployment>PXE</Deployment>
<Launch>Slave</Launch>
<DebugEnabled>True</DebugEnabled>
<TraceAssemblies />
<PXE_Deployment>PXE</PXE_Deployment>
@ -80,8 +80,8 @@
<ISO_TraceAssemblies />
<ISO_EnableGDB>False</ISO_EnableGDB>
<ISO_StartCosmosGDB>false</ISO_StartCosmosGDB>
<Name>Guess</Name>
<Description>Use VMware Player or Workstation to deploy and debug.</Description>
<Name>PXE with Slave (Kudzu)</Name>
<Description>Creates a PXE setup and hosts a DCHP and TFTP server to deploy directly to physical hardware. Allows debugging with a serial cable.</Description>
<ISO_Name>User 001</ISO_Name>
<ISO_Description>Creates a bootable ISO image which can be burned to a DVD. After running the selected project, an explorer window will open containing the ISO file. The ISO file can then be burned to a CD or DVD and used to boot a physical or virtual system.</ISO_Description>
<USB_Name>Guess</USB_Name>
@ -114,7 +114,7 @@
<PXE_SlavePort>Serial: COM3</PXE_SlavePort>
<USB_PxeInterface>192.168.43.1</USB_PxeInterface>
<USB_SlavePort>Serial: COM3</USB_SlavePort>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<VisualStudioDebugPort>Serial: COM1</VisualStudioDebugPort>
<VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
<VMware_PxeInterface>192.168.43.1</VMware_PxeInterface>
<VMware_SlavePort>Serial: COM3</VMware_SlavePort>
@ -126,7 +126,7 @@
<VMware_ShowLaunchConsole>False</VMware_ShowLaunchConsole>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Profile>VMware</Profile>
<Profile>User001</Profile>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<Framework>MicrosoftNET</Framework>
@ -140,8 +140,8 @@
<VMwareEdition>Player</VMwareEdition>
<VMwareDeploy>ISO</VMwareDeploy>
<IgnoreDebugStubAttribute />
<Deployment>ISO</Deployment>
<Launch>VMware</Launch>
<Deployment>PXE</Deployment>
<Launch>Slave</Launch>
<DebugEnabled>True</DebugEnabled>
<TraceAssemblies />
<PXE_Deployment>PXE</PXE_Deployment>
@ -192,8 +192,8 @@
<ISO_TraceAssemblies />
<ISO_EnableGDB>False</ISO_EnableGDB>
<ISO_StartCosmosGDB>false</ISO_StartCosmosGDB>
<Name>Guess</Name>
<Description>Use VMware Player or Workstation to deploy and debug.</Description>
<Name>PXE with Slave (Kudzu)</Name>
<Description>Creates a PXE setup and hosts a DCHP and TFTP server to deploy directly to physical hardware. Allows debugging with a serial cable.</Description>
<ISO_Name>User 001</ISO_Name>
<ISO_Description>Creates a bootable ISO image which can be burned to a DVD. After running the selected project, an explorer window will open containing the ISO file. The ISO file can then be burned to a CD or DVD and used to boot a physical or virtual system.</ISO_Description>
<USB_Name>Guess</USB_Name>
@ -219,7 +219,7 @@
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
<User001_CosmosDebugPort>Serial: COM1</User001_CosmosDebugPort>
<User001_VisualStudioDebugPort>Serial: COM1</User001_VisualStudioDebugPort>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<VisualStudioDebugPort>Serial: COM1</VisualStudioDebugPort>
<VMware_CosmosDebugPort />
<VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
<ISO_CosmosDebugPort />

View file

@ -40,14 +40,11 @@
<h3>
Kudzu</h3>
<ul>
<li>Merge VMWare host classes<li>Move launch code in house<ul>
<li>Make debughost a empty dummy, document why and later todo elim, guid</ul>
<li>OutputDebug Catcher with filters, categories, timestamps<li>Proj props<ul>
<li>
Press stop while on bp with worktation<li>Press stop while vmware player is running</ul>
<p>
<li>Thread in Slave to check power state and call OnShutdown<li>OutputDebug Catcher with filters, categories, timestamps<li>Proj props<ul>
<li>Press stop while on bp with worktation<li>Press stop while vmware player is running</ul>
<p>
&nbsp;</p>
<p>
<p>
&nbsp;</p>
</ul>
<ul>

View file

@ -67,7 +67,6 @@
this.tabDeployment = new System.Windows.Forms.TabPage();
this.lboxDeployment = new System.Windows.Forms.ListBox();
this.tabLaunch = new System.Windows.Forms.TabPage();
this.chckShowLaunchConsole = new System.Windows.Forms.CheckBox();
this.lboxLaunch = new System.Windows.Forms.ListBox();
this.tabVMware = new System.Windows.Forms.TabPage();
this.checkEnableGDB = new System.Windows.Forms.CheckBox();
@ -529,7 +528,6 @@
//
// tabLaunch
//
this.tabLaunch.Controls.Add(this.chckShowLaunchConsole);
this.tabLaunch.Controls.Add(this.lboxLaunch);
this.tabLaunch.Location = new System.Drawing.Point(4, 22);
this.tabLaunch.Name = "tabLaunch";
@ -538,16 +536,6 @@
this.tabLaunch.Text = "Launch";
this.tabLaunch.UseVisualStyleBackColor = true;
//
// chckShowLaunchConsole
//
this.chckShowLaunchConsole.AutoSize = true;
this.chckShowLaunchConsole.Location = new System.Drawing.Point(230, 18);
this.chckShowLaunchConsole.Name = "chckShowLaunchConsole";
this.chckShowLaunchConsole.Size = new System.Drawing.Size(158, 17);
this.chckShowLaunchConsole.TabIndex = 35;
this.chckShowLaunchConsole.Text = "Show Launch Host Process";
this.chckShowLaunchConsole.UseVisualStyleBackColor = true;
//
// lboxLaunch
//
this.lboxLaunch.Dock = System.Windows.Forms.DockStyle.Left;
@ -745,7 +733,6 @@
this.panlDebugSettings.PerformLayout();
this.tabDeployment.ResumeLayout(false);
this.tabLaunch.ResumeLayout(false);
this.tabLaunch.PerformLayout();
this.tabVMware.ResumeLayout(false);
this.tabVMware.PerformLayout();
this.tabPXE.ResumeLayout(false);
@ -814,7 +801,6 @@
private System.Windows.Forms.TabPage tabSlave;
private System.Windows.Forms.ComboBox cmboSlavePort;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.CheckBox chckShowLaunchConsole;

View file

@ -158,7 +158,6 @@ namespace Cosmos.VS.Package {
// Launch
lboxLaunch.SelectedItem = mProps.Launch;
chckShowLaunchConsole.Checked = mProps.ShowLaunchConsole;
lablBuildOnly.Visible = mProps.Launch == LaunchType.None;
@ -189,9 +188,6 @@ namespace Cosmos.VS.Package {
comboDebugMode.SelectedItem = EnumValue.Find(comboDebugMode.Items, mProps.DebugMode);
comboTraceMode.SelectedItem = EnumValue.Find(comboTraceMode.Items, mProps.TraceAssemblies);
if (xProfile.IsPreset) {
chckShowLaunchConsole.Checked = false;
}
lablPreset.Visible = xProfile.IsPreset;
mShowTabDeployment = !xProfile.IsPreset;
@ -280,14 +276,6 @@ namespace Cosmos.VS.Package {
IsDirty = true;
}
};
chckShowLaunchConsole.CheckedChanged += delegate(Object sender, EventArgs e) {
var xValue = chckShowLaunchConsole.Checked;
if (xValue != mProps.ShowLaunchConsole) {
mProps.ShowLaunchConsole = xValue;
IsDirty = true;
}
};
#endregion
#region Compile