#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped
436 Mike Lischke 2011-04-18
- Set proper setup type also for Add/Modify and Remove operations to allow tracking these actions too.
-InstallerInfo: explicitly get the web response when sending the info and log it (avoids the request to be closed before it is done).
modified:
WexInstaller/Controls/InstallWizardControl.Designer.cs
WexInstaller/Controls/InstallWizardControl.cs
WexInstaller/InstallerInfo.cs
WexInstaller/RemovePanels/RemoveProgress.cs
=== modified file 'WexInstaller/Controls/InstallWizardControl.Designer.cs'
=== modified file 'WexInstaller/Controls/InstallWizardControl.Designer.cs'
--- a/WexInstaller/Controls/InstallWizardControl.Designer.cs 2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.Designer.cs 2011-04-18 09:16:30 +0000
@@ -169,7 +169,7 @@
this.updateTab.Controls.Add(this.updatePanel);
this.updateTab.Location = new System.Drawing.Point(4, 40);
this.updateTab.Name = "updateTab";
- this.updateTab.Size = new System.Drawing.Size(192, 56);
+ this.updateTab.Size = new System.Drawing.Size(556, 461);
this.updateTab.TabIndex = 1;
this.updateTab.Text = "Find latest products";
//
@@ -182,7 +182,7 @@
this.updatePanel.Location = new System.Drawing.Point(0, 0);
this.updatePanel.Margin = new System.Windows.Forms.Padding(0);
this.updatePanel.Name = "updatePanel";
- this.updatePanel.Size = new System.Drawing.Size(192, 56);
+ this.updatePanel.Size = new System.Drawing.Size(556, 461);
this.updatePanel.TabIndex = 1;
//
// detailedUpdateTab
@@ -191,7 +191,7 @@
this.detailedUpdateTab.Controls.Add(this.detailedUpdatePanel);
this.detailedUpdateTab.Location = new System.Drawing.Point(4, 40);
this.detailedUpdateTab.Name = "detailedUpdateTab";
- this.detailedUpdateTab.Size = new System.Drawing.Size(192, 56);
+ this.detailedUpdateTab.Size = new System.Drawing.Size(556, 461);
this.detailedUpdateTab.TabIndex = 2;
this.detailedUpdateTab.Text = "Apply updates";
//
@@ -204,16 +204,16 @@
this.detailedUpdatePanel.Location = new System.Drawing.Point(0, 0);
this.detailedUpdatePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.detailedUpdatePanel.Name = "detailedUpdatePanel";
- this.detailedUpdatePanel.Size = new System.Drawing.Size(192, 56);
+ this.detailedUpdatePanel.Size = new System.Drawing.Size(556, 461);
this.detailedUpdatePanel.TabIndex = 2;
//
// typeTab
//
this.typeTab.BackColor = System.Drawing.Color.White;
this.typeTab.Controls.Add(this.typePanel);
- this.typeTab.Location = new System.Drawing.Point(4, 58);
+ this.typeTab.Location = new System.Drawing.Point(4, 40);
this.typeTab.Name = "typeTab";
- this.typeTab.Size = new System.Drawing.Size(192, 38);
+ this.typeTab.Size = new System.Drawing.Size(556, 461);
this.typeTab.TabIndex = 3;
this.typeTab.Text = "Setup Type";
//
@@ -226,16 +226,16 @@
this.typePanel.Location = new System.Drawing.Point(0, 0);
this.typePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.typePanel.Name = "typePanel";
- this.typePanel.Size = new System.Drawing.Size(192, 38);
+ this.typePanel.Size = new System.Drawing.Size(556, 461);
this.typePanel.TabIndex = 3;
//
// featuresTab
//
this.featuresTab.BackColor = System.Drawing.Color.White;
this.featuresTab.Controls.Add(this.featuresPanel);
- this.featuresTab.Location = new System.Drawing.Point(4, 58);
+ this.featuresTab.Location = new System.Drawing.Point(4, 40);
this.featuresTab.Name = "featuresTab";
- this.featuresTab.Size = new System.Drawing.Size(192, 38);
+ this.featuresTab.Size = new System.Drawing.Size(556, 461);
this.featuresTab.TabIndex = 4;
this.featuresTab.Text = "Feature Selection";
//
@@ -248,16 +248,16 @@
this.featuresPanel.Location = new System.Drawing.Point(0, 0);
this.featuresPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.featuresPanel.Name = "featuresPanel";
- this.featuresPanel.Size = new System.Drawing.Size(192, 38);
+ this.featuresPanel.Size = new System.Drawing.Size(556, 461);
this.featuresPanel.TabIndex = 4;
//
// requirementsTab
//
this.requirementsTab.BackColor = System.Drawing.Color.White;
this.requirementsTab.Controls.Add(this.checkRequirementsPanel);
- this.requirementsTab.Location = new System.Drawing.Point(4, 76);
+ this.requirementsTab.Location = new System.Drawing.Point(4, 40);
this.requirementsTab.Name = "requirementsTab";
- this.requirementsTab.Size = new System.Drawing.Size(192, 20);
+ this.requirementsTab.Size = new System.Drawing.Size(556, 461);
this.requirementsTab.TabIndex = 5;
this.requirementsTab.Text = "Check Requirements";
//
@@ -278,9 +278,9 @@
this.installProgressTab.BackColor = System.Drawing.Color.White;
this.installProgressTab.Controls.Add(this.installProgressPanel);
this.installProgressTab.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.installProgressTab.Location = new System.Drawing.Point(4, 76);
+ this.installProgressTab.Location = new System.Drawing.Point(4, 40);
this.installProgressTab.Name = "installProgressTab";
- this.installProgressTab.Size = new System.Drawing.Size(192, 20);
+ this.installProgressTab.Size = new System.Drawing.Size(556, 461);
this.installProgressTab.TabIndex = 6;
this.installProgressTab.Text = "Installation";
//
@@ -300,9 +300,9 @@
//
this.allConfigTab.BackColor = System.Drawing.Color.White;
this.allConfigTab.Controls.Add(this.allConfigPanel);
- this.allConfigTab.Location = new System.Drawing.Point(4, 94);
+ this.allConfigTab.Location = new System.Drawing.Point(4, 40);
this.allConfigTab.Name = "allConfigTab";
- this.allConfigTab.Size = new System.Drawing.Size(192, 2);
+ this.allConfigTab.Size = new System.Drawing.Size(556, 461);
this.allConfigTab.TabIndex = 7;
this.allConfigTab.Text = "Configuration";
this.allConfigTab.UseVisualStyleBackColor = true;
@@ -323,9 +323,9 @@
//
this.completeTab.BackColor = System.Drawing.Color.White;
this.completeTab.Controls.Add(this.completePanel);
- this.completeTab.Location = new System.Drawing.Point(4, 94);
+ this.completeTab.Location = new System.Drawing.Point(4, 40);
this.completeTab.Name = "completeTab";
- this.completeTab.Size = new System.Drawing.Size(192, 2);
+ this.completeTab.Size = new System.Drawing.Size(556, 461);
this.completeTab.TabIndex = 8;
this.completeTab.Text = "Complete";
//
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs 2011-04-18 08:06:38 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs 2011-04-18 09:16:30 +0000
@@ -42,7 +42,10 @@
// disable setup type tab if we are updating instead of installing
if (!ProductManager.IsNewSetup())
+ {
ShowType(false);
+ ProductManager.CurrentSetupType = "Add/Modify";
+ }
else
{
// Only show Feature Selection for Custom install type.
=== modified file 'WexInstaller/InstallerInfo.cs'
--- a/WexInstaller/InstallerInfo.cs 2011-04-11 14:48:22 +0000
+++ b/WexInstaller/InstallerInfo.cs 2011-04-18 09:16:30 +0000
@@ -27,7 +27,7 @@
/// </summary>
public static void SaveAndSend(bool doSend)
{
- Logger.LogInformation("Serializing product information.");
+ Logger.LogInformation("Serializing installer information.");
string infoFileName = Path.Combine(InstallerConfiguration.HomeDir, @"Logs\product-info.xml");
try
@@ -39,6 +39,7 @@
if (doSend)
{
+ Logger.LogInformation("Sending installer information.");
string infoText = File.ReadAllText(infoFileName);
UTF8Encoding encoding = new UTF8Encoding();
byte[] data = encoding.GetBytes("info=" + infoText);
@@ -58,7 +59,19 @@
Stream newStream = collectorRequest.GetRequestStream();
newStream.Write(data, 0, data.Length);
+ newStream.Flush();
newStream.Close();
+
+ using (WebResponse response = collectorRequest.GetResponse())
+ {
+ Stream result = response.GetResponseStream();
+ StreamReader streamreader = new StreamReader(result, Encoding.UTF8);
+ Logger.LogTrace(streamreader.ReadToEnd());
+ streamreader.Close();
+ result.Close();
+ }
+
+ Logger.LogInformation("Done sending installer information.");
}
}
catch (Exception e)
=== modified file 'WexInstaller/RemovePanels/RemoveProgress.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.cs 2011-04-18 08:06:38 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.cs 2011-04-18 09:16:30 +0000
@@ -88,6 +88,7 @@
enableDetails.Visible = true;
nextOk = false;
backOk = false;
+ ProductManager.CurrentSetupType = "Remove";
SignalChange();
BeginInvoke(new MethodInvoker(RemoveNextPackage));
}
@@ -110,6 +111,7 @@
if (p.CurrentState == ProductState.InstallSuccess ||
p.CurrentState == ProductState.CurrentlyInstalled)
{
+ ProductManager.InstallationStarted = true;
removingItem = item;
p.ProductMSIActionProgressChanged += new ProductMSIActionProgressHandler(ProductInstallProgressChanged);
p.ProductMSIActionCompleted += new ProductMSIActionCompleteHandler(ProductInstallCompleted);
@@ -135,6 +137,7 @@
SignalChange();
executed = true;
+ ProductManager.InstallationFinished = true;
}
#region Event handling
Attachment: [text/bzr-bundle] bzr/mike.lischke@oracle.com-20110418091630-8qujk1p9ejs4rnsx.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (mike.lischke:436) | Mike Lischke | 18 Apr |
