- Removing PCRE comments from the INSTALL.WINDOWS file.

- Correcting the confiugre command line for the IcePHP SRPM build

9 files changed, 170 insertions, 64 deletions

diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS
index 1addc6757cd..7d69b413bba 100644
--- a/cpp/INSTALL.WINDOWS
+++ b/cpp/INSTALL.WINDOWS
@@ -49,7 +49,6 @@ Ice has dependencies on a number of third-party libraries:
 - expat 1.9x
 - OpenSSL 0.9.6 or later
 - bzip2 1.0
-- pcre 6.6
 
 If you have downloaded an Ice binary installer, you already have all 
 of the required third-party libraries and do not need to download any 
@@ -69,7 +68,6 @@ Berkeley DB     http://www.sleepycat.com/download
 expat           http://sourceforge.net/projects/expat/
 OpenSSL         http://www.openssl.org
 bzip2           http://sources.redhat.com/bzip2
-PCRE		http://www.pcre.org/
 
 For STLport installation instructions, please refer to
 http://www.stlport.org/doc/install.html
@@ -78,13 +76,7 @@ Note: For a regular build of bzip2, both the debug and the release
 library are named "libbz2.lib". In order to be able to have both a
 debug and a release version on your system, please rename the debug
 library to "libbz2d.lib". This is also what the Ice project files
-expect if you build a debug version of Ice. Please also note that
-the PCRE (Perl Compatible Regular Expression) source distribution
-from the PCRE website does not include support for compiling with
-Microsoft development tools. The PCRE sources in our third party
-sources archive include an NMAKE-compatible makefile for compiling
-with Microsoft compilers as well as a patch that can be applied to
-stock PCRE source distributions.
+expect if you build a debug version of Ice. 
 
 If you compile the third-party libraries from source code, we
 recommend that you use the same Visual C++ version to build all of
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py
index 66e92989b81..227380b94bd 100644
--- a/cpp/RPMTools.py
+++ b/cpp/RPMTools.py
@@ -680,7 +680,7 @@ export PATH=$RPM_BUILD_DIR/Ice-%{version}/bin:$PATH
 export LD_LIBRARY_PATH=$RPM_BUILD_DIR/Ice-%{version}/lib:$LD_LIBRARY_PATH
 gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT
 cd $RPM_BUILD_DIR/php-5.1.4
-./configure --with-ice=shared,$RPM_BUILD_DIR/Ice-%{version} --without-pcre-regex --without-pear
+./configure --with-ice=shared,$RPM_BUILD_DIR/Ice-%{version}
 sed -i -e 's/^EXTRA_CXXFLAGS.*$/EXTRA_CXXFLAGS = -DCOMPILE_DL_ICE/' $RPM_BUILD_DIR/php-5.1.4/Makefile
 gmake
 """)
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 684ff6039a7..865df2b44bd 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -14,8 +14,8 @@
 # protocol. Otherwise TCP is used.
 #
 
-protocol = "ssl"
-#protocol = "tcp"
+#protocol = "ssl"
+protocol = "tcp"
 
 #
 # Set compressed to 1 in case you want to run the tests with
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index 5fcf28b4ffa..9f0d7cf0780 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -165,7 +165,7 @@ dest8=bin
 [java runtime]
 elements=1
 active=1
-targets=~vc60,vc71,vc80,vc80_x64
+targets=~vc60,~vc71,vc80,vc80_x64
 source1=%(BUILD_DIR)s/IceJ-%(version)s/lib
 filelist1=ice.java.runtime
 dest1=lib
@@ -173,7 +173,7 @@ dest1=lib
 [java dev]
 elements=4
 active=1
-targets=~vc60,vc71,vc80,vc80_x64
+targets=~vc60,~vc71,vc80,vc80_x64
 source1=%(BUILD_DIR)s/IceJ-%(version)s/ant
 filelist1=ice.java.ant
 dest1=ant
@@ -193,7 +193,7 @@ dest4=certs
 [dotnet runtime]
 elements=1
 active=1
-targets=~vc60,~vc71,vc80
+targets=~vc60,vc71,vc80
 source1=%(BUILD_DIR)s/IceCS-%(version)s/bin
 filelist1=ice.dotnet.assemblies
 dest1=bin
@@ -201,7 +201,7 @@ dest1=bin
 [csharp dev]
 elements=2
 active=1
-targets=~vc60,~vc71,vc80
+targets=~vc60,vc71,vc80
 source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.csharp.dev
 dest1=bin
@@ -212,7 +212,7 @@ dest2=bin
 [vbasic dev]
 elements=2
 active=1
-targets=~vc60,~vc71,vc80
+targets=~vc60,vc71,vc80
 source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.vbasic.dev
 dest1=bin
@@ -265,15 +265,15 @@ dest1=demoj
 [csharp demo]
 elements=1
 active=1
-targets=~vc60,~vc71,vc80
+targets=~vc60,vc71,vc80
 source1=%(BUILD_DIR)s/IceCS-%(version)s/demo
-filelist1=icecs.demo
+filelist1=icecs.demo.%(target)s
 dest1=democs
 
 [vbasic demo]
 elements=1
 active=1
-targets=~vc60,~vc71,vc80
+targets=~vc60,vc71,vc80
 source1=%(BUILD_DIR)s/IceVB-%(version)s/demo
 filelist1=icevb.demo
 dest1=demovb
diff --git a/cpp/install/common/components/ice.dotnet.assemblies b/cpp/install/common/components/ice.dotnet.assemblies
index d41cac482c5..24b1549af72 100755
--- a/cpp/install/common/components/ice.dotnet.assemblies
+++ b/cpp/install/common/components/ice.dotnet.assemblies
@@ -12,15 +12,15 @@ icepatch2cs.pdb
 icestormcs.pdb
 iceboxnet.exe
 iceboxnet.pdb
-policy.3.0.glacier2cs.dll
-policy.3.0.iceboxcs.dll
-policy.3.0.icecs.dll
-policy.3.0.icegridcs.dll
-policy.3.0.icepatch2cs.dll
-policy.3.0.icestormcs.dll
-policy.3.0.glacier2cs
-policy.3.0.iceboxcs
-policy.3.0.icecs
-policy.3.0.icegridcs
-policy.3.0.icepatch2cs
-policy.3.0.icestormcs
+#policy.3.0.glacier2cs.dll
+#policy.3.0.iceboxcs.dll
+#policy.3.0.icecs.dll
+#policy.3.0.icegridcs.dll
+#policy.3.0.icepatch2cs.dll
+#policy.3.0.icestormcs.dll
+#policy.3.0.glacier2cs
+#policy.3.0.iceboxcs
+#policy.3.0.icecs
+#policy.3.0.icegridcs
+#policy.3.0.icepatch2cs
+#policy.3.0.icestormcs
diff --git a/cpp/install/common/components/icevb.demo b/cpp/install/common/components/icevb.demo
index 86862cb1645..9c4687c74e4 100755
--- a/cpp/install/common/components/icevb.demo
+++ b/cpp/install/common/components/icevb.demo
@@ -51,7 +51,7 @@ Glacier2/callback/Callback.ice
 Glacier2/callback/CallbackI.vb
 Glacier2/callback/CallbackReceiverI.vb
 Glacier2/callback/Client.vb
-Glacier2/callback/config
+Glacier2/callback/config.client
 Glacier2/callback/config.glacier2
 Glacier2/callback/config.server
 Glacier2/callback/config.sessionserver
@@ -72,7 +72,8 @@ Ice/bidir/Callback.ice
 Ice/bidir/CallbackReceiverI.vb
 Ice/bidir/CallbackSenderI.vb
 Ice/bidir/Client.vb
-Ice/bidir/config
+Ice/bidir/config.client
+Ice/bidir/config.server
 Ice/bidir/README
 Ice/bidir/Server.vb
 Ice/callback/Callback.ice
@@ -82,11 +83,13 @@ Ice/callback/CallbackReceiverI.vb
 Ice/callback/callbackSD.vbproj
 Ice/callback/CallbackSenderI.vb
 Ice/callback/Client.vb
-Ice/callback/config
+Ice/callback/config.client
+Ice/callback/config.server
 Ice/callback/README
 Ice/callback/Server.vb
 Ice/hello/Client.vb
-Ice/hello/config
+Ice/hello/config.client
+Ice/hello/config.server
 Ice/hello/Hello.ice
 Ice/hello/helloCD.vbproj
 Ice/hello/helloCommonD.vbproj
@@ -96,7 +99,8 @@ Ice/hello/README
 Ice/hello/Server.vb
 Ice/invoke/.Printer.stream
 Ice/invoke/Client.vb
-Ice/invoke/config
+Ice/invoke/config.client
+Ice/invoke/config.server
 Ice/invoke/invokeCD.vbproj
 Ice/invoke/invokeCommonD.vbproj
 Ice/invoke/invokeSD.vbproj
@@ -105,7 +109,8 @@ Ice/invoke/PrinterI.vb
 Ice/invoke/README
 Ice/invoke/Server.vb
 Ice/latency/Client.vb
-Ice/latency/config
+Ice/latency/config.client
+Ice/latency/config.server
 Ice/latency/Latency.ice
 Ice/latency/latencyCD.vbproj
 Ice/latency/latencyCommonD.vbproj
@@ -121,7 +126,8 @@ Ice/minimal/minimalSD.vbproj
 Ice/minimal/README
 Ice/minimal/Server.vb
 Ice/nested/Client.vb
-Ice/nested/config
+Ice/nested/config.client
+Ice/nested/config.server
 Ice/nested/Nested.ice
 Ice/nested/nestedCD.vbproj
 Ice/nested/nestedCommonD.vbproj
@@ -131,7 +137,8 @@ Ice/nested/README
 Ice/nested/Server.vb
 Ice/README
 Ice/session/Client.vb
-Ice/session/config
+Ice/session/config.client
+Ice/session/config.server
 Ice/session/HelloI.vb
 Ice/session/README
 Ice/session/ReapThread.vb
@@ -143,7 +150,8 @@ Ice/session/SessionFactoryI.vb
 Ice/session/SessionI.vb
 Ice/session/sessionSD.vbproj
 Ice/throughput/Client.vb
-Ice/throughput/config
+Ice/throughput/config.client
+Ice/throughput/config.server
 Ice/throughput/README
 Ice/throughput/Server.vb
 Ice/throughput/Throughput.ice
@@ -152,7 +160,8 @@ Ice/throughput/throughputCommonD.vbproj
 Ice/throughput/ThroughputI.vb
 Ice/throughput/throughputSD.vbproj
 Ice/value/Client.vb
-Ice/value/config
+Ice/value/config.client
+Ice/value/config.server
 Ice/value/DerivedPrinterI.vb
 Ice/value/InitialI.vb
 Ice/value/ObjectFactory.vb
@@ -164,7 +173,8 @@ Ice/value/valueCD.vbproj
 Ice/value/valueCommonD.vbproj
 Ice/value/valueSD.vbproj
 IceBox/hello/Client.vb
-IceBox/hello/config
+IceBox/hello/config.client
+IceBox/hello/config.icebox
 IceBox/hello/Hello.ice
 IceBox/hello/HelloI.vb
 IceBox/hello/helloIceBoxCD.vbproj
@@ -173,11 +183,35 @@ IceBox/hello/helloIceBoxSD.vbproj
 IceBox/hello/HelloServiceI.vb
 IceBox/hello/README
 IceBox/README
+IceGrid/allocate/allocateCD.vbproj
+IceGrid/allocate/allocateCommonD.vbproj
+IceGrid/allocate/allocateSD.vbproj
+IceGrid/allocate/application-multiple.xml
+IceGrid/allocate/application-single.xml
+IceGrid/allocate/Client.vb
+IceGrid/allocate/config.client
+IceGrid/allocate/config.grid
+IceGrid/allocate/Hello.ice
+IceGrid/allocate/HelloI.vb
+IceGrid/allocate/README
+IceGrid/allocate/Server.vb
+IceGrid/sessionActivation/application.xml
+IceGrid/sessionActivation/Client.vb
+IceGrid/sessionActivation/config.client
+IceGrid/sessionActivation/config.grid
+IceGrid/sessionActivation/Hello.ice
+IceGrid/sessionActivation/HelloI.vb
+IceGrid/sessionActivation/README
+IceGrid/sessionActivation/Server.vb
+IceGrid/sessionActivation/sessionActivationCD.vbproj
+IceGrid/sessionActivation/sessionActivationCommonD.vbproj
+IceGrid/sessionActivation/sessionActivationSD.vbproj
 IceGrid/simple/application.xml
 IceGrid/simple/application_with_replication.xml
 IceGrid/simple/application_with_template.xml
 IceGrid/simple/Client.vb
-IceGrid/simple/config
+IceGrid/simple/config.client
+IceGrid/simple/config.grid
 IceGrid/simple/Hello.ice
 IceGrid/simple/HelloI.vb
 IceGrid/simple/README
@@ -190,13 +224,21 @@ IceStorm/clock/clockCD.vbproj
 IceStorm/clock/clockCommonD.vbproj
 IceStorm/clock/ClockI.vb
 IceStorm/clock/clockSD.vbproj
-IceStorm/clock/config
-IceStorm/clock/config_service
+IceStorm/clock/config.icebox
+IceStorm/clock/config.pub
+IceStorm/clock/config.service
+IceStorm/clock/config.sub
 IceStorm/clock/Publisher.vb
 IceStorm/clock/README
 IceStorm/clock/Subscriber.vb
 IceStorm/README
 README
+IceGrid/allocate/db
+IceGrid/allocate/db/node
+IceGrid/allocate/db/registry
+IceGrid/sessionActivation/db
+IceGrid/sessionActivation/db/node
+IceGrid/sessionActivation/db/registry
 IceGrid/simple/db
 IceGrid/simple/db/node
 IceGrid/simple/db/registry
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py
index 1faf008b96a..2d87c21024b 100755
--- a/cpp/install/common/makewindist.py
+++ b/cpp/install/common/makewindist.py
@@ -206,7 +206,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
     prependEnvPath('LIB', os.path.join(iceHome, "lib"))
     prependEnvPath('INCLUDE', os.path.join(iceHome, "include"))
 
-    if installVersion == "vc80":
+    if installVersion in ["vc80", "vc71"]:
 	#
 	# Ice for C++ 
 	#
@@ -229,8 +229,20 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
 	#
 	os.chdir(os.path.join(sourcesDir, "IceCS-" + sourcesVersion))
 	print "Building in " + os.getcwd() + "..."
+	if installVersion == "vc71":
+	    runprog("devenv all_11.sln /useenv /build Debug")
+	else:
+	    runprog("devenv all.sln /useenv /build Debug")
+
+	#
+	# Ice for Visual Basic
+	#
+	os.chdir(os.path.join(sourcesDir, "IceVB-" + sourcesVersion))
+	print "Building in " + os.getcwd() + "..."
 	runprog("devenv all.sln /useenv /build Debug")
 
+    if installVersion == "vc80":
+
 	#
 	# Ice for PHP
 	#
@@ -264,13 +276,6 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
 	os.chdir(os.path.join(sourcesDir, "IcePy-" + sourcesVersion))
 	print "Building in " + os.getcwd() + "..."
 	runprog("devenv all.sln /useenv /build Release")
-
-	#
-	# Ice for Visual Basic
-	#
-	os.chdir(os.path.join(sourcesDir, "IceVB-" + sourcesVersion))
-	print "Building in " + os.getcwd() + "..."
-	runprog("devenv all.sln /useenv /build Debug")
     elif installVersion == "vc60":
 	#
 	# Ice for C++ 
@@ -279,7 +284,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
 	print "Building in " + os.getcwd() + "..."
 	runprog('msdev all.dsw /useenv /make "all - Win32 Debug"')
 	runprog('msdev all.dsw /useenv /make "all - Win32 Release"')
-    elif installVersion in ["vc71", "vc80_x64"]:
+    elif installVersion in ["vc80_x64"]:
 	#
 	# Ice for C++ 
 	#
diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism
index 5744f1679b2..ef38d14ac34 100755
--- a/cpp/install/vc71/Ice.ism
+++ b/cpp/install/vc71/Ice.ism
@@ -52,13 +52,13 @@
 	<summary>

 		<codepage>1252</codepage>

 		<title>Installation Database</title>

-		<subject>##ID_STRING35##</subject>

+		<subject>Ice 3.1.0 for Visual Studio .NET 2003</subject>

 		<author>##COMPANY_NAME##</author>

 		<keywords>Installer,MSI,Database</keywords>

 		<comments>##ID_STRING32##</comments>

 		<template>Intel;1033</template>

 		<lastauthor>Administrator</lastauthor>

-		<revnumber>{218A47C7-D335-4878-B9F8-95EACED26BFE}</revnumber>

+		<revnumber>{06C067F7-5F14-4E19-88B6-06D52C813769}</revnumber>

 		<lastprinted/>

 		<createdtm>06/21/1999 04:30</createdtm>

 		<lastsavedtm>07/14/2000 08:20</lastsavedtm>

@@ -343,11 +343,23 @@
 		<col def="S0">ISDotNetInstallerArgsUninstall</col>

 		<col def="S0">ISDotNetInstallerArgsRollback</col>

 		<row><td>DummyComponent</td><td>{0A8A414C-E74D-471F-AC64-DEEA8E5E4747}</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>GAC_glacier2cs</td><td>{FEC3532C-7323-4158-9E7E-5DF09630AFAE}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>glacier2cs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

+		<row><td>GAC_iceboxcs</td><td>{FCD8B61A-C27C-4746-8E42-96551103C2A5}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>iceboxcs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

+		<row><td>GAC_icecs</td><td>{C3F958D8-5F24-4437-B912-4CCAF3309A55}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>icecs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

+		<row><td>GAC_icegridcs</td><td>{863B7B37-145C-4BCA-AFD1-0636A71F6B46}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>icegridcs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

+		<row><td>GAC_icepatch2cs</td><td>{8F2DE27A-B0F5-4FE0-A27C-A6DD3C9FCA2B}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</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>{1E8D7135-C067-4CE8-943C-D21F1760E6C5}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</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>{A1BE4221-A631-4347-A8CA-3ED0AE81448A}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td/><td>1</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>

 		<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>{7FBEE10C-DD9F-4525-A1AF-6EDC938DB5FB}</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>{5CE66822-33A2-458B-8A26-A5E18E8D3D07}</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>IceVBasicDemo</td><td>{AC62A141-A625-471F-8E97-9B3D3608E463}</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>IceVBasicDev</td><td>{BCB14EA4-57EE-4A46-B6D2-86B3754A7AAB}</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>

 	</table>

 

@@ -967,6 +979,7 @@
 	<table name="CreateFolder">

 		<col key="yes" def="s72">Directory_</col>

 		<col key="yes" def="s72">Component_</col>

+		<row><td>GlobalAssemblyCache</td><td>GAC_registry</td></row>

 		<row><td>INSTALLDIR</td><td>DummyComponent</td></row>

 	</table>

 

@@ -978,6 +991,7 @@
 		<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>CopyAssemblyPDBs</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs) DO copy [INSTALLDIR]bin\%f.pdb [WindowsFolder]assembly\GAC\%f\3.0.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>

@@ -1054,9 +1068,11 @@
 		<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</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>

+		<row><td>ICE_3.0.1</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.0.1</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.1.0_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0-VC71</td><td/><td>0</td><td/></row>

-		<row><td>INSTALLDIR</td><td>ICE_3.1.0_VC71</td><td>.</td><td/><td>0</td><td/></row>

+		<row><td>INSTALLDIR</td><td>ICE_3.1.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>

 		<row><td>ISMyProductDir</td><td>WindowsVolume</td><td>ICE-2_~1|Ice-2.1.0</td><td/><td>0</td><td/></row>

@@ -1311,10 +1327,36 @@
 		<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>

+		<row><td>ice_dev_csharp</td><td>GAC_glacier2cs</td></row>

+		<row><td>ice_dev_csharp</td><td>GAC_icecs</td></row>

+		<row><td>ice_dev_csharp</td><td>GAC_icegridcs</td></row>

+		<row><td>ice_dev_csharp</td><td>GAC_icepatch2cs</td></row>

+		<row><td>ice_dev_csharp</td><td>GAC_icestormcs</td></row>

+		<row><td>ice_dev_csharp</td><td>GAC_registry</td></row>

+		<row><td>ice_dev_csharp</td><td>IceCSharpDemo</td></row>

+		<row><td>ice_dev_csharp</td><td>IceCSharpDev</td></row>

+		<row><td>ice_dev_csharp</td><td>IceCSharpRuntime</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_glacier2cs</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_icecs</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_icegridcs</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_icepatch2cs</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_icestormcs</td></row>

+		<row><td>ice_dev_vbasic</td><td>GAC_registry</td></row>

+		<row><td>ice_dev_vbasic</td><td>IceCSharpRuntime</td></row>

+		<row><td>ice_dev_vbasic</td><td>IceVBasicDemo</td></row>

+		<row><td>ice_dev_vbasic</td><td>IceVBasicDev</td></row>

 		<row><td>ice_doc</td><td>IceManual</td></row>

 		<row><td>ice_runtime</td><td>IceCppRuntime</td></row>

 		<row><td>ice_runtime</td><td>IceDoc</td></row>

 		<row><td>ice_runtime_cpp</td><td>DummyComponent</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_glacier2cs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_iceboxcs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_icecs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_icegridcs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_icepatch2cs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_icestormcs</td></row>

+		<row><td>ice_runtime_dotnet</td><td>GAC_registry</td></row>

+		<row><td>ice_runtime_dotnet</td><td>IceCSharpRuntime</td></row>

 		<row><td>packages</td><td>VisualStudioRuntime</td></row>

 	</table>

 

@@ -1330,6 +1372,12 @@
 		<col def="S255">ISBuildSourcePath</col>

 		<col def="I4">ISAttributes</col>

 		<col def="S72">ISComponentSubFolder_</col>

+		<row><td>glacier2cs.dll</td><td>GAC_glacier2cs</td><td>GLACIE~1.DLL|glacier2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\glacier2cs.dll</td><td>1</td><td/></row>

+		<row><td>iceboxcs.dll</td><td>GAC_iceboxcs</td><td>iceboxcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\iceboxcs.dll</td><td>1</td><td/></row>

+		<row><td>icecs.dll</td><td>GAC_icecs</td><td>icecs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icecs.dll</td><td>1</td><td/></row>

+		<row><td>icegridcs.dll</td><td>GAC_icegridcs</td><td>ICEGRI~1.DLL|icegridcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icegridcs.dll</td><td>1</td><td/></row>

+		<row><td>icepatch2cs.dll</td><td>GAC_icepatch2cs</td><td>ICEPAT~1.DLL|icepatch2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icepatch2cs.dll</td><td>1</td><td/></row>

+		<row><td>icestormcs.dll</td><td>GAC_icestormcs</td><td>ICESTO~1.DLL|icestormcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icestormcs.dll</td><td>1</td><td/></row>

 	</table>

 

 	<table name="FileSFPCatalog">

@@ -1483,11 +1531,23 @@
 		<col def="S0">HTTPLocation</col>

 		<col def="S0">Miscellaneous</col>

 		<row><td>DummyComponent</td><td/><td/><td>_908B4938_DF02_4FFC_8680_DAC7E8FF46AC_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>GAC_glacier2cs</td><td/><td/><td>_6791A0B1_69E0_496B_BBBB_6DD59B697B46_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>GAC_iceboxcs</td><td/><td/><td>_103DC124_CCF8_4E14_9DDB_6F0DB7AA434D_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>GAC_icecs</td><td/><td/><td>_600A5FAE_4674_435B_8700_897F353856EE_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>GAC_icegridcs</td><td/><td/><td>_C97E7F94_F395_4FC5_B575_F7AF91780FBB_FILTER</td><td/><td/><td/><td/></row>

+		<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>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>

 		<row><td>IceCppDemo</td><td/><td/><td>_FC69CAF8_66AC_4793_A8ED_AFD7D168B544_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceCppDev</td><td/><td/><td>_770F5B6A_0687_4BB0_B0D6_E1E5F6EAF0A7_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceCppRuntime</td><td/><td/><td>_DC33EA7A_C8B8_4C51_AA1A_6FA971C84A5F_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceDoc</td><td/><td/><td>_12A3BACF_1B61_45A5_928F_45572487D618_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceManual</td><td/><td/><td>_39A98665_B8A5_4D60_B66F_B6A1C75C4080_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>IceVBasicDemo</td><td/><td/><td>_955C0399_0F87_4B8F_84C1_607A66776625_FILTER</td><td/><td/><td/><td/></row>

+		<row><td>IceVBasicDev</td><td/><td/><td>_042B5FA2_6F7D_44F8_BC5A_C14BBF2AE7EE_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>VisualStudioRuntime</td><td/><td/><td>_30BA3320_69CB_4682_87F9_962EE1BF4FF1_FILTER</td><td/><td/><td/><td/></row>

 	</table>

 

@@ -1516,11 +1576,16 @@
 		<col def="S255">IncludeFiles</col>

 		<col def="S255">ExcludeFiles</col>

 		<col def="I4">ISAttributes</col>

+		<row><td>IceCSharpDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\demo</td><td>4</td><td/><td/><td>2</td></row>

+		<row><td>IceCSharpDev</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\dev</td><td>4</td><td/><td/><td>2</td></row>

+		<row><td>IceCSharpRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>IceCppDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\demo</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>IceCppDev</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\dev</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>IceCppRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\runtime</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>IceDoc</td><td>&lt;ISProjectFolder&gt;\install\ice\common\doc</td><td>4</td><td/><td/><td>0</td></row>

 		<row><td>IceManual</td><td>&lt;ISProjectFolder&gt;\install\ice\common\html</td><td>4</td><td/><td/><td>2</td></row>

+		<row><td>IceVBasicDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\vbasic\demo</td><td>4</td><td/><td/><td>2</td></row>

+		<row><td>IceVBasicDev</td><td>&lt;ISProjectFolder&gt;\install\ice\vbasic\dev</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>VisualStudioRuntime</td><td>&lt;ISProjectFolder&gt;\install\microsoft\runtime</td><td>4</td><td/><td/><td>2</td></row>

 	</table>

 

@@ -2396,7 +2461,6 @@
 		<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.1.0 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_STRING35</td><td>1033</td><td>Ice 3.1.0 for Visual Studio .NET 2003</td><td>0</td><td/><td>857375371</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>

@@ -2490,6 +2554,7 @@
 		<row><td>AppSearch</td><td/><td>400</td><td>AppSearch</td><td/></row>

 		<row><td>BindImage</td><td/><td>4300</td><td>BindImage</td><td/></row>

 		<row><td>CCPSearch</td><td>CCP_TEST</td><td>500</td><td>CCPSearch</td><td/></row>

+		<row><td>CopyAssemblyPDBs</td><td>(&amp;ice_dev_csharp=3) Or (&amp;ice_dev_vbasic=3)</td><td>6275</td><td/><td/></row>

 		<row><td>CostFinalize</td><td/><td>1000</td><td>CostFinalize</td><td/></row>

 		<row><td>CostInitialize</td><td/><td>800</td><td>CostInitialize</td><td/></row>

 		<row><td>CreateFolders</td><td/><td>3700</td><td>CreateFolders</td><td/></row>

@@ -2808,10 +2873,10 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA=
 		<row><td>NewProperty1</td><td>0</td><td/></row>

 		<row><td>NewProperty2</td><td>0</td><td/></row>

 		<row><td>PIDTemplate</td><td>12345&lt;###-%%%%%%%&gt;@@@@@</td><td/></row>

-		<row><td>ProductCode</td><td>{44261EF1-DF2C-4680-A5F5-F785A1D18400}</td><td/></row>

+		<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.1.0 for Visual Studio .NET 2003</td><td/></row>

+		<row><td>ProductName</td><td>Ice</td><td/></row>

 		<row><td>ProductVersion</td><td>3.1.0</td><td/></row>

 		<row><td>ProgressType0</td><td>install</td><td/></row>

 		<row><td>ProgressType1</td><td>Installing</td><td/></row>

@@ -2821,7 +2886,7 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA=
 		<row><td>ReinstallModeText</td><td>omus</td><td/></row>

 		<row><td>SHOWLAUNCHPROGRAM</td><td>0</td><td/></row>

 		<row><td>SetupType</td><td>Typical</td><td/></row>

-		<row><td>UpgradeCode</td><td>{31D74A25-BBAF-40C5-9541-7B4A80D58C59}</td><td/></row>

+		<row><td>UpgradeCode</td><td>{3843FC3E-DCB3-47D2-8554-B5FAA7C5B591}</td><td/></row>

 		<row><td>_IsMaintenance</td><td>Change</td><td/></row>

 		<row><td>_IsSetupTypeMin</td><td>Typical</td><td/></row>

 	</table>

@@ -2874,6 +2939,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>

 	</table>

 

 	<table name="RemoveFile">

diff --git a/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism
index 31a4a0a2870..9541dd3329e 100755
--- a/cpp/install/vc80/Ice.ism
+++ b/cpp/install/vc80/Ice.ism
@@ -343,7 +343,7 @@
 		<col def="S0">ISDotNetInstallerArgsUninstall</col>

 		<col def="S0">ISDotNetInstallerArgsRollback</col>

 		<row><td>DummyComponent</td><td>{0A8A414C-E74D-471F-AC64-DEEA8E5E4747}</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>GAC_glacier2cs</td><td>{FEC3532C-7323-4158-9E7E-5DF09630AFAE}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>glacier2cs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

+		<row><td>GAC_glacier2cs</td><td>{FEC3532C-7323-4158-9E7E-5DF09630AFAE}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;= "2.0"</td><td>glacier2cs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

 		<row><td>GAC_glacier2cspolicy</td><td>{E1714C2B-8B5A-4C9D-BDBE-A86BB83313DB}</td><td>GlobalAssemblyCache</td><td>8</td><td/><td>policy.3.0.glacier2cs.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

 		<row><td>GAC_iceboxcs</td><td>{FCD8B61A-C27C-4746-8E42-96551103C2A5}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "1.1.4322"</td><td>iceboxcs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>

 		<row><td>GAC_iceboxcspolicy</td><td>{CC250EAD-98F7-4DFA-9928-7FB7AFC93E33}</td><td>GlobalAssemblyCache</td><td>8</td><td/><td>policy.3.0.iceboxcs.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>