diff options
| -rwxr-xr-x | distribution/src/thirdparty/README.txt | 6 | ||||
| -rwxr-xr-x | distribution/src/windows/vc60/ThirdParty.ism | 4 | ||||
| -rwxr-xr-x | distribution/src/windows/vc80/Ice.ism | 10 | ||||
| -rwxr-xr-x | distribution/src/windows/vc80/ThirdParty.ism | 6 | ||||
| -rwxr-xr-x | distribution/src/windows/vc90/ThirdParty.ism | 9 |
5 files changed, 21 insertions, 14 deletions
diff --git a/distribution/src/thirdparty/README.txt b/distribution/src/thirdparty/README.txt index 1527ba33e7d..c5a559017bd 100755 --- a/distribution/src/thirdparty/README.txt +++ b/distribution/src/thirdparty/README.txt @@ -102,6 +102,12 @@ Users of Visual Studio 2008 must remove bufferoverflowU.lib from the linker input "Additional Dependencies" in most projects when building on x64. +When building the debug version of the Berkeley DB DLL (db_dll project), +you should also remove the "DIAGNOSTIC" define and the +/export:__db_assert linker option. With the default settings, the Berkeley +DB environments created with the debug DB DLL are not compatible with +the environments created with the release DB DLL. + For installation instructions, please refer to http://www.oracle.com/technology/documentation/berkeley-db/db/ref/build_win/intro.html diff --git a/distribution/src/windows/vc60/ThirdParty.ism b/distribution/src/windows/vc60/ThirdParty.ism index 6244d6d81ec..0ae6d3f6f1f 100755 --- a/distribution/src/windows/vc60/ThirdParty.ism +++ b/distribution/src/windows/vc60/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>Installation Database</title>
- <subject>Ice 3.3 beta Third Party Packages for Visual Studio 6.0</subject>
+ <subject>Ice 3.3b Third Party Packages for Visual Studio 6.0</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -2986,7 +2986,7 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{C2784E71-50C7-4F54-A439-EEE9BA2DD42C}</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.3 beta Third Party Packages for Visual Studio 6.0</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.3b Third Party Packages for Visual Studio 6.0</td><td/></row>
<row><td>ProductVersion</td><td>3.3.51</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
diff --git a/distribution/src/windows/vc80/Ice.ism b/distribution/src/windows/vc80/Ice.ism index 9c102d1b3f1..5919e40a73d 100755 --- a/distribution/src/windows/vc80/Ice.ism +++ b/distribution/src/windows/vc80/Ice.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>##ID_STRING42##</title>
- <subject>Ice 3.3 beta for Visual Studio 2005</subject>
+ <subject>Ice 3.3b for Visual Studio 2005</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING32##</comments>
@@ -2433,9 +2433,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 the Ice for .NET assemblies in the GAC as a result.</td><td>0</td><td/><td>563929711</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.3 beta for Visual Studio 2005</td><td>0</td><td/><td>890860527</td></row>
+ <row><td>ID_STRING33</td><td>1033</td><td>Ice 3.3b 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.3 beta for Visual Studio 2005</td><td>0</td><td/><td>1712981485</td></row>
+ <row><td>ID_STRING35</td><td>1033</td><td>Ice 3.3b for Visual Studio 2005</td><td>0</td><td/><td>1712981485</td></row>
<row><td>ID_STRING36</td><td>1033</td><td>Ice for C++, Java, .NET and Python</td><td>0</td><td/><td>563881742</td></row>
<row><td>ID_STRING37</td><td>1033</td><td>All you need to run and develop Ice for C++, Java, .NET and Python applications</td><td>0</td><td/><td>563879726</td></row>
<row><td>ID_STRING38</td><td>1033</td><td>Ice for .NET assemblies (GAC)</td><td>0</td><td/><td>563886389</td></row>
@@ -2443,7 +2443,7 @@ <row><td>ID_STRING4</td><td>1033</td><td>C++ Demos</td><td>0</td><td/><td>-1457943126</td></row>
<row><td>ID_STRING40</td><td>1033</td><td>Microsoft C/C++ runtime x86</td><td>0</td><td/><td>563925071</td></row>
<row><td>ID_STRING41</td><td>1033</td><td>Install this feature to run Ice for C++ executables on a system without Visual Studio</td><td>0</td><td/><td>1369226160</td></row>
- <row><td>ID_STRING42</td><td>1033</td><td>Ice 3.3 beta for Visual Studio 2005</td><td>0</td><td/><td>1369200943</td></row>
+ <row><td>ID_STRING42</td><td>1033</td><td>Ice 3.3b for Visual Studio 2005</td><td>0</td><td/><td>1369200943</td></row>
<row><td>ID_STRING43</td><td>1033</td><td>support@zeroc.com</td><td>0</td><td/><td>1369178447</td></row>
<row><td>ID_STRING44</td><td>1033</td><td>http://www.zeroc.com/support.html</td><td>0</td><td/><td>1369192815</td></row>
<row><td>ID_STRING45</td><td>1033</td><td>+1 561 283-1480</td><td>0</td><td/><td>1369205103</td></row>
@@ -2858,7 +2858,7 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <row><td>ProductCode</td><td>{798018BC-B1DD-4663-8E7B-71C5D07BCFA5}</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.3 beta for Visual Studio 2005</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.3b for Visual Studio 2005</td><td/></row>
<row><td>ProductVersion</td><td>3.3.51</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
diff --git a/distribution/src/windows/vc80/ThirdParty.ism b/distribution/src/windows/vc80/ThirdParty.ism index 9e8378fa7aa..ed1ff73d04d 100755 --- a/distribution/src/windows/vc80/ThirdParty.ism +++ b/distribution/src/windows/vc80/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>##ID_STRING10##</title>
- <subject>Ice 3.3 beta Third Party Packages for Visual Studio 2005</subject>
+ <subject>Ice 3.3b Third Party Packages for Visual Studio 2005</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -2458,7 +2458,7 @@ <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.2.0 Third Party Packages for Visual Studio 2005</td><td>0</td><td/><td>857343407</td></row>
- <row><td>ID_STRING10</td><td>1033</td><td>Ice 3.3 beta Third Party Packages for Visual Studio 2005</td><td>0</td><td/><td>1369225426</td></row>
+ <row><td>ID_STRING10</td><td>1033</td><td>Ice 3.3b Third Party Packages for Visual Studio 2005</td><td>0</td><td/><td>1369225426</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>
@@ -2930,7 +2930,7 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{BE3E8AE3-A25D-471F-88EF-3D7074E07F5A}</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.3 beta Third Party Packages for Visual Studio 2005</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.3b Third Party Packages for Visual Studio 2005</td><td/></row>
<row><td>ProductVersion</td><td>3.3.51</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
diff --git a/distribution/src/windows/vc90/ThirdParty.ism b/distribution/src/windows/vc90/ThirdParty.ism index 924e592c4de..71c1a46d6b9 100755 --- a/distribution/src/windows/vc90/ThirdParty.ism +++ b/distribution/src/windows/vc90/ThirdParty.ism @@ -52,7 +52,7 @@ <summary>
<codepage>1252</codepage>
<title>##ID_STRING10##</title>
- <subject>Ice 3.3 beta Third Party Packages for Visual Studio 2008</subject>
+ <subject>##ID_STRING17##</subject>
<author>##COMPANY_NAME##</author>
<keywords>Installer,MSI,Database</keywords>
<comments>##ID_STRING5##</comments>
@@ -2458,13 +2458,14 @@ <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.2.0 Third Party Packages for Visual Studio 2008</td><td>0</td><td/><td>857343407</td></row>
- <row><td>ID_STRING10</td><td>1033</td><td>Ice 3.3 beta Third Party Packages for Visual Studio 2008</td><td>0</td><td/><td>1369225426</td></row>
+ <row><td>ID_STRING10</td><td>1033</td><td>Ice 3.3b Third Party Packages for Visual Studio 2008</td><td>0</td><td/><td>-1583598194</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>
<row><td>ID_STRING14</td><td>1033</td><td>&Next ></td><td>0</td><td/><td>1033471019</td></row>
<row><td>ID_STRING15</td><td>1033</td><td>< &Back</td><td>0</td><td/><td>1033471019</td></row>
<row><td>ID_STRING16</td><td>1033</td><td>Cancel</td><td>0</td><td/><td>1033471019</td></row>
+ <row><td>ID_STRING17</td><td>1033</td><td>Ice 3.3b Third Party Packages for Visual Studio 2008</td><td>0</td><td/><td>-1583587954</td></row>
<row><td>ID_STRING19</td><td>1033</td><td>[ProductName] - InstallShield Wizard</td><td>0</td><td/><td>1033471019</td></row>
<row><td>ID_STRING2</td><td>1033</td><td>ZeroC</td><td>0</td><td/><td>-1860585904</td></row>
<row><td>ID_STRING20</td><td>1033</td><td>{&MSSWhiteSerif8}InstallShield</td><td>0</td><td/><td>1033471019</td></row>
@@ -2493,7 +2494,7 @@ <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>
- <row><td>ID_STRING9</td><td>1033</td><td>Microsoft C/C++ runtime (shared installation)</td><td>0</td><td/><td>563928778</td></row>
+ <row><td>ID_STRING9</td><td>1033</td><td>Microsoft C/C++ runtime</td><td>0</td><td/><td>-1583559378</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>Please read the following license agreement carefully.</td><td>0</td><td/><td>1033487371</td></row>
<row><td>NEW_STRING10</td><td>1033</td><td>{&MSSansBold8}License Agreement</td><td>0</td><td/><td>1033456747</td></row>
@@ -2930,7 +2931,7 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA <row><td>ProductCode</td><td>{64A69196-1E6B-4D53-B321-80FF6E07F018}</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.3 beta Third Party Packages for Visual Studio 2008</td><td/></row>
+ <row><td>ProductName</td><td>Ice 3.3b Third Party Packages for Visual Studio 2008</td><td/></row>
<row><td>ProductVersion</td><td>3.3.51</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
|