diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/install/common/components/components.ini | 2 | ||||
| -rwxr-xr-x | cpp/install/vc60/ThirdParty.ism | 44 |
2 files changed, 40 insertions, 6 deletions
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini index 5f3f7cce7bc..a0aa1c27937 100755 --- a/cpp/install/common/components/components.ini +++ b/cpp/install/common/components/components.ini @@ -64,7 +64,7 @@ dest5=doc source6=%(BUILD_DIR)s/Ice-%(version)s/doc/images filelist6=ice.doc.images dest6=html/doc/reference/stylesheet-images -source7=%(INSTALL_TOOLS)s/common/docs +source7=%(INSTALL_TOOLS)s/common/docs/%(target)s filelist7=generated.installer.docs dest7=doc diff --git a/cpp/install/vc60/ThirdParty.ism b/cpp/install/vc60/ThirdParty.ism index 3ab2d806532..3bc428e4d1f 100755 --- a/cpp/install/vc60/ThirdParty.ism +++ b/cpp/install/vc60/ThirdParty.ism @@ -647,7 +647,7 @@ <row><td>OpenSSLLicense</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>OpenSSLLicense</td><td>Line1</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OpenSSLLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING6##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
- <row><td>OpenSSLLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>8</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense1</td><td/><td>Back</td><td/><td>0</td><td>0</td><td/><td/></row>
+ <row><td>OpenSSLLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense1</td><td/><td>Back</td><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OpenSSLLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td><ISProjectFolder>\install\packages\common\OPENSSL_LICENSE.rtf</td><td/></row>
<row><td>OpenSSLLicense</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty1</td><td>##NEW_STRING1##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OpenSSLLicense</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty2</td><td>##NEW_STRING2##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
@@ -695,6 +695,18 @@ <row><td>ReadyToRemove</td><td>DlgText2</td><td>Text</td><td>21</td><td>102</td><td>330</td><td>24</td><td>3</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>ReadyToRemove</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsVerifyRemoveAllDlg_RemoveProgram##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>ReadyToRemove</td><td>RemoveNow</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsVerifyRemoveAllDlg_Remove##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING47##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Bitmap1</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>262145</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td>NewBinary20</td></row>
+ <row><td>STLPortLicense</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##ID_STRING52##</td><td/><td/><td/><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##ID_STRING53##</td><td/><td/><td/><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING48##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING46##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>STLPortLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToSTLPortLicense</td><td/><td>Cancel</td><td/><td>0</td><td>0</td><td/><td/></row>
+ <row><td>STLPortLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td><ISProjectFolder>\install\packages\common\STLPORT_LICENSE.rtf</td><td/></row>
+ <row><td>STLPortLicense</td><td>Text1</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty22</td><td>##NEW_STRING23##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
+ <row><td>STLPortLicense</td><td>Text2</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty12</td><td>##NEW_STRING24##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>SetupCompleteError</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Finish</td><td/><td>0</td><td/><td/><td/></row>
<row><td>SetupCompleteError</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
<row><td>SetupCompleteError</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
@@ -937,7 +949,7 @@ <row><td>DatabaseFolder</td><td>ChangeFolder</td><td>SpawnDialog</td><td>InstallChangeFolder</td><td>1</td><td>1</td></row>
<row><td>DatabaseFolder</td><td>ChangeFolder</td><td>[_BrowseProperty]</td><td>DATABASEDIR</td><td>1</td><td>2</td></row>
<row><td>DatabaseFolder</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>1</td><td>1</td></row>
- <row><td>DestinationFolder</td><td>Back</td><td>NewDialog</td><td>JGoodiesLooksLicense</td><td>1</td><td>1</td></row>
+ <row><td>DestinationFolder</td><td>Back</td><td>NewDialog</td><td>STLPortLicense</td><td>1</td><td>1</td></row>
<row><td>DestinationFolder</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
<row><td>DestinationFolder</td><td>ChangeFolder</td><td>SpawnDialog</td><td>InstallChangeFolder</td><td>1</td><td>1</td></row>
<row><td>DestinationFolder</td><td>ChangeFolder</td><td>[_BrowseProperty]</td><td>INSTALLDIR</td><td>1</td><td>2</td></row>
@@ -964,7 +976,7 @@ <row><td>JGoodiesLooksLicense</td><td>Back</td><td>NewDialog</td><td>JGoodiesFormsLicense</td><td>1</td><td>1</td></row>
<row><td>JGoodiesLooksLicense</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
<row><td>JGoodiesLooksLicense</td><td>Next</td><td>ActionData</td><td>InstallWelcome</td><td> </td><td>2</td></row>
- <row><td>JGoodiesLooksLicense</td><td>Next</td><td>NewDialog</td><td>DestinationFolder</td><td>AgreeToLicense1112 = "Yes"</td><td>1</td></row>
+ <row><td>JGoodiesLooksLicense</td><td>Next</td><td>NewDialog</td><td>STLPortLicense</td><td>1</td><td/></row>
<row><td>LicenseAgreement</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>1</td><td>1</td></row>
<row><td>LicenseAgreement</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
<row><td>LicenseAgreement</td><td>Next</td><td>NewDialog</td><td>Bzip2License</td><td>AgreeToLicense = "Yes"</td><td>1</td></row>
@@ -1012,6 +1024,9 @@ <row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType1]</td><td>Uninstalling</td><td>1</td><td>0</td></row>
<row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType2]</td><td>uninstalled</td><td>1</td><td>0</td></row>
<row><td>ReadyToRemove</td><td>RemoveNow</td><td>[ProgressType3]</td><td>uninstalls</td><td>1</td><td>0</td></row>
+ <row><td>STLPortLicense</td><td>Back</td><td>NewDialog</td><td>JGoodiesLooksLicense</td><td>1</td><td>1</td></row>
+ <row><td>STLPortLicense</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
+ <row><td>STLPortLicense</td><td>Next</td><td>NewDialog</td><td>DestinationFolder</td><td>AgreeToSTLPortLicense = "Yes"</td><td>1</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>[Suspend]</td><td>{}</td><td>1</td><td>1</td></row>
<row><td>SetupCompleteError</td><td>Cancel</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
@@ -1111,6 +1126,7 @@ <row><td>PatchWelcome</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS__IsPatchDlg_PatchWizard##</td><td>Next</td><td>Next</td><td>Cancel</td><td>Patch Panel</td><td/><td>0</td><td/></row>
<row><td>ReadyToInstall</td><td>50</td><td>50</td><td>374</td><td>266</td><td>35</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>InstallNow</td><td>InstallNow</td><td>Cancel</td><td>Ready to Install</td><td/><td>0</td><td/></row>
<row><td>ReadyToRemove</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>RemoveNow</td><td>RemoveNow</td><td>Cancel</td><td>Verify Remove</td><td/><td>0</td><td/></row>
+ <row><td>STLPortLicense</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##ID_STRING51##</td><td>RadioButtonGroup1</td><td>Next</td><td>Cancel</td><td>Interior</td><td/><td>0</td><td/></row>
<row><td>SetupCompleteError</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>Finish</td><td>Finish</td><td>Finish</td><td>Fatal Error</td><td/><td>0</td><td/></row>
<row><td>SetupCompleteSuccess</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>OK</td><td>OK</td><td>OK</td><td>Exit</td><td/><td>0</td><td/></row>
<row><td>SetupError</td><td>50</td><td>10</td><td>270</td><td>110</td><td>65543</td><td>##IDS__IsErrorDlg_InstallerInfo##</td><td>ErrorText</td><td>O</td><td>C</td><td>Error</td><td/><td>0</td><td/></row>
@@ -2475,7 +2491,15 @@ <row><td>ID_STRING43</td><td>1033</td><td>[ProductName] - InstallShield Wizard</td><td>0</td><td/><td>1033477259</td></row>
<row><td>ID_STRING44</td><td>1033</td><td>{&MSSWhiteSerif8}InstallShield</td><td>0</td><td/><td>1033477259</td></row>
<row><td>ID_STRING45</td><td>1033</td><td>{&Tahoma8}InstallShield</td><td>0</td><td/><td>1033477259</td></row>
+ <row><td>ID_STRING46</td><td>1033</td><td>&Next ></td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING47</td><td>1033</td><td>< &Back</td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING48</td><td>1033</td><td>Cancel</td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING49</td><td>1033</td><td>{&MSSansBold8}Dialog Bold Title</td><td>0</td><td/><td>1671051817</td></row>
<row><td>ID_STRING5</td><td>1033</td><td>Third Party tools, files and libraries for compiling the Internet Communications Engine (Ice).</td><td>0</td><td/><td>1234810708</td></row>
+ <row><td>ID_STRING50</td><td>1033</td><td>Dialog Normal Description</td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING51</td><td>1033</td><td>[ProductName] - InstallShield Wizard</td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING52</td><td>1033</td><td>{&MSSWhiteSerif8}InstallShield</td><td>0</td><td/><td>1671051817</td></row>
+ <row><td>ID_STRING53</td><td>1033</td><td>{&Tahoma8}InstallShield</td><td>0</td><td/><td>1671051817</td></row>
<row><td>ID_STRING6</td><td>1033</td><td>&Next ></td><td>0</td><td/><td>1033470955</td></row>
<row><td>ID_STRING7</td><td>1033</td><td>< &Back</td><td>0</td><td/><td>1033470955</td></row>
<row><td>ID_STRING8</td><td>1033</td><td>Cancel</td><td>0</td><td/><td>1033470955</td></row>
@@ -2496,6 +2520,10 @@ <row><td>NEW_STRING20</td><td>1033</td><td/><td>0</td><td/><td>1033497739</td></row>
<row><td>NEW_STRING21</td><td>1033</td><td>I &do not accept the terms in the license agreement</td><td>0</td><td/><td>1033497739</td></row>
<row><td>NEW_STRING22</td><td>1033</td><td>I &accept the terms in the license agreement</td><td>0</td><td/><td>1033497739</td></row>
+ <row><td>NEW_STRING23</td><td>1033</td><td>{&MSSansBold8}License Agreement</td><td>0</td><td/><td>1671055945</td></row>
+ <row><td>NEW_STRING24</td><td>1033</td><td>Please read the following license agreement carefully.</td><td>0</td><td/><td>1671055945</td></row>
+ <row><td>NEW_STRING25</td><td>1033</td><td>I &do not accept the terms in the license agreement</td><td>0</td><td/><td>1671090761</td></row>
+ <row><td>NEW_STRING26</td><td>1033</td><td>I &accept the terms in the license agreement</td><td>0</td><td/><td>1671090761</td></row>
<row><td>NEW_STRING3</td><td>1033</td><td>I &do not accept the terms in the license agreement</td><td>0</td><td/><td>1033487371</td></row>
<row><td>NEW_STRING4</td><td>1033</td><td>I &accept the terms in the license agreement</td><td>0</td><td/><td>1033487371</td></row>
<row><td>NEW_STRING5</td><td>1033</td><td>Please read the following license agreement carefully.</td><td>0</td><td/><td>1033448523</td></row>
@@ -2885,6 +2913,7 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>AgreeToLicense111</td><td>No</td><td/></row>
<row><td>AgreeToLicense1111</td><td>No</td><td/></row>
<row><td>AgreeToLicense1112</td><td>No</td><td/></row>
+ <row><td>AgreeToLicense12</td><td>0</td><td/></row>
<row><td>ApplicationUsers</td><td>AllUsers</td><td/></row>
<row><td>DWUSINTERVAL</td><td>30</td><td/></row>
<row><td>DefaultUIFont</td><td>Tahoma8</td><td/></row>
@@ -2908,11 +2937,14 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>NewProperty111</td><td>0</td><td/></row>
<row><td>NewProperty1111</td><td>0</td><td/></row>
<row><td>NewProperty1112</td><td>0</td><td/></row>
+ <row><td>NewProperty12</td><td>0</td><td/></row>
<row><td>NewProperty2</td><td>0</td><td/></row>
<row><td>NewProperty21</td><td>0</td><td/></row>
<row><td>NewProperty211</td><td>0</td><td/></row>
<row><td>NewProperty2111</td><td>0</td><td/></row>
<row><td>NewProperty2112</td><td>0</td><td/></row>
+ <row><td>NewProperty22</td><td>0</td><td/></row>
+ <row><td>NewProperty3</td><td>0</td><td/></row>
<row><td>PIDTemplate</td><td>12345<###-%%%%%%%>@@@@@</td><td/></row>
<row><td>ProductCode</td><td>{9F9731EA-DF88-4333-A799-6E03A4C4ED80}</td><td/></row>
<row><td>ProductID</td><td>none</td><td/></row>
@@ -2953,8 +2985,8 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <col def="I4">ISControlId</col>
<row><td>AgreeToLicense</td><td>1</td><td>No</td><td>0</td><td>16</td><td>295</td><td>15</td><td>##IDS__AgreeToLicense_0##</td><td/><td>0</td></row>
<row><td>AgreeToLicense</td><td>2</td><td>Yes</td><td>0</td><td>1</td><td>295</td><td>15</td><td>##IDS__AgreeToLicense_1##</td><td/><td>0</td></row>
- <row><td>AgreeToLicense1</td><td>1</td><td>No</td><td>0</td><td>15</td><td>295</td><td>15</td><td>##NEW_STRING3##</td><td/><td>0</td></row>
- <row><td>AgreeToLicense1</td><td>2</td><td>Yes</td><td>0</td><td>0</td><td>295</td><td>15</td><td>##NEW_STRING4##</td><td/><td>0</td></row>
+ <row><td>AgreeToLicense1</td><td>1</td><td>No</td><td>3</td><td>15</td><td>295</td><td>15</td><td>##NEW_STRING3##</td><td/><td>0</td></row>
+ <row><td>AgreeToLicense1</td><td>2</td><td>Yes</td><td>1</td><td>0</td><td>295</td><td>15</td><td>##NEW_STRING4##</td><td/><td>0</td></row>
<row><td>AgreeToLicense11</td><td>1</td><td>No</td><td>0</td><td>15</td><td>295</td><td>15</td><td>##NEW_STRING7##</td><td/><td>0</td></row>
<row><td>AgreeToLicense11</td><td>2</td><td>Yes</td><td>0</td><td>0</td><td>295</td><td>15</td><td>##NEW_STRING8##</td><td/><td>0</td></row>
<row><td>AgreeToLicense111</td><td>1</td><td>No</td><td>0</td><td>15</td><td>295</td><td>15</td><td>##NEW_STRING11##</td><td/><td>0</td></row>
@@ -2963,6 +2995,8 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>AgreeToLicense1111</td><td>2</td><td>Yes</td><td>0</td><td>3</td><td>295</td><td>15</td><td>##NEW_STRING17##</td><td/><td>0</td></row>
<row><td>AgreeToLicense1112</td><td>1</td><td>No</td><td>0</td><td>16</td><td>295</td><td>15</td><td>##NEW_STRING21##</td><td/><td>0</td></row>
<row><td>AgreeToLicense1112</td><td>2</td><td>Yes</td><td>0</td><td>1</td><td>295</td><td>15</td><td>##NEW_STRING22##</td><td/><td>0</td></row>
+ <row><td>AgreeToSTLPortLicense</td><td>1</td><td>No</td><td>1</td><td>15</td><td>295</td><td>15</td><td>##NEW_STRING25##</td><td/><td>0</td></row>
+ <row><td>AgreeToSTLPortLicense</td><td>2</td><td>Yes</td><td>1</td><td>0</td><td>295</td><td>15</td><td>##NEW_STRING26##</td><td/><td>0</td></row>
<row><td>ApplicationUsers</td><td>1</td><td>AllUsers</td><td>1</td><td>7</td><td>290</td><td>14</td><td>##IDS__IsRegisterUserDlg_Anyone##</td><td/><td/></row>
<row><td>ApplicationUsers</td><td>2</td><td>OnlyCurrentUser</td><td>1</td><td>23</td><td>290</td><td>14</td><td>##IDS__IsRegisterUserDlg_OnlyMe##</td><td/><td/></row>
<row><td>_IsMaintenance</td><td>1</td><td>Change</td><td>0</td><td>0</td><td>290</td><td>14</td><td>##IDS__IsMaintenanceDlg_Modify##</td><td/><td/></row>
|