diff options
| -rwxr-xr-x | cpp/install/common/components.py | 12 | ||||
| -rwxr-xr-x | cpp/install/common/components/components.ini | 6 | ||||
| -rwxr-xr-x | cpp/install/common/makewindist.py | 6 | ||||
| -rwxr-xr-x | cpp/install/vc60/Ice.ism | 21 | ||||
| -rwxr-xr-x | cpp/install/vc60/ThirdParty.ism | 15 | ||||
| -rwxr-xr-x | cpp/install/vc71/Ice.ism | 27 | ||||
| -rwxr-xr-x | cpp/install/vc71/ThirdParty.ism | 14 | ||||
| -rwxr-xr-x | cpp/install/vc80/Ice.ism | 32 | ||||
| -rwxr-xr-x | cpp/install/vc80/ThirdParty.ism | 12 |
9 files changed, 75 insertions, 70 deletions
diff --git a/cpp/install/common/components.py b/cpp/install/common/components.py index cb4dc1a96d9..610e999930c 100755 --- a/cpp/install/common/components.py +++ b/cpp/install/common/components.py @@ -48,6 +48,7 @@ def recursiveListing(path): for x in files: fullpath = os.path.join(path, x); if os.path.isdir(fullpath) and not os.path.islink(fullpath): + result.append(fullpath) result.extend(recursiveListing(fullpath)) else: result.append(fullpath) @@ -97,7 +98,7 @@ class FileSpecWorker: if f.endswith("/**"): midmatchIncludes.append(".*%s.*" %f[3:len(f) -3].replace('/', '.')) else: - recursiveIncludes.append(f[3:]) + recursiveIncludes.append("*%s" % f[3:]) else: if f.endswith("/**"): midmatchIncludes.append("%s.*" %f[0:len(f) -3].replace('/', '.')) @@ -109,7 +110,7 @@ class FileSpecWorker: if f.endswith("/**"): midmatchExcludes.append(".*%s.*" % f[3:len(f) -3].replace('/', '.')) else: - recursiveExcludes.append(f[3:]) + recursiveExcludes.append("*%s" % f[3:]) else: if f.endswith("/**"): midmatchExcludes.append("%s.*" %f[0:len(f) -3].replace('/', '.')) @@ -208,10 +209,9 @@ class FileSpecWorker: cachedResults = cacheFile.readlines() cacheFile.close() - for i in range(0, len(cachedResults)): - cachedResults[i] = cachedResults[i].rstrip() - if cachedResults != None: + for i in range(0, len(cachedResults)): + cachedResults[i] = cachedResults[i].rstrip() previous = set(cachedResults) current = set(result) added = current - previous @@ -371,7 +371,7 @@ def stage(filename, componentdir, stageDirectory, group, defaults): componentFile = file(filename, "r") try: - worker = FileSpecWorker(filename, source, os.path.join(currentBase, dest)) + worker = FileSpecWorker("%s.%s.%d" % (filename, section.replace(" ", "_"), i), source, os.path.join(currentBase, dest)) for line in componentFile: current = line.strip() if line.startswith('#'): diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini index 9eddf4b5df1..fc3a2ee7115 100755 --- a/cpp/install/common/components/components.ini +++ b/cpp/install/common/components/components.ini @@ -70,9 +70,9 @@ dest6=html/doc/reference/stylesheet-images source7=%(INSTALL_TOOLS)s/common/docs/%(target)s filelist7=generated.installer.docs dest7=doc -source8=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/resources/ +source8=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/resources filelist8=icegrid.help -dest8=doc +dest8=html/doc [ice packages common] elements=3 @@ -88,7 +88,7 @@ filelist3=packages.licenses.%(target)s dest3=doc [ice runtime] -elements=8 +elements=9 active=1 ;; diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index b711d68d45d..e4b867aab66 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -143,7 +143,7 @@ def checkSources(sourceDir): raise DistEnvironmentError(msg) keyVersion = '0.0.0' - exp = re.compile("Ice-([0-9.]*).*.zip") + exp = re.compile("Ice-([0-9.b]*).*.zip") current = None for d in icezip: m = exp.match(os.path.split(d)[1]) @@ -556,7 +556,7 @@ def buildInstallers(startDir, stageDir, sourcesVersion, installVersion, installe # os.chdir(startDir) for project, release in installers: - runprog(os.environ['INSTALLSHIELD_HOME'] + "\ISCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) + runprog(os.environ['INSTALLSHIELD_HOME'] + "\IsCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) msi = project + "-" + sourcesVersion + "-" + installVersion + ".msi" msiPath = os.path.join(os.getcwd(), project, "ZEROC", release, "DiskImages/DISK1", msi) shutil.copy(msiPath, stageDir) @@ -706,6 +706,8 @@ def main(): defaults['dbver'] = '45' defaults['version'] = sourcesVersion defaults['dllversion'] = sourcesVersion.replace('.', '')[:2] + if sourcesVersion.find('b') != -1: + defaults['dllversion'] = defaults['dllversion'] + 'b' if target == "vc80_x64": defaults['OutDir'] = "x64/" diff --git a/cpp/install/vc60/Ice.ism b/cpp/install/vc60/Ice.ism index 4a1dca15fb0..cd01a1a1ba0 100755 --- a/cpp/install/vc60/Ice.ism +++ b/cpp/install/vc60/Ice.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>##ID_STRING23##</subject>
+ <subject>Ice 3.2b for Visual Studio 6.0</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING18##</comments>
@@ -1039,10 +1039,7 @@ <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>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-VC60</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>
- <row><td>ICE_3.0.1_VC60</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0-VC60</td><td/><td>0</td><td/></row>
- <row><td>ICE_3.2.0_VC60</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0-VC60</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2.0_VC60</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b-VC60</td><td/><td>0</td><td/></row>
<row><td>INSTALLDIR</td><td>ICE_3.2.0_VC60</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
@@ -1518,7 +1515,7 @@ <row><td>IceManual</td><td><ISProjectFolder>\install\ice\common\html</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IcePHPDemo</td><td><ISProjectFolder>\install\ice\php\demo</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IcePHPExtension</td><td><ISProjectFolder>\install\ice\php\extension</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceRubyDemo</td><td><ISProjectFolder>\install\ice\ruby\demo\demorb</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceRubyDemo</td><td><ISProjectFolder>\install\ice\ruby\demo</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceRubyDev</td><td><ISProjectFolder>\install\ice\ruby\dev</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceRubyRuntime</td><td><ISProjectFolder>\install\ice\ruby\runtime</td><td>4</td><td/><td/><td>2</td></row>
<row><td>VisualStudioRuntime</td><td><ISProjectFolder>\install\microsoft\runtime</td><td>4</td><td/><td/><td>2</td></row>
@@ -1732,7 +1729,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2.0-VC60</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2b-VC60</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{32A696E2-84B4-4E0F-8535-0F48B0BB36A8}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{10F97715-FD99-4440-BB77-8EA3DE1CB1A5}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -2385,9 +2382,9 @@ <row><td>ID_STRING20</td><td>1033</td><td>Ice for C++</td><td>0</td><td/><td>1234775635</td></row>
<row><td>ID_STRING21</td><td>1033</td><td>Ice for PHP</td><td>0</td><td/><td>1402617014</td></row>
<row><td>ID_STRING22</td><td>1033</td><td>PHP Development</td><td>0</td><td/><td>1402633398</td></row>
- <row><td>ID_STRING23</td><td>1033</td><td>Ice 3.2.0 for Visual Studio 6.0</td><td>0</td><td/><td>1713008397</td></row>
- <row><td>ID_STRING24</td><td>1033</td><td>NewFeature1</td><td>0</td><td/><td>1620829040</td></row>
- <row><td>ID_STRING25</td><td>1033</td><td>NewFeature1</td><td>0</td><td/><td>1620788112</td></row>
+ <row><td>ID_STRING23</td><td>1033</td><td>Ice 3.2b for Visual Studio 6.0</td><td>0</td><td/><td>1713008397</td></row>
+ <row><td>ID_STRING24</td><td>1033</td><td>Ice for Ruby</td><td>0</td><td/><td>958085676</td></row>
+ <row><td>ID_STRING25</td><td>1033</td><td>Ruby development</td><td>0</td><td/><td>958095916</td></row>
<row><td>ID_STRING3</td><td>1033</td><td>C++ Development</td><td>0</td><td/><td>-1457951318</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>
@@ -2792,8 +2789,8 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <row><td>ProductCode</td><td>{c1e6ab0c-8577-4df5-b83e-2a3361d9e4ad}</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>Ice 3.2.0 for Visual Studio 6.0</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b for Visual Studio 6.0</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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/cpp/install/vc60/ThirdParty.ism b/cpp/install/vc60/ThirdParty.ism index fc7d4f3fd11..fa091b0b9d3 100755 --- a/cpp/install/vc60/ThirdParty.ism +++ b/cpp/install/vc60/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>##ID_STRING54##</subject>
+ <subject>Ice 3.2b Third Party Packages for Visual Studio 6.0</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -1156,8 +1156,7 @@ <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>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
- <row><td>ICE_3.2.0_THIRDPARTY_VC60</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0-ThirdParty-VC60</td><td/><td>0</td><td/></row>
- <row><td>ICE_TP_INSTALL_DIR</td><td>WindowsVolume</td><td>ICE-3_~0|Ice-3.2.0-ThirdParty-VC60</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2.0_THIRDPARTY_VC60</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b-ThirdParty-VC60</td><td/><td>0</td><td/></row>
<row><td>INSTALLDIR</td><td>ICE_3.2.0_THIRDPARTY_VC60</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
@@ -1816,7 +1815,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2.0-VC60</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2b-VC60</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{A93F543D-1363-4E23-9078-832485CBA10D}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{D71F1C1D-AD30-4FA8-9F54-F1B5F2E4D4DF}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -1921,7 +1920,7 @@ <col def="I4">TimeStamp</col>
<row><td>COMPANY_NAME</td><td>1033</td><td>ZeroC, Inc.</td><td>0</td><td/><td>1234816852</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>ICE_VERSION</td><td>1033</td><td>3.2.0</td><td>0</td><td/><td>1973063787</td></row>
+ <row><td>ICE_VERSION</td><td>1033</td><td>3.2b</td><td>0</td><td/><td>1973063787</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>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_OS</td><td>1033</td><td>The operating system is not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_PROCESSOR</td><td>1033</td><td>The processor is not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
@@ -2505,7 +2504,7 @@ <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_STRING54</td><td>1033</td><td>Ice 3.2.0 Third Party Packages for Visual Studio 6.0</td><td>0</td><td/><td>1973033067</td></row>
+ <row><td>ID_STRING54</td><td>1033</td><td>Ice 3.2b Third Party Packages for Visual Studio 6.0</td><td>0</td><td/><td>1973033067</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>
@@ -2955,8 +2954,8 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{86DDB1C1-40F9-4CF1-ADB7-D9B159036700}</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>Ice 3.2.0 Third Party Packages for Visual Studio 6.0</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b Third Party Packages for Visual Studio 6.0</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism index 6ce5c264180..954f35a8696 100755 --- a/cpp/install/vc71/Ice.ism +++ b/cpp/install/vc71/Ice.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>Ice 3.2.0 for Visual Studio .NET 2003</subject>
+ <subject>Ice 3.2b for Visual Studio .NET 2003</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING32##</comments>
@@ -416,7 +416,7 @@ <row><td>CancelSetup</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>CancelSetup</td><td>No</td><td>PushButton</td><td>135</td><td>57</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_No##</td><td>Yes</td><td/><td>0</td><td/><td/><td/></row>
<row><td>CancelSetup</td><td>Text</td><td>Text</td><td>48</td><td>15</td><td>194</td><td>30</td><td>3</td><td/><td>##IDS__IsCancelDlg_ConfirmCancel##</td><td/><td/><td>0</td><td/><td/><td/></row>
- <row><td>CancelSetup</td><td>Yes</td><td>PushButton</td><td>62</td><td>57</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_Yes##</td><td>No</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>CancelSetup</td><td>Yes</td><td>PushButton</td><td>62</td><td>57</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_Yes##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>CustomSetup</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
<row><td>CustomSetup</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>CustomSetup</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>
@@ -586,11 +586,6 @@ <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>
@@ -726,7 +721,7 @@ <row><td>SetupType</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>SetupType</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>
<row><td>SetupType</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
- <row><td>SetupType</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Text1</td><td/><td>0</td><td/><td/><td/></row>
+ <row><td>SetupType</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>RadioGroup</td><td/><td>0</td><td/><td/><td/></row>
<row><td>SetupType</td><td>CompText</td><td>Text</td><td>80</td><td>94</td><td>246</td><td>35</td><td>3</td><td/><td>##IDS__IsSetupTypeMinDlg_AllFeatures##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>SetupType</td><td>CompleteIco</td><td>Icon</td><td>34</td><td>94</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary10</td></row>
<row><td>SetupType</td><td>CustText</td><td>Text</td><td>80</td><td>154</td><td>246</td><td>35</td><td>3</td><td/><td>##IDS__IsSetupTypeMinDlg_ChooseFeatures##</td><td/><td/><td>0</td><td/><td/><td/></row>
@@ -737,7 +732,6 @@ <row><td>SetupType</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__IsSetupTypeMinDlg_SetupType##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>SetupType</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>SetupType</td><td>RadioGroup</td><td>RadioButtonGroup</td><td>21</td><td>79</td><td>264</td><td>120</td><td>3</td><td>_IsSetupTypeMin</td><td>##IDS__IsSetupTypeMinDlg_13##</td><td>Back</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>SetupType</td><td>Text1</td><td>Text</td><td>21</td><td>199</td><td>316</td><td>31</td><td>65539</td><td>AdminDotNetNote</td><td>##ID_STRING30##</td><td>RadioGroup</td><td/><td>0</td><td>11</td><td/><td/></row>
<row><td>SplashBitmap</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>Next</td><td/><td>0</td><td/><td/><td/></row>
<row><td>SplashBitmap</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>
<row><td>SplashBitmap</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
@@ -903,8 +897,6 @@ <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>
@@ -1019,7 +1011,6 @@ <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>
@@ -1054,7 +1045,7 @@ <row><td>FontsFolder</td><td>TARGETDIR</td><td>.:Fonts</td><td/><td>0</td><td/></row>
<row><td>GAC</td><td>ASSEMBLY</td><td>GAC</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_3.2.0_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0-VC71</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2.0_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b-VC71</td><td/><td>0</td><td/></row>
<row><td>INSTALLDIR</td><td>ICE_3.2.0_VC71</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
@@ -1727,7 +1718,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2.0-VC71</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2b-VC71</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{3DD75F68-B120-4867-AB72-CBE9B0D537F5}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{D2E3040C-C9B1-49C1-9800-237733A0EAD8}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -1830,7 +1821,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>1301926345</td></row>
+ <row><td>##ID_STRING23##</td><td>1033</td><td>|</td><td>0</td><td/><td>958077360</td></row>
<row><td>COMPANY_NAME</td><td>1033</td><td>ZeroC, Inc.</td><td>0</td><td/><td>1234820916</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>
@@ -2392,7 +2383,7 @@ <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 Ice for .NET.</td><td>0</td><td/><td>1234811028</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 Ice for .NET as a result.</td><td>0</td><td/><td>1234768052</td></row>
<row><td>ID_STRING32</td><td>1033</td><td>The Internet Communications Engine (Ice) runtimes, tools, files and libraries for developing Ice applications.</td><td>0</td><td/><td>1234812724</td></row>
- <row><td>ID_STRING33</td><td>1033</td><td>Ice 3.2.0 for Visual Studio .NET 2003</td><td>0</td><td/><td>890860527</td></row>
+ <row><td>ID_STRING33</td><td>1033</td><td>Ice 3.2b for Visual Studio .NET 2003</td><td>0</td><td/><td>890860527</td></row>
<row><td>ID_STRING34</td><td>1033</td><td>Ice for C++</td><td>0</td><td/><td>1234802195</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>
@@ -2808,8 +2799,8 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <row><td>ProductCode</td><td>{305984E4-EACD-4D75-84FE-50E9A9A33F05}</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>Ice 3.2.0 for Visual Studio .NET 2003</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b for Visual Studio .NET 2003</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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/cpp/install/vc71/ThirdParty.ism b/cpp/install/vc71/ThirdParty.ism index 25b78042a84..edd8e1aa37e 100755 --- a/cpp/install/vc71/ThirdParty.ism +++ b/cpp/install/vc71/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>Ice 3.2.0 Third Party Packages for Visual Studio .NET 2003</subject>
+ <subject>##ID_STRING1##</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -1137,7 +1137,8 @@ <row><td>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
<row><td>ICE_3.0.1_THIRDPARTY</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0-ThirdParty</td><td/><td>0</td><td/></row>
<row><td>ICE_3.2.0_THIRDPARTY_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0-ThirdParty-VC71</td><td/><td>0</td><td/></row>
- <row><td>INSTALLDIR</td><td>ICE_3.2.0_THIRDPARTY_VC71</td><td>.</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2B_THIRDPARTY_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b-ThirdParty-VC71</td><td/><td>0</td><td/></row>
+ <row><td>INSTALLDIR</td><td>ICE_3.2B_THIRDPARTY_VC71</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
<row><td>ISMyProductDir</td><td>ISMyCompanyDir</td><td>MYPROD~1|My Product Name</td><td/><td>0</td><td/></row>
@@ -1790,7 +1791,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2.0-VC71</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2b-VC71</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{41468CE1-4A8E-426F-8DE5-C42804DBB0F7}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{55B9EFF2-1830-424D-8143-8481DE89D13E}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -2429,6 +2430,7 @@ <row><td>IDS__TargetReq_DESC_PROCESSOR</td><td>1033</td><td>The processor is not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
<row><td>IDS__TargetReq_DESC_RAM</td><td>1033</td><td>The amount of RAM is not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
<row><td>IDS__TargetReq_DESC_RESOLUTION</td><td>1033</td><td>The screen resolution is not adequate for running [ProductName].</td><td>0</td><td/><td>479664453</td></row>
+ <row><td>ID_STRING1</td><td>1033</td><td>Ice 3.2b Third Party Packages for Visual Studio .NET 2003</td><td>0</td><td/><td>689693653</td></row>
<row><td>ID_STRING11</td><td>1033</td><td>[ProductName] - InstallShield Wizard</td><td>0</td><td/><td>1033470955</td></row>
<row><td>ID_STRING12</td><td>1033</td><td>{&MSSWhiteSerif8}InstallShield</td><td>0</td><td/><td>1033470955</td></row>
<row><td>ID_STRING13</td><td>1033</td><td>{&Tahoma8}InstallShield</td><td>0</td><td/><td>1033470955</td></row>
@@ -2454,7 +2456,7 @@ <row><td>ID_STRING37</td><td>1033</td><td>{&Tahoma8}InstallShield</td><td>0</td><td/><td>1033487467</td></row>
<row><td>ID_STRING38</td><td>1033</td><td>&Next ></td><td>0</td><td/><td>1033477259</td></row>
<row><td>ID_STRING39</td><td>1033</td><td>< &Back</td><td>0</td><td/><td>1033477259</td></row>
- <row><td>ID_STRING4</td><td>1033</td><td>Ice 3.2.0 Third Party Packages for Visual Studio .NET 2003</td><td>0</td><td/><td>890864591</td></row>
+ <row><td>ID_STRING4</td><td>1033</td><td>Ice 3.2b Third Party Packages for Visual Studio .NET 2003</td><td>0</td><td/><td>890864591</td></row>
<row><td>ID_STRING40</td><td>1033</td><td>Cancel</td><td>0</td><td/><td>1033477259</td></row>
<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>
@@ -2898,8 +2900,8 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{97E089E6-79A2-479D-BB19-7FFC5A22D7F0}</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>Ice 3.2.0 Third Party Packages for Visual Studio .NET 2003</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b Third Party Packages for Visual Studio .NET 2003</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism index 9c590104446..caaafce7d83 100755 --- a/cpp/install/vc80/Ice.ism +++ b/cpp/install/vc80/Ice.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>##ID_STRING35##</subject>
+ <subject>Ice 3.2b for Visual Studio 2005</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING32##</comments>
@@ -253,6 +253,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>
@@ -351,6 +352,7 @@ <row><td>GAC_icepatch2cs</td><td>{7F6E4D01-1F91-4D8B-BA25-8A494FEE18C6}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport > "2.0"</td><td>icepatch2cs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>GAC_icestormcs</td><td>{E0F3C7F7-AFDD-41CA-B306-EA539739A9CB}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport > "2.0"</td><td>icestormcs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>GAC_registry</td><td>{B945C231-EF78-4737-8C8B-97DB5C086FFD}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport > "2.0"</td><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>ISRegistryComponent</td><td>{44AF097C-4731-4562-B23D-D00E062D674D}</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>IceCSharpDemo</td><td>{A4BB2878-87EF-462B-B1D0-EF5A859702FA}</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>IceCSharpDev</td><td>{A7182719-2C34-4246-8C00-C0673BE6EBF4}</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>IceCSharpRuntime</td><td>{4CA76E20-D92E-476E-A858-C93C152AC964}</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>
@@ -991,6 +993,7 @@ <col key="yes" def="s72">Component_</col>
<row><td>GlobalAssemblyCache</td><td>GAC_registry</td></row>
<row><td>INSTALLDIR</td><td>DummyComponent</td></row>
+ <row><td>INSTALLDIR</td><td>ISRegistryComponent</td></row>
</table>
<table name="CustomAction">
@@ -1002,6 +1005,10 @@ <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>CopyAssemblyPDBs</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs, icesslcs) DO copy [INSTALLDIR]bin\%f.pdb [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381</td><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>NewCustomAction1</td><td>1394</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs, icesslcs) DO del /q [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381\%f.pdb</td><td/></row>
<row><td>NewCustomAction11</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs, icesslcs) DO del /q [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381\%f.pdb</td><td/></row>
<row><td>SetARPINSTALLLOCATION</td><td>51</td><td>ARPINSTALLLOCATION</td><td>[INSTALLDIR]</td><td/></row>
@@ -1077,7 +1084,7 @@ <row><td>GAC</td><td>ASSEMBLY</td><td>GAC</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_3.1.0</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0</td><td/><td>0</td><td/></row>
- <row><td>ICE_3.2.0</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2.0</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b</td><td/><td>0</td><td/></row>
<row><td>INSTALLDIR</td><td>ICE_3.2.0</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
@@ -1308,6 +1315,7 @@ <col def="S255">ISComments</col>
<col def="S255">ISFeatureCabName</col>
<col def="S255">ISProFeatureName</col>
+ <row><td>ISRegistryFeature1</td><td/><td>ISRegistryFeature1</td><td/><td>30</td><td>1</td><td>INSTALLDIR</td><td>0</td><td/><td/><td/><td/></row>
<row><td>ice_dev_cpp</td><td>ice_runtime_cpp</td><td>##ID_STRING3##</td><td/><td>2</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>200</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>
@@ -1327,6 +1335,7 @@ <table name="FeatureComponents">
<col key="yes" def="s38">Feature_</col>
<col key="yes" def="s72">Component_</col>
+ <row><td>ISRegistryFeature1</td><td>ISRegistryComponent</td></row>
<row><td>ice_dev_cpp</td><td>IceCppDemo</td></row>
<row><td>ice_dev_cpp</td><td>IceCppDev</td></row>
<row><td>ice_dev_cpp</td><td>IceCppRuntime</td></row>
@@ -1558,6 +1567,7 @@ <row><td>GAC_icepatch2cs</td><td/><td/><td>_4148F83B_B26E_4415_A51D_5580DE431AFC_FILTER</td><td/><td/><td/><td/></row>
<row><td>GAC_icestormcs</td><td/><td/><td>_74B66A95_80BE_43A1_9A2E_508B6CBB795E_FILTER</td><td/><td/><td/><td/></row>
<row><td>GAC_registry</td><td/><td/><td>_BD3CFD91_5B86_4986_8C18_2B0C4639FCA8_FILTER</td><td/><td/><td/><td/></row>
+ <row><td>ISRegistryComponent</td><td/><td/><td>_BDAB47CC_F4BC_41E8_8C2D_408CACB43B8B_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCSharpDemo</td><td/><td/><td>_7DD0A005_2547_4846_B573_62AFE1194756_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCSharpDev</td><td/><td/><td>_3471DDA3_D6D8_440C_837A_1DF61C7914ED_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCSharpRuntime</td><td/><td/><td>_6805EC31_B95D_4271_9CAF_B0A3E38CF543_FILTER</td><td/><td/><td/><td/></row>
@@ -1839,7 +1849,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2.0-VC80</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.2b-VC80</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{D54C0499-5EC9-4756-860A-891BEAC02AE8}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{F25BF159-096C-4135-8952-ED2E35F362E1}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -2504,9 +2514,9 @@ <row><td>ID_STRING30</td><td>1033</td><td>NOTE: You must be an Admin user and have the .NET 2.0 Framework installed in order to correctly install Ice for .NET.</td><td>0</td><td/><td>1234811028</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 Ice for .NET as a result.</td><td>0</td><td/><td>1234768052</td></row>
<row><td>ID_STRING32</td><td>1033</td><td>The Internet Communications Engine (Ice) runtimes, tools, files and libraries for developing Ice applications.</td><td>0</td><td/><td>1234812724</td></row>
- <row><td>ID_STRING33</td><td>1033</td><td>Ice 3.2.0 for Visual Studio 2005</td><td>0</td><td/><td>890860527</td></row>
+ <row><td>ID_STRING33</td><td>1033</td><td>Ice 3.2b for Visual Studio 2005</td><td>0</td><td/><td>890860527</td></row>
<row><td>ID_STRING34</td><td>1033</td><td>Ice for C++</td><td>0</td><td/><td>1234802195</td></row>
- <row><td>ID_STRING35</td><td>1033</td><td>Ice 3.2.0 for Visual Studio 2005</td><td>0</td><td/><td>1712981485</td></row>
+ <row><td>ID_STRING35</td><td>1033</td><td>Ice 3.2b for Visual Studio 2005</td><td>0</td><td/><td>1712981485</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 for Java</td><td>0</td><td/><td>1234824659</td></row>
@@ -2609,6 +2619,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>
@@ -2919,8 +2933,8 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <row><td>ProductCode</td><td>{3E05FD23-8F76-4711-941B-22F52479091C}</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>Ice 3.2.0 for Visual Studio 2005</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b for Visual Studio 2005</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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>
@@ -2982,8 +2996,8 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <col def="S0">Value</col>
<col def="s72">Component_</col>
<col def="I4">ISAttributes</col>
- <row><td>Registry1</td><td>2</td><td>SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders</td><td/><td/><td>GAC_registry</td><td>0</td></row>
- <row><td>Registry3</td><td>2</td><td>SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\Ice 2.1.0</td><td/><td>[INSTALLDIR]bin</td><td>GAC_registry</td><td>0</td></row>
+ <row><td>Registry6</td><td>2</td><td>SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\Ice Assemblies</td><td/><td>[INSTALLDIR]bin</td><td>ISRegistryComponent</td><td>0</td></row>
+ <row><td>Registry7</td><td>2</td><td>SOFTWARE\Microsoft\.NETFramework\AssemblyFolders</td><td/><td/><td>ISRegistryComponent</td><td>1</td></row>
</table>
<table name="RemoveFile">
diff --git a/cpp/install/vc80/ThirdParty.ism b/cpp/install/vc80/ThirdParty.ism index 75c105bb5d6..f595a5d29dc 100755 --- a/cpp/install/vc80/ThirdParty.ism +++ b/cpp/install/vc80/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>Ice 3.2.0 Third Party Packages for Visual Studio 2005</subject>
+ <subject>Ice 3.2b Third Party Packages for Visual Studio 2005</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -1135,7 +1135,7 @@ <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>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
- <row><td>ICE_3.2.0_THIRDPARTY_VC80</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2.0-ThirdParty-VC80</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.2.0_THIRDPARTY_VC80</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.2b-ThirdParty-VC80</td><td/><td>0</td><td/></row>
<row><td>INSTALLDIR</td><td>ICE_3.2.0_THIRDPARTY_VC80</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
@@ -1791,7 +1791,7 @@ <col key="yes" def="s72">ISProductConfiguration_</col>
<col key="yes" def="s72">Property</col>
<col def="L255">Value</col>
- <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2.0-VC80</td></row>
+ <row><td>ZEROC</td><td>MSIPackageFileName</td><td>ThirdParty-3.2b-VC80</td></row>
<row><td>ZEROC</td><td>PackageCode</td><td>{86BE4F6F-D347-4810-942B-5B053A3F045D}</td></row>
<row><td>ZEROC</td><td>ProductCode</td><td>{85F1BCEA-9267-461B-97B6-AAB8BD7ECCEA}</td></row>
<row><td>ZEROC</td><td>SetupFileName</td><td/></row>
@@ -2456,7 +2456,7 @@ <row><td>ID_STRING37</td><td>1033</td><td>{&Tahoma8}InstallShield</td><td>0</td><td/><td>1033487467</td></row>
<row><td>ID_STRING38</td><td>1033</td><td>&Next ></td><td>0</td><td/><td>1033477259</td></row>
<row><td>ID_STRING39</td><td>1033</td><td>< &Back</td><td>0</td><td/><td>1033477259</td></row>
- <row><td>ID_STRING4</td><td>1033</td><td>3.2.0</td><td>0</td><td/><td>2107267722</td></row>
+ <row><td>ID_STRING4</td><td>1033</td><td>3.2b</td><td>0</td><td/><td>2107267722</td></row>
<row><td>ID_STRING40</td><td>1033</td><td>Cancel</td><td>0</td><td/><td>1033477259</td></row>
<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>
@@ -2900,8 +2900,8 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{16888E89-D574-48F5-8241-9CE2BB41CDBF}</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>Ice 3.2.0 Third Party Packages for Visual Studio 2005</td><td/></row>
- <row><td>ProductVersion</td><td>3.2.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.2b Third Party Packages for Visual Studio 2005</td><td/></row>
+ <row><td>ProductVersion</td><td>3.2.51</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>
|