From a017f694a867fe76723dae1a321bb3f0fc247af9 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Thu, 22 Aug 2013 14:01:30 -0400
Subject: [PATCH] WINBUILD: Fix the bootstrap icon for CE and PTP

---
 win_build/installerv2/CharityEngine.ism |  8 ++++----
 win_build/installerv2/Progress.ism      | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/win_build/installerv2/CharityEngine.ism b/win_build/installerv2/CharityEngine.ism
index 063a3b83fe..ab133dc261 100644
--- a/win_build/installerv2/CharityEngine.ism
+++ b/win_build/installerv2/CharityEngine.ism
@@ -2410,7 +2410,7 @@
 		<row><td>WEBx86</td><td>ProductCode</td><td/></row>
 		<row><td>WEBx86</td><td>ProductName</td><td/></row>
 		<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
-		<row><td>WEBx86</td><td>SetupFileName</td><td>ce_7.0.71_windows_intelx86</td></row>
+		<row><td>WEBx86</td><td>SetupFileName</td><td>ce_7.0.72_windows_intelx86</td></row>
 		<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
 	</table>
 
@@ -2495,7 +2495,7 @@
 		<col key="yes" def="s72">Name</col>
 		<col def="s0">Value</col>
 		<row><td>Web</td><td>WEBx86</td><td>CabCompressionType</td><td>3</td></row>
-		<row><td>Web</td><td>WEBx86</td><td>SetupIcon</td><td>&lt;ISProjectFolder&gt;\redist\setup.ico,0</td></row>
+		<row><td>Web</td><td>WEBx86</td><td>SetupIcon</td><td>&lt;ISProjectFolder&gt;\redist\CharityEngine\ce.ico,0</td></row>
 	</table>
 
 	<table name="ISReleasePublishInfo">
@@ -4522,11 +4522,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
 		<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#charityengine.exe]</td><td/></row>
-		<row><td>ProductCode</td><td>{8D83A5FE-20C2-4597-96ED-6C2ED9C80F0D}</td><td/></row>
+		<row><td>ProductCode</td><td>{D20484F4-7DAE-4490-A65A-743983FA757F}</td><td/></row>
 		<row><td>ProductID</td><td>none</td><td/></row>
 		<row><td>ProductLanguage</td><td>1033</td><td/></row>
 		<row><td>ProductName</td><td>Charity Engine</td><td/></row>
-		<row><td>ProductVersion</td><td>7.0.71</td><td/></row>
+		<row><td>ProductVersion</td><td>7.0.72</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>
diff --git a/win_build/installerv2/Progress.ism b/win_build/installerv2/Progress.ism
index 52db126018..f1ad5008a9 100644
--- a/win_build/installerv2/Progress.ism
+++ b/win_build/installerv2/Progress.ism
@@ -349,6 +349,7 @@
 		<col def="S0">ISDotNetInstallerArgsRollback</col>
 		<row><td>BOINCServiceConfig</td><td>{3BD51E4E-504D-43C2-AD8A-2FAD36A43488}</td><td>INSTALLDIR</td><td>0</td><td>VersionNT AND ENABLEPROTECTEDAPPLICATIONEXECUTION3 = 1</td><td>boinc.exe1</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>_BOINC</td><td>{B2649E11-6320-4710-B5C8-1922588446E9}</td><td>INSTALLDIR</td><td>0</td><td/><td>boinc.exe</td><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>_BOINCCMD</td><td>{4443469A-435C-4E09-9AF9-5FA1F6291533}</td><td>INSTALLDIR</td><td>8</td><td/><td>boinccmd.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>_BOINCData</td><td>{4E793828-A468-4366-892F-FC2F36EC99D9}</td><td>DATADIR</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>_BOINCDataProjects</td><td>{9C720438-35E8-4377-A105-AF3675664094}</td><td>PROJECTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>_BOINCDataSlots</td><td>{C9FE7A6E-2470-4666-949B-4DB2BB936E5F}</td><td>SLOTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@@ -1706,6 +1707,7 @@
 		<col key="yes" def="s72">Component_</col>
 		<row><td>BOINC</td><td>BOINCServiceConfig</td></row>
 		<row><td>BOINC</td><td>_BOINC</td></row>
+		<row><td>BOINC</td><td>_BOINCCMD</td></row>
 		<row><td>BOINC</td><td>_BOINCData</td></row>
 		<row><td>BOINC</td><td>_BOINCDataProjects</td></row>
 		<row><td>BOINC</td><td>_BOINCDataSlots</td></row>
@@ -1742,6 +1744,7 @@
 		<row><td>boinc.exe</td><td>_BOINC</td><td>boinc.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boinc.exe</td><td>1</td><td/></row>
 		<row><td>boinc.exe1</td><td>BOINCServiceConfig</td><td>boinc.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boinc.exe</td><td>1</td><td/></row>
 		<row><td>boinc.scr</td><td>_Screensaver</td><td>boinc.scr</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boinc.scr</td><td>1</td><td/></row>
+		<row><td>boinccmd.exe</td><td>_BOINCCMD</td><td>boinccmd.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boinccmd.exe</td><td>1</td><td/></row>
 		<row><td>boincscr.exe</td><td>_BOINCScreensaver</td><td>boincscr.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_BOINC_FILES&gt;\clientscr\progress\win\x86\boincscr.exe</td><td>1</td><td/></row>
 		<row><td>boincsvcctrl.exe</td><td>_BOINCSvcCtrl</td><td>BOINCS~1.EXE|boincsvcctrl.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boincsvcctrl.exe</td><td>1</td><td/></row>
 		<row><td>boinctray.exe</td><td>_BOINCTray</td><td>BOINCT~1.EXE|boinctray.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;PATH_TO_RELEASE_FILES&gt;\boinctray.exe</td><td>1</td><td/></row>
@@ -2038,6 +2041,7 @@
 		<col def="S0">Miscellaneous</col>
 		<row><td>BOINCServiceConfig</td><td/><td/><td>_23973580_DA7B_4A53_B5EB_5F1F61B97C11_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>_BOINC</td><td/><td/><td>_8A5DE506_FADD_485F_B712_2BFBE8D3B700_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>_BOINCCMD</td><td/><td/><td>_3E7DBF16_6CEF_4F4E_900D_266F7C943AC7_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>_BOINCData</td><td/><td/><td>_D8602107_1A7A_4322_BE7C_F9ED7C5178C6_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>_BOINCDataProjects</td><td/><td/><td>_AC29B530_D9EA_42C8_A23C_A0D32681F657_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>_BOINCDataSlots</td><td/><td/><td>_781B3F44_497A_4D36_A81A_CCE99D480B09_FILTER</td><td/><td/><td/><td/></row>
@@ -2413,7 +2417,7 @@
 		<row><td>WEBx86</td><td>ProductCode</td><td/></row>
 		<row><td>WEBx86</td><td>ProductName</td><td/></row>
 		<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
-		<row><td>WEBx86</td><td>SetupFileName</td><td>ptp_7.1.18_windows_intelx86</td></row>
+		<row><td>WEBx86</td><td>SetupFileName</td><td>ptp_7.0.72_windows_intelx86</td></row>
 		<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
 	</table>
 
@@ -2498,7 +2502,7 @@
 		<col key="yes" def="s72">Name</col>
 		<col def="s0">Value</col>
 		<row><td>Web</td><td>WEBx86</td><td>CabCompressionType</td><td>3</td></row>
-		<row><td>Web</td><td>WEBx86</td><td>SetupIcon</td><td>&lt;ISProjectFolder&gt;\redist\setup.ico,0</td></row>
+		<row><td>Web</td><td>WEBx86</td><td>SetupIcon</td><td>&lt;ISProjectFolder&gt;\redist\Progress\progress.ico,0</td></row>
 	</table>
 
 	<table name="ISReleasePublishInfo">
@@ -4524,11 +4528,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
 		<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#progressthruprocessors.exe]</td><td/></row>
-		<row><td>ProductCode</td><td>{498C7566-3A2A-4EE3-8564-CA431965DBB7}</td><td/></row>
+		<row><td>ProductCode</td><td>{33E589B9-D591-4EF7-A776-700F7B13981C}</td><td/></row>
 		<row><td>ProductID</td><td>none</td><td/></row>
 		<row><td>ProductLanguage</td><td>1033</td><td/></row>
 		<row><td>ProductName</td><td>Progress Thru Processors</td><td/></row>
-		<row><td>ProductVersion</td><td>7.1.18</td><td/></row>
+		<row><td>ProductVersion</td><td>7.0.72</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>