diff options
| author | Cory Winter <cory@zeroc.com> | 2005-03-09 20:23:23 +0000 |
|---|---|---|
| committer | Cory Winter <cory@zeroc.com> | 2005-03-09 20:23:23 +0000 |
| commit | df56b426a37ec6145bcb59d73912bb38be7a351e (patch) | |
| tree | 34d30c1344841418e8344933b3c4c944e393faaf | |
| parent | Removed crappy OpenSSL build (diff) | |
| download | ice-df56b426a37ec6145bcb59d73912bb38be7a351e.tar.bz2 ice-df56b426a37ec6145bcb59d73912bb38be7a351e.tar.xz ice-df56b426a37ec6145bcb59d73912bb38be7a351e.zip | |
*** empty log message ***
| -rwxr-xr-x | cpp/install/vc60/Ice.ism | 21 | ||||
| -rwxr-xr-x | cpp/install/vc60/ThirdParty.ism | 13 | ||||
| -rwxr-xr-x | cpp/install/vc60/build.xml | 1 | ||||
| -rwxr-xr-x | cpp/install/vc71/Ice.ism | 57 | ||||
| -rwxr-xr-x | cpp/install/vc71/build.xml | 20 |
5 files changed, 73 insertions, 39 deletions
diff --git a/cpp/install/vc60/Ice.ism b/cpp/install/vc60/Ice.ism index ddb7543ba3c..621d2f1f135 100755 --- a/cpp/install/vc60/Ice.ism +++ b/cpp/install/vc60/Ice.ism @@ -250,6 +250,7 @@ <col key="yes" def="s72">Name</col>
<col def="V0">Data</col>
<col def="S255">ISBuildSourcePath</col>
+ <row><td>ISSELFREG.DLL</td><td/><td><ISProductFolder>\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\IsDialogBanner.ibd</td></row>
<row><td>NewBinary10</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
@@ -337,12 +338,12 @@ <col def="S0">ISDotNetInstallerArgsCommit</col>
<col def="S0">ISDotNetInstallerArgsUninstall</col>
<col def="S0">ISDotNetInstallerArgsRollback</col>
- <row><td>IceCppDemo</td><td>{C1392163-339E-452B-A401-D0B4E27F0600}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>IceCppDev</td><td>{F40D5465-8797-479E-ACD2-89216631CF7F}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>IceCppRuntime</td><td>{218943FB-F791-430F-B27E-9E839F0732C1}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>IceDoc</td><td>{864CDB60-DD48-44CE-A85C-95279D033B68}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>IceManual</td><td>{9C97525B-8993-4834-9ABA-9A593261C60D}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>VisualStudioRuntime</td><td>{00E5A9B9-3E93-4C0A-8188-9BD486B642E3}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceCppDemo</td><td>{6A1F9184-8C80-46C0-8835-3CF5AE6290B3}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceCppDev</td><td>{7BF2EA6B-007C-4C93-8FFF-5621DC754087}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceCppRuntime</td><td>{1ADAF629-4ABE-4F59-A64D-DDAC46DFFBE7}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceDoc</td><td>{B9A07B17-F6B8-495A-BF29-29495435D957}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceManual</td><td>{AB3D867C-BA23-4B8E-BB71-62EA3EBEE97D}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>VisualStudioRuntime</td><td>{AB917D87-9371-49AA-8F41-38AB8E4C2125}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
</table>
<table name="Condition">
@@ -961,6 +962,10 @@ <col def="S255">ISComments</col>
<row><td>CheckForProductUpdates</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall"</td><td>Checks for product updates</td></row>
<row><td>CheckForProductUpdatesOnReboot</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall /Reboot"</td><td>Checks for product updates on reboot</td></row>
+ <row><td>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/></row>
+ <row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
+ <row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
+ <row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</td><td/></row>
<row><td>SetARPINSTALLLOCATION</td><td>51</td><td>ARPINSTALLLOCATION</td><td>[INSTALLDIR]</td><td/></row>
<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>
<row><td>setAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>
@@ -2441,6 +2446,10 @@ <row><td>DuplicateFiles</td><td/><td>4210</td><td>DuplicateFiles</td><td/></row>
<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
<row><td>FindRelatedProducts</td><td>NOT ISSETUPDRIVEN</td><td>420</td><td>FindRelatedProducts</td><td/></row>
+ <row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
+ <row><td>ISSelfRegisterFiles</td><td/><td>5601</td><td/><td/></row>
+ <row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
+ <row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
<row><td>InstallInitialize</td><td/><td>1501</td><td>InstallInitialize</td><td/></row>
diff --git a/cpp/install/vc60/ThirdParty.ism b/cpp/install/vc60/ThirdParty.ism index bacdbc9ebbe..ab6a187ce70 100755 --- a/cpp/install/vc60/ThirdParty.ism +++ b/cpp/install/vc60/ThirdParty.ism @@ -250,6 +250,7 @@ <col key="yes" def="s72">Name</col>
<col def="V0">Data</col>
<col def="S255">ISBuildSourcePath</col>
+ <row><td>ISSELFREG.DLL</td><td/><td><ISProductFolder>\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\IsDialogBanner.ibd</td></row>
<row><td>NewBinary10</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
@@ -337,8 +338,8 @@ <col def="S0">ISDotNetInstallerArgsCommit</col>
<col def="S0">ISDotNetInstallerArgsUninstall</col>
<col def="S0">ISDotNetInstallerArgsRollback</col>
- <row><td>CommonDoc</td><td>{5945E51C-B40A-4B0B-BA38-46499EA746B1}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
- <row><td>VisualStudioRuntime</td><td>{00E5A9B9-3E93-4C0A-8188-9BD486B642E3}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>CommonDoc</td><td>{6980D606-4255-4CEB-9EBE-196858AB306C}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>VisualStudioRuntime</td><td>{1F6222A4-12B8-4B3C-B559-EFEA6E904493}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
</table>
<table name="Condition">
@@ -957,6 +958,10 @@ <col def="S255">ISComments</col>
<row><td>CheckForProductUpdates</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall"</td><td>Checks for product updates</td></row>
<row><td>CheckForProductUpdatesOnReboot</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall /Reboot"</td><td>Checks for product updates on reboot</td></row>
+ <row><td>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/></row>
+ <row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
+ <row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
+ <row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</td><td/></row>
<row><td>SetARPINSTALLLOCATION</td><td>51</td><td>ARPINSTALLLOCATION</td><td>[INSTALLDIR]</td><td/></row>
<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>
<row><td>setAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>
@@ -2414,6 +2419,10 @@ <row><td>DuplicateFiles</td><td/><td>4210</td><td>DuplicateFiles</td><td/></row>
<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
<row><td>FindRelatedProducts</td><td>NOT ISSETUPDRIVEN</td><td>420</td><td>FindRelatedProducts</td><td/></row>
+ <row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
+ <row><td>ISSelfRegisterFiles</td><td/><td>5601</td><td/><td/></row>
+ <row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
+ <row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
<row><td>InstallInitialize</td><td/><td>1501</td><td>InstallInitialize</td><td/></row>
diff --git a/cpp/install/vc60/build.xml b/cpp/install/vc60/build.xml index 9dc747904fd..7219624ef4b 100755 --- a/cpp/install/vc60/build.xml +++ b/cpp/install/vc60/build.xml @@ -243,6 +243,7 @@ <exclude name="**/Makefile"/> <exclude name="**/Debug/**"/> <exclude name="**/Release/**"/> + <exclude name="Freeze/backup/**"/> </fileset> </copy> diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism index 505e7ebc54c..3d679dd338b 100755 --- a/cpp/install/vc71/Ice.ism +++ b/cpp/install/vc71/Ice.ism @@ -369,9 +369,7 @@ <col key="yes" def="s38">Feature_</col>
<col key="yes" def="i2">Level</col>
<col def="S255">Condition</col>
- <row><td>ice_dev_csharp</td><td>200</td><td>Not (AdminUser And MsiNetAssemblySupport > "1.1.4322")</td></row>
- <row><td>ice_dev_vbasic</td><td>200</td><td>Not (AdminUser And MsiNetAssemblySupport > "1.1.4322")</td></row>
- <row><td>ice_runtime_dotnet</td><td>200</td><td>Not (AdminUser And MsiNetAssemblySupport > "1.1.4322")</td></row>
+ <row><td>ice_runtime_dotnet</td><td>0</td><td>Not (AdminUser And MsiNetAssemblySupport > "1.1.4322")</td></row>
</table>
<table name="Control">
@@ -601,6 +599,11 @@ <row><td>MaintenanceWelcome</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceWelcome</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>65539</td><td/><td>##IDS__IsMaintenanceWelcome_WizardWelcome##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceWelcome</td><td>TextLine2</td><td>Text</td><td>135</td><td>55</td><td>228</td><td>50</td><td>65539</td><td/><td>##IDS__IsMaintenanceWelcome_MaintenanceOptionsDescription##</td><td/><td/><td>0</td><td/><td/><td/></row>
+ <row><td>NotAdminWarning</td><td>Icon</td><td>Icon</td><td>15</td><td>15</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary4</td></row>
+ <row><td>NotAdminWarning</td><td>No</td><td>PushButton</td><td>135</td><td>85</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_No##</td><td>Yes</td><td/><td>0</td><td>0</td><td/><td/></row>
+ <row><td>NotAdminWarning</td><td>Text</td><td>Text</td><td>48</td><td>15</td><td>194</td><td>40</td><td>3</td><td/><td>##ID_STRING31##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
+ <row><td>NotAdminWarning</td><td>Text1</td><td>Text</td><td>48</td><td>58</td><td>178</td><td>21</td><td>65539</td><td>ContinueNotAdminText</td><td>##NEW_STRING1##</td><td>No</td><td/><td>0</td><td>11</td><td/><td/></row>
+ <row><td>NotAdminWarning</td><td>Yes</td><td>PushButton</td><td>62</td><td>85</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_Yes##</td><td>Text1</td><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OutOfSpace</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary20</td></row>
<row><td>OutOfSpace</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>OutOfSpace</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
@@ -852,7 +855,7 @@ <row><td>AdminNetworkLocation</td><td>InstallNow</td><td>SetTargetPath</td><td>TARGETDIR</td><td>1</td><td>1</td></row>
<row><td>AdminWelcome</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
<row><td>AdminWelcome</td><td>Next</td><td>NewDialog</td><td>AdminNetworkLocation</td><td>1</td><td>0</td></row>
- <row><td>CancelSetup</td><td>No</td><td>EndDialog</td><td>Return</td><td>1</td><td>0</td></row>
+ <row><td>CancelSetup</td><td>No</td><td>EndDialog</td><td>Return</td><td>1</td><td>1</td></row>
<row><td>CancelSetup</td><td>Yes</td><td>EndDialog</td><td>Exit</td><td>1</td><td>2</td></row>
<row><td>CustomSetup</td><td>Back</td><td>NewDialog</td><td>MaintenanceType</td><td>Installed</td><td>1</td></row>
<row><td>CustomSetup</td><td>Back</td><td>NewDialog</td><td>SetupType</td><td>NOT Installed</td><td>2</td></row>
@@ -875,11 +878,11 @@ <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>LicenseAgreement</td><td>1</td><td>0</td></row>
+ <row><td>DestinationFolder</td><td>Back</td><td>NewDialog</td><td>LicenseAgreement</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>
- <row><td>DestinationFolder</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>1</td><td>0</td></row>
+ <row><td>DestinationFolder</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>1</td><td>1</td></row>
<row><td>DiskSpaceRequirements</td><td>OK</td><td>EndDialog</td><td>Return</td><td>1</td><td>0</td></row>
<row><td>FilesInUse</td><td>Exit</td><td>EndDialog</td><td>Exit</td><td>1</td><td>0</td></row>
<row><td>FilesInUse</td><td>Ignore</td><td>EndDialog</td><td>Ignore</td><td>1</td><td>0</td></row>
@@ -895,7 +898,7 @@ <row><td>InstallWelcome</td><td>Next</td><td>NewDialog</td><td>LicenseAgreement</td><td>1</td><td>0</td></row>
<row><td>LicenseAgreement</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>1</td><td>0</td></row>
<row><td>LicenseAgreement</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
- <row><td>LicenseAgreement</td><td>Next</td><td>NewDialog</td><td>DestinationFolder</td><td>AgreeToLicense = "Yes"</td><td>0</td></row>
+ <row><td>LicenseAgreement</td><td>Next</td><td>NewDialog</td><td>DestinationFolder</td><td>AgreeToLicense = "Yes"</td><td>1</td></row>
<row><td>MaintenanceType</td><td>Back</td><td>NewDialog</td><td>MaintenanceWelcome</td><td>1</td><td>0</td></row>
<row><td>MaintenanceType</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
<row><td>MaintenanceType</td><td>Next</td><td>NewDialog</td><td>CustomSetup</td><td>_IsMaintenance = "Change"</td><td>12</td></row>
@@ -913,6 +916,8 @@ <row><td>MaintenanceType</td><td>Next</td><td>[ProgressType3]</td><td>repairs</td><td>_IsMaintenance = "Reinstall"</td><td>8</td></row>
<row><td>MaintenanceWelcome</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
<row><td>MaintenanceWelcome</td><td>Next</td><td>NewDialog</td><td>MaintenanceType</td><td>1</td><td>0</td></row>
+ <row><td>NotAdminWarning</td><td>No</td><td>EndDialog</td><td>Exit</td><td>1</td><td>1</td></row>
+ <row><td>NotAdminWarning</td><td>Yes</td><td>NewDialog</td><td>CustomSetup</td><td>AdminUser And _IsSetupTypeMin = "Custom"</td><td>1</td></row>
<row><td>OutOfSpace</td><td>Resume</td><td>NewDialog</td><td>AdminNetworkLocation</td><td>ACTION = "ADMIN"</td><td>0</td></row>
<row><td>OutOfSpace</td><td>Resume</td><td>NewDialog</td><td>CustomSetup</td><td>ACTION <> "ADMIN"</td><td>0</td></row>
<row><td>PatchWelcome</td><td>Back</td><td>NewDialog</td><td>SplashBitmap</td><td>Display_IsBitmapDlg</td><td>0</td></row>
@@ -946,7 +951,7 @@ <row><td>SetupCompleteSuccess</td><td>OK</td><td>DoAction</td><td>CheckForProductUpdatesOnReboot</td><td>ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"</td><td>5</td></row>
<row><td>SetupCompleteSuccess</td><td>OK</td><td>DoAction</td><td>IS_LAUNCH_MY_PROGRAM_PLEASE</td><td>LAUNCHPROGRAM</td><td/></row>
<row><td>SetupCompleteSuccess</td><td>OK</td><td>EndDialog</td><td>Exit</td><td>1</td><td>2</td></row>
- <row><td>SetupError</td><td>A</td><td>EndDialog</td><td>ErrorAbort</td><td>1</td><td>0</td></row>
+ <row><td>SetupError</td><td>A</td><td>EndDialog</td><td>ErrorAbort</td><td>1</td><td>1</td></row>
<row><td>SetupError</td><td>C</td><td>EndDialog</td><td>ErrorCancel</td><td>1</td><td>0</td></row>
<row><td>SetupError</td><td>I</td><td>EndDialog</td><td>ErrorIgnore</td><td>1</td><td>0</td></row>
<row><td>SetupError</td><td>N</td><td>EndDialog</td><td>ErrorNo</td><td>1</td><td>0</td></row>
@@ -964,10 +969,10 @@ <row><td>SetupResume</td><td>Next</td><td>EndDialog</td><td>Return</td><td>OutOfNoRbDiskSpace <> 1</td><td>0</td></row>
<row><td>SetupResume</td><td>Next</td><td>NewDialog</td><td>OutOfSpace</td><td>OutOfNoRbDiskSpace = 1</td><td>0</td></row>
<row><td>SetupType</td><td>Back</td><td>NewDialog</td><td>DestinationFolder</td><td>1</td><td>1</td></row>
- <row><td>SetupType</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
- <row><td>SetupType</td><td>Next</td><td>AddLocal</td><td>ALL</td><td>_IsSetupTypeMin = "Typical"</td><td>0</td></row>
- <row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>CustomSetup</td><td>_IsSetupTypeMin = "Custom"</td><td>0</td></row>
- <row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>_IsSetupTypeMin <> "Custom"</td><td>0</td></row>
+ <row><td>SetupType</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
+ <row><td>SetupType</td><td>Next</td><td>AddLocal</td><td>ALL</td><td>_IsSetupTypeMin = "Typical"</td><td>3</td></row>
+ <row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>CustomSetup</td><td>_IsSetupTypeMin = "Custom"</td><td>1</td></row>
+ <row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>_IsSetupTypeMin <> "Custom"</td><td>2</td></row>
<row><td>SplashBitmap</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
<row><td>SplashBitmap</td><td>Next</td><td>NewDialog</td><td>InstallWelcome</td><td>1</td><td>0</td></row>
</table>
@@ -1027,6 +1032,7 @@ <row><td>LicenseAgreement</td><td>50</td><td>50</td><td>374</td><td>266</td><td>2</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>Agree</td><td>Next</td><td>Cancel</td><td>License Agreement</td><td/><td>0</td><td/></row>
<row><td>MaintenanceType</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>RadioGroup</td><td>Next</td><td>Cancel</td><td>Change, Reinstall, Remove</td><td/><td>0</td><td/></row>
<row><td>MaintenanceWelcome</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>Next</td><td>Next</td><td>Cancel</td><td>Maintenance Welcome</td><td/><td>0</td><td/></row>
+ <row><td>NotAdminWarning</td><td>50</td><td>50</td><td>260</td><td>112</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>No</td><td>No</td><td>No</td><td>Cancel</td><td/><td>0</td><td/></row>
<row><td>OutOfSpace</td><td>50</td><td>50</td><td>374</td><td>266</td><td>3</td><td>##IDS_PRODUCTNAME_INSTALLSHIELD##</td><td>Resume</td><td>Resume</td><td>Resume</td><td>Out Of Disk Space</td><td/><td>0</td><td/></row>
<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>
@@ -1058,6 +1064,8 @@ <row><td>DesktopFolder</td><td>TARGETDIR</td><td>.:Desktop</td><td/><td>3</td><td/></row>
<row><td>FavoritesFolder</td><td>TARGETDIR</td><td>.:FAVORI~1|Favorites</td><td/><td>0</td><td/></row>
<row><td>FontsFolder</td><td>TARGETDIR</td><td>.:Fonts</td><td/><td>0</td><td/></row>
+ <row><td>GAC_GLACIER2CS_PATH</td><td>TARGETDIR</td><td>GAC_GLACIER2CS_PATH</td><td/><td>0</td><td/></row>
+ <row><td>GAC_ICECS_PATH</td><td>TARGETDIR</td><td>GAC_ICECS_PATH</td><td/><td>0</td><td/></row>
<row><td>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
<row><td>ICE</td><td>WindowsVolume</td><td>ICE-2_~1|Ice-2.1.0</td><td/><td>0</td><td/></row>
<row><td>ICE_2.1.0_THIRD_PARTY_PACKAGES</td><td>WindowsVolume</td><td>ICE-2_~1|Ice-2.1.0-ThirdParty</td><td/><td>0</td><td/></row>
@@ -1290,18 +1298,18 @@ <col def="S255">ISComments</col>
<col def="S255">ISFeatureCabName</col>
<col def="S255">ISProFeatureName</col>
- <row><td>ice_dev_cpp</td><td/><td>##ID_STRING3##</td><td/><td>12</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_dev_csharp</td><td/><td>##ID_STRING17##</td><td>##ID_STRING22##</td><td>16</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_dev_java</td><td/><td>##ID_STRING12##</td><td/><td>14</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_dev_php</td><td/><td>##ID_STRING10##</td><td/><td>24</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_dev_python</td><td/><td>##ID_STRING13##</td><td/><td>22</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_dev_vbasic</td><td/><td>##ID_STRING19##</td><td>##ID_STRING22##</td><td>18</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_cpp</td><td/><td>##ID_STRING3##</td><td/><td>24</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_csharp</td><td>ice_runtime_dotnet</td><td>##ID_STRING17##</td><td>##ID_STRING22##</td><td>2</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_java</td><td>ice_runtime_java</td><td>##ID_STRING12##</td><td/><td>2</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_php</td><td>ice_runtime_php</td><td>##ID_STRING10##</td><td/><td>2</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_python</td><td>ice_runtime_python</td><td>##ID_STRING13##</td><td/><td>2</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_dev_vbasic</td><td>ice_runtime_dotnet</td><td>##ID_STRING19##</td><td>##ID_STRING22##</td><td>4</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
<row><td>ice_doc</td><td/><td>##ID_STRING21##</td><td/><td>26</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
<row><td>ice_runtime_cpp</td><td/><td>##ID_STRING2##</td><td/><td>2</td><td>1</td><td>INSTALLDIR</td><td>24</td><td/><td/><td/><td/></row>
- <row><td>ice_runtime_dotnet</td><td/><td>##ID_STRING27##</td><td>##ID_STRING22##</td><td>6</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_runtime_dotnet</td><td/><td>##ID_STRING27##</td><td>##ID_STRING22##</td><td>12</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
<row><td>ice_runtime_java</td><td/><td>##ID_STRING6##</td><td/><td>4</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_runtime_php</td><td/><td>##ID_STRING28##</td><td/><td>10</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
- <row><td>ice_runtime_python</td><td/><td>##ID_STRING29##</td><td/><td>8</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_runtime_php</td><td/><td>##ID_STRING28##</td><td/><td>22</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+ <row><td>ice_runtime_python</td><td/><td>##ID_STRING29##</td><td/><td>16</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
<row><td>packages</td><td>ice_runtime_cpp</td><td>##ID_STRING1##</td><td/><td>0</td><td>1</td><td>INSTALLDIR</td><td>24</td><td/><td/><td/><td/></row>
<row><td>packages_dev_cpp</td><td>ice_dev_cpp</td><td>##ID_STRING25##</td><td/><td>0</td><td>1</td><td>INSTALLDIR</td><td>24</td><td/><td/><td/><td/></row>
<row><td>packages_java</td><td>ice_runtime_java</td><td>##ID_STRING26##</td><td/><td>0</td><td>1</td><td>INSTALLDIR</td><td>24</td><td/><td/><td/><td/></row>
@@ -1576,7 +1584,7 @@ <col def="S255">ExcludeFiles</col>
<col def="I4">ISAttributes</col>
<row><td>IceCSharpDemo</td><td><ISProjectFolder>\install\ice-csharp\demo</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCSharpDev</td><td><ISProjectFolder>\install\ice-csharp\dev</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCSharpDev</td><td><ISProjectFolder>\install\ice-csharp\dev</td><td>4</td><td/><td>*.pdb</td><td>2</td></row>
<row><td>IceCSharpRuntime</td><td><ISProjectFolder>\install\ice-csharp\runtime</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCppDemo</td><td><ISProjectFolder>\install\ice-cpp\demo</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCppDev</td><td><ISProjectFolder>\install\ice-cpp\dev</td><td>4</td><td/><td/><td>2</td></row>
@@ -1904,7 +1912,7 @@ <col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>##ID_STRING23##</td><td>1033</td><td>|</td><td>0</td><td/><td>1100577870</td></row>
+ <row><td>##ID_STRING23##</td><td>1033</td><td>|</td><td>0</td><td/><td>1234782829</td></row>
<row><td>COMPANY_NAME</td><td>1033</td><td>ZeroC</td><td>0</td><td/><td>563691883</td></row>
<row><td>DN_AlwaysInstall</td><td>1033</td><td>Always Install</td><td>0</td><td> </td><td>479664453</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR</td><td>1033</td><td>The color settings of your system are not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
@@ -2464,6 +2472,7 @@ <row><td>ID_STRING29</td><td>1033</td><td>Ice Python Runtime</td><td>0</td><td/><td>1100601036</td></row>
<row><td>ID_STRING3</td><td>1033</td><td>C++ Development</td><td>0</td><td/><td>1100564236</td></row>
<row><td>ID_STRING30</td><td>1033</td><td>NOTE: You must be an Admin user and have the .NET 1.1 Framework installed in order to correctly install the Ice .NET Runtime.</td><td>0</td><td/><td>1100569678</td></row>
+ <row><td>ID_STRING31</td><td>1033</td><td>InstallShield has detected that you are not an Admin user. You will not be able to install the Ice .NET Runtime as a result.</td><td>0</td><td/><td>1234812651</td></row>
<row><td>ID_STRING4</td><td>1033</td><td>C++ Demos</td><td>0</td><td/><td>-1457943126</td></row>
<row><td>ID_STRING5</td><td>1033</td><td>Third Party Development Packages</td><td>0</td><td/><td>-1457924662</td></row>
<row><td>ID_STRING6</td><td>1033</td><td>Ice Java Runtime</td><td>0</td><td/><td>1100576396</td></row>
@@ -2471,6 +2480,7 @@ <row><td>ID_STRING8</td><td>1033</td><td>Python Development</td><td>0</td><td/><td>1100547884</td></row>
<row><td>ID_STRING9</td><td>1033</td><td>Python Demos</td><td>0</td><td/><td>-1457918486</td></row>
<row><td>IIDS_UITEXT_FeatureUninstalled</td><td>1033</td><td>This feature will remain uninstalled.</td><td>0</td><td/><td>479664453</td></row>
+ <row><td>NEW_STRING1</td><td>1033</td><td>Continue with the installation?</td><td>0</td><td/><td>1234820939</td></row>
</table>
<table name="ISTargetImage">
@@ -2852,6 +2862,7 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <row><td>AdminWarning</td><td>0</td><td/></row>
<row><td>AgreeToLicense</td><td>No</td><td/></row>
<row><td>ApplicationUsers</td><td>AllUsers</td><td/></row>
+ <row><td>ContinueNotAdminText</td><td>0</td><td/></row>
<row><td>DWUSINTERVAL</td><td>30</td><td/></row>
<row><td>DefaultUIFont</td><td>Tahoma8</td><td/></row>
<row><td>DialogCaption</td><td>InstallShield for Windows Installer</td><td/></row>
diff --git a/cpp/install/vc71/build.xml b/cpp/install/vc71/build.xml index 7d8bc0d2ecd..d0585222dda 100755 --- a/cpp/install/vc71/build.xml +++ b/cpp/install/vc71/build.xml @@ -246,6 +246,7 @@ <exclude name="**/Makefile"/> <exclude name="**/Debug/**"/> <exclude name="**/Release/**"/> + <exclude name="Freeze/backup/**"/> </fileset> </copy> @@ -272,6 +273,8 @@ <copy todir="${install.dir}/ice-csharp/dev/bin"> <fileset dir="${icecs.dir}/bin"> <include name="generatecs.exe"/> + <include name="*.pdb"/> + <exclude name="generatecs.pdb"/> </fileset> <fileset dir="${ice.dir}/bin"> <include name="slice2cs.exe"/> @@ -338,6 +341,14 @@ <copy file="${icej.dir}/config/build.properties" todir="${install.dir}/ice-java/dev/config"/> <copy file="${icej.dir}/config/common.xml" todir="${install.dir}/ice-java/dev/config"/> + <mkdir dir="${install.dir}/ice-java/dev/certs"/> + <copy todir="${install.dir}/ice-java/dev/certs"> + <fileset dir="${icej.dir}/certs"> + <!-- Only need these because the core ice runtime will install the rest --> + <include name="*.jks"/> + </fileset> + </copy> + </target> <!-- Ice for Java Demo --> @@ -352,14 +363,6 @@ </fileset> </copy> - <mkdir dir="${install.dir}/ice-java/demo/certs"/> - <copy todir="${install.dir}/ice-java/demo/certs"> - <fileset dir="${icej.dir}/certs"> - <exclude name="openssl/**"/> - <exclude name="makecerts"/> - </fileset> - </copy> - </target> <!-- Ice for Python Runtime --> @@ -452,6 +455,7 @@ <fileset dir="${icevb.dir}/demo"> <exclude name="**/*.vbproj*"/> <exclude name="**/*.exe"/> + <exclude name="**/*.pdb"/> <exclude name="**/*.dll"/> <exclude name="**/*.bat"/> <exclude name="**/.depend"/> |