- Fixes to makemsi.py to support new directory structure.

- Add missing component list files.
- Update version numbers in VC80 project
- Remove IceSSL for C# (currently under development and removed from build).

14 files changed, 153 insertions, 174 deletions

diff --git a/distribution/bin/makemsi.py b/distribution/bin/makemsi.py
index cd32d011b11..88115a98833 100755
--- a/distribution/bin/makemsi.py
+++ b/distribution/bin/makemsi.py
@@ -10,9 +10,12 @@
 
 import getopt, os, re, shutil, string, sys, zipfile, fileinput
 import logging, cStringIO, glob
-import components
 import textwrap
 
+resources = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..", "src", "windows")
+sys.path.append(resources)
+import components
+
 # 
 # Current default third party library versions.
 #
@@ -22,8 +25,7 @@ STLPortVer = '4.6.2'
 ExpatVer = '2.0.0'
 DBVer = '4.5.20'
 
-DistPrefixes = ["Ice-%s", "IceJ-%s-java2", "IceJ-%s-java5", "IceCS-%s", "IcePy-%s", "IcePHP-%s", "IceVB-%s", 
-        "IceRuby-%s"]
+DistPrefixes = ["Ice-%s"]
 
 class DistEnvironmentError:
     def __init__(self, msg = None):
@@ -112,8 +114,10 @@ def checkSources(buildDir, sourceDir):
     installFiles = os.path.join(buildDir, "install")
     if not os.path.exists(installFiles):
         os.mkdir(os.path.join(buildDir, "install"))
-    result = os.system("gzip -dc " + os.path.join(os.path.join(sourceDir, "distfiles.tar.gz")) + " | tar xf - -C " +
-                       installFiles)
+    command = 'bash -c "gzip -dc `cygpath ' + \
+            os.path.join(os.path.join(sourceDir, "distfiles.tar.gz")).replace("\\", r'/') + \
+            "` | tar xf - -C " + installFiles.replace("\\", r'/') + '"' 
+    result = os.system(command)
     if result != 0:
         print "Unable to extract distfile.tar.gz"
         sys.exit(1)
@@ -195,16 +199,12 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
     prependEnvPathList('INCLUDE', include)
 
     #
-    # XXX Rewrite starts here.
-    #
-
-    #
     # Run debug builds first.
     #
     origPath = os.environ['PATH']
     origLib = os.environ['LIB']
     origInclude = os.environ['INCLUDE']
-    iceHome = os.path.join(sourcesDir, "debug", "Ice-%s" % sourcesVersion)
+    iceHome = os.path.join(sourcesDir, "debug", "Ice-%s" % sourcesVersion, "cpp")
     os.environ['ICE_HOME'] = iceHome
     prependEnvPath('PATH', os.path.join(iceHome, "bin"))
     prependEnvPath('LIB', os.path.join(iceHome, "lib"))
@@ -214,14 +214,17 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
     setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False)
     os.chdir(os.path.join(iceHome, "src"))
     runprog("nmake /f Makefile.mak")
-    os.chdir(os.path.join(iceHome, "test"))
-    runprog("nmake /f Makefile.mak")
+    # 
+    # NOTE: Uncomment to build tests every time.
+    #
+    # os.chdir(os.path.join(iceHome, "test"))
+    # runprog("nmake /f Makefile.mak")
 
     if installVersion in ["vc80"]:
         #
         # Ice for C#
         #
-        os.chdir(os.path.join(sourcesDir, "debug", "IceCS-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "debug", "Ice-%s" % sourcesVersion, "cs" ))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), False)
         setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), True)
@@ -231,25 +234,22 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
         #
         # Ice for Visual Basic
         #
-        os.chdir(os.path.join(sourcesDir, "debug", "IceVB-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "debug", "Ice-%s" % sourcesVersion, "vb" ))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), False)
-        f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), True)
-        for l in f:
-            i = l.find("\\cs\\") 
-            if i <> -1:
-                print l.rstrip('\n').replace("\\cs\\", "\\IceCS-%s\\" % sourcesVersion)
-            else:
-                print l.rstrip('\n')
+        #f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), True)
+        #for l in f:
+        #    i = l.find("\\cs\\") 
+        ##    if i <> -1:
+        #        print l.rstrip('\n').replace("\\cs\\", "\\Ice-%s\\" % sourcesVersion)
+        #    else:
+        #        print l.rstrip('\n')
 
-        f.close()
+        #f.close()
 
         runprog("nmake /f Makefile.mak")
 
-        #
-        # Ice for C#
-        #
-        os.chdir(os.path.join(sourcesDir, "release", "IceCS-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion, "cs" ))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), True)
         setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), False)
@@ -258,18 +258,18 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
         #
         # Ice for Visual Basic
         #
-        os.chdir(os.path.join(sourcesDir, "release", "IceVB-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion, "vb"))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), True)
-        f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), True)
-        for l in f:
-            i = l.find("\\cs\\") 
-            if i <> -1:
-                print l.rstrip('\n').replace("\\cs\\", "\\IceCS-%s\\" % sourcesVersion)
-            else:
-                print l.rstrip('\n')
+        #f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak.vb"), True)
+        #for l in f:
+        #    i = l.find("\\cs\\") 
+        #    if i <> -1:
+        #        print l.rstrip('\n').replace("\\cs\\", "\\Ice-%s\\" % sourcesVersion)
+        #    else:
+        #        print l.rstrip('\n')
 
-        f.close()
+        #f.close()
 
         runprog("nmake /f Makefile.mak")
 
@@ -280,7 +280,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
     os.environ['LIB'] = origLib
     os.environ['INCLUDE'] = origInclude
 
-    iceHome = os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion)
+    iceHome = os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion, "cpp")
     os.environ['ICE_HOME'] = iceHome
     prependEnvPath('PATH', os.path.join(iceHome, "bin"))
     prependEnvPath('LIB', os.path.join(iceHome, "lib"))
@@ -290,8 +290,11 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
     setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
     os.chdir(os.path.join(iceHome, "src"))
     runprog("nmake /f Makefile.mak")
-    os.chdir(os.path.join(iceHome, "test"))
-    runprog("nmake /f Makefile.mak")
+    #os.chdir(os.path.join(iceHome, "test"))
+    #runprog("nmake /f Makefile.mak")
+    #
+    # Make sure there are no unwanted demo build files kicking around.
+    #
     os.chdir(os.path.join(iceHome, "demo"))
     runprog("nmake /f Makefile.mak clean")
 
@@ -303,11 +306,17 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
         prependEnvPath('LIB', os.path.join(pythonHome, "libs"))
         prependEnvPath('INCLUDE', os.path.join(pythonHome, "include"))
 
-        os.chdir(os.path.join(sourcesDir, "release", "IcePy-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-" + sourcesVersion, "py"))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
         runprog("nmake /f Makefile.mak")
 
+        #
+        # Ice for C#
+        #
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion, "java" ))
+        print "Building in " + os.getcwd() + "..."
+        runprog("ant -Dice.mapping=java2")
         
     if installVersion == "vc60":
         #
@@ -329,11 +338,11 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
         ]
         prependEnvPathList('INCLUDE', phpInc)
 
-        os.chdir(os.path.join(sourcesDir, "release", "IcePHP-" + sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-" + sourcesVersion, "php"))
         print "Building in " + os.getcwd() + "..."
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
         runprog("nmake /f Makefile.mak") 
-        os.chdir(os.path.join(sourcesDir, "release", "IceRuby-%s" % sourcesVersion))
+        os.chdir(os.path.join(sourcesDir, "release", "Ice-%s" % sourcesVersion, "ruby" ))
         setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
         print "Building in " + os.getcwd() + "..."
         runprog("nmake /f Makefile.mak") 
@@ -648,7 +657,7 @@ def main():
         # Where all the files will be staged so that the install projects
         # can find them.
         #
-        targetDir = os.path.join(installDir, target)
+        targetDir = os.path.join(installDir, "src", "windows", target)
         stageDir = os.path.join(targetDir, "install")
 
         logging.info("Install Tool: " + installDir)
@@ -703,7 +712,7 @@ libraries."""
         #
         # Gather and generate license files.
         #
-        convertLicensesToRTF(os.path.dirname(__file__), target)
+        convertLicensesToRTF(resources, target)
 
         #
         # The third party packages need to be staged before building the
diff --git a/distribution/src/windows/components/berkeleydb.dev.dll b/distribution/src/windows/components/berkeleydb.dev.dll
new file mode 100755
index 00000000000..c2555ade3a8
--- /dev/null
+++ b/distribution/src/windows/components/berkeleydb.dev.dll
@@ -0,0 +1 @@
+f,build_windows/Debug/libdb%(dbver)sd.dll

diff --git a/distribution/src/windows/components/berkeleydb.dev.lib b/distribution/src/windows/components/berkeleydb.dev.lib
new file mode 100755
index 00000000000..f01d725f005
--- /dev/null
+++ b/distribution/src/windows/components/berkeleydb.dev.lib
@@ -0,0 +1,2 @@
+f,build_windows/Debug/libdb%(dbver)sd.lib

+f,build_windows/Release/libdb%(dbver)s.lib

diff --git a/distribution/src/windows/components/berkeleydb.java.dll b/distribution/src/windows/components/berkeleydb.java.dll
new file mode 100755
index 00000000000..8836eb5d213
--- /dev/null
+++ b/distribution/src/windows/components/berkeleydb.java.dll
@@ -0,0 +1 @@
+f,build_windows/Release/libdb_java%(dbver)s.dll

diff --git a/distribution/src/windows/components/bzip2.dev.lib b/distribution/src/windows/components/bzip2.dev.lib
new file mode 100755
index 00000000000..2cfeb4b18e4
--- /dev/null
+++ b/distribution/src/windows/components/bzip2.dev.lib
@@ -0,0 +1,2 @@
+libbz2.lib
+libbz2d.lib
diff --git a/distribution/src/windows/components/components.ini b/distribution/src/windows/components/components.ini
index 226b8a99320..11b7b294ec3 100755
--- a/distribution/src/windows/components/components.ini
+++ b/distribution/src/windows/components/components.ini
@@ -20,7 +20,6 @@ ice-python-dev=python dev
 ice-python-runtime=python runtime
 ice-php-extension=php runtime
 ice-php-demo=php demo
-ice-vbasic-dev=vbasic dev
 ice-vbasic-demo=vbasic demo
 ice-cpp-demo=c++ demo
 bzip2-debug-dll=bzip2 debug dll
@@ -47,36 +46,36 @@ microsoft-runtime=microsoft runtime
 packages-common=ice packages common
 
 [ice common]
-elements=5
+elements=4
 active=1
-source1=%(INSTALL_TOOLS)s/common
+source1=%(INSTALL_TOOLS)s/src/windows
 filelist1=installer.data
 dest1=./
-source2=%(INSTALL_TOOLS)s/%(target)s/doc
+source2=%(INSTALL_TOOLS)s/src/windows/%(target)s/doc
 filelist2=installer.docs
 dest2=doc
 processor2=fixVersion
 source3=%(BUILD_DIR)s/release/Ice-%(version)s
 filelist3=ice.license
 dest3=doc
-source4=%(INSTALL_TOOLS)s/common/docs/%(target)s
+source4=%(INSTALL_TOOLS)s/src/windows/docs/%(target)s
 filelist4=generated.installer.docs
 dest4=doc
 processor4=fixVersion
-source5=%(BUILD_DIR)s/install
-filelist5=relnotes
-dest5=doc
+#source5=%(BUILD_DIR)s/install
+#filelist5=relnotes
+#dest5=doc
 
 [ice packages common]
 elements=3
 active=1
-source1=%(INSTALL_TOOLS)s/common
+source1=%(INSTALL_TOOLS)s/src/windows
 filelist1=packages.data
 dest1=.
-source2=%(INSTALL_TOOLS)s/common/docs/%(target)s
+source2=%(INSTALL_TOOLS)s/src/windows/docs/%(target)s
 filelist2=packages.docs.%(target)s
 dest2=.
-source3=%(INSTALL_TOOLS)s/common/docs/%(target)s
+source3=%(INSTALL_TOOLS)s/src/windows/docs/%(target)s
 filelist3=packages.licenses.%(target)s
 dest3=doc
 
@@ -85,16 +84,16 @@ elements=11
 active=1
 
 ;;
-;; DLL files that are installed as part of the runtime. 
+;; DLL files that are installed as part of the runtime.
 ;;
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist1=ice.runtime.dlls
 filetemplate1=f,%(name)s%(dllversion)s.dll
 dest1=bin
 ;;
 ;; EXE files that are installed as part of the runtime.
 ;;
-source2=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source2=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist2=ice.runtime.exes
 filetemplate2=%(name)s
 dest2=bin
@@ -112,11 +111,11 @@ source4=%(BUILD_DIR)s/release/Ice-%(version)s/certs
 filelist4=ice.runtime.certs
 dest4=certs
 
-source5=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source5=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist5=ice.runtime.icestormservice
 dest5=bin
 
-source6=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/lib
+source6=%(BUILD_DIR)s/release/Ice-%(version)s/java/lib
 filelist6=icegridgui
 dest6=bin
 
@@ -124,97 +123,94 @@ source7=%(BUILD_DIR)s/release/Ice-%(version)s/config
 filelist7=ice.config.files
 dest7=config
 
-source8=%(BUILD_DIR)s/release/Ice-%(version)s/src/ca
+source8=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/src/ca
 filelist8=ice.ca.files
 dest8=bin
 
-source9=%(BUILD_DIR)s/release/Ice-%(version)s/config
+source9=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/config
 filelist9=sample.config.files
 dest9=config
 processor9=fixVersion
 
-source10=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/resources
+source10=%(BUILD_DIR)s/release/Ice-%(version)s/java/resources
 filelist10=icegrid.help
 dest10=help
 
-source11=%(BUILD_DIR)s/release/Ice-%(version)s
+source11=%(BUILD_DIR)s/release/Ice-%(version)s/cpp
 filelist11=ice.service.readme
 dest11=.
 
 [ice dev]
 elements=8
 active=1
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist1=ice.dev.exes
 filetemplate1=%(name)s.exe
 dest1=bin
 ;;
 ;; Header files.
 ;;
-source2=%(BUILD_DIR)s/release/Ice-%(version)s/include
+source2=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/include
 filelist2=ice.headers
 filetemplate2=%(name)s.h
 dest2=include
 
-source3=%(BUILD_DIR)s/debug/Ice-%(version)s/bin
+source3=%(BUILD_DIR)s/debug/Ice-%(version)s/cpp/bin
 filelist3=ice.runtime.dlls
 filetemplate3=%(name)s%(dllversion)sd.dll
 dest3=bin
 
-source4=%(BUILD_DIR)s/debug/Ice-%(version)s/bin
+source4=%(BUILD_DIR)s/debug/Ice-%(version)s/cpp/bin
 filelist4=ice.runtime.dlls
 filetemplate4=%(name)s%(dllversion)sd.pdb
 dest4=bin
 
-source5=%(BUILD_DIR)s/release/Ice-%(version)s/lib
+source5=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/lib
 filelist5=ice.runtime.dlls
 filetemplate5=%(name)s.lib
 dest5=lib
 
-source6=%(BUILD_DIR)s/debug/Ice-%(version)s/lib
+source6=%(BUILD_DIR)s/debug/Ice-%(version)s/cpp/lib
 filelist6=ice.runtime.dlls
 filetemplate6=%(name)sd.lib
 dest6=lib
 
-source7=%(BUILD_DIR)s/debug/Ice-%(version)s/bin
+source7=%(BUILD_DIR)s/debug/Ice-%(version)s/cpp/bin
 filelist7=ice.dev.exes.debug
 filetemplate7=%(name)sd.exe
 dest7=bin
 
-source8=%(BUILD_DIR)s/debug/Ice-%(version)s/bin
+source8=%(BUILD_DIR)s/debug/Ice-%(version)s/cpp/bin
 filelist8=ice.dev.exes.debug
 filetemplate8=%(name)sd.pdb
 dest8=bin
 
 [java runtime]
-elements=2
+elements=1
 active=1
 targets=~vc60,~vc71,vc80,vc80_x64
-source1=%(BUILD_DIR)s/release/IceJ-%(version)s-java5/lib
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/java/lib
 filelist1=ice.java.runtime
 dest1=lib
-source2=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/lib
-filelist2=ice.java.runtime
-dest2=lib/java2
 
 [java dev]
 elements=4
 active=1
 targets=~vc60,~vc71,vc80,vc80_x64
-source1=%(BUILD_DIR)s/release/IceJ-%(version)s-java5/ant
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/java/ant
 filelist1=ice.java.ant
 dest1=ant
 
-source2=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source2=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist2=ice.java.exes
 filetemplate2=%(name)s.exe
 dest2=bin
 
-source3=%(BUILD_DIR)s/release/IceJ-%(version)s-java5/config
+source3=%(BUILD_DIR)s/release/Ice-%(version)s/java/config
 filelist3=ice.java.config
 dest3=config
 
-source4=%(BUILD_DIR)s/release/IceJ-%(version)s-java5/certs
+source4=%(BUILD_DIR)s/release/Ice-%(version)s/certs
 filelist4=ice.java.certs
 dest4=certs
 
@@ -222,7 +218,7 @@ dest4=certs
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+source1=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 filelist1=ice.dotnet.assemblies
 dest1=bin
 
@@ -230,69 +226,59 @@ dest1=bin
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+source1=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 filelist1=ice.dotnet.pdbs
 dest1=bin
 
+#
+# This component is currently partially removed from the distribution. It is not being built by the source distribution
+# because it is under development.
+#
 [dotnet ssl]
 elements=2
-active=1
-targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+active=0
+targets=~vc60,~vc71,~vc80
+source1=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 filelist1=ice.dotnet.ssl
 filetemplate1=%(name)s.dll
 dest1=bin
-source2=%(BUILD_DIR)s/debug/IceCS-%(version)s/certs
+source2=%(BUILD_DIR)s/debug/Ice-%(version)s/certs
 filelist2=ice.dotnet.certs
 dest2=certs
 # 
 # Patch updates will require policy assemblies.
 #
 #filelist3=ice.dotnet.ssl
-#source3=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+#source3=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 #filetemplate3=policy.3.2.%(name)s.dll
 #dest3=bin
 #filelist4=ice.dotnet.ssl
-#source4=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+#source4=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 #filetemplate4=policy.3.2.%(name)s
 #dest4=bin
 
 [dotnet ssl dev]
 elements=1
-active=1
-targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/debug/IceCS-%(version)s/bin
+active=0
+targets=~vc60,~vc71,~vc80
+source1=%(BUILD_DIR)s/debug/Ice-%(version)s/cs/bin
 filelist1=ice.dotnet.ssl
 filetemplate1=%(name)s.pdb
 dest1=bin
 
 [csharp dev]
-elements=2
+elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist1=ice.csharp.dev
 dest1=bin
-source2=%(BUILD_DIR)s/release/IceCS-%(version)s/bin
-filelist2=ice.csharp.tools
-dest2=bin
-
-[vbasic dev]
-elements=2
-active=1
-targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
-filelist1=ice.vbasic.dev
-dest1=bin
-source2=%(BUILD_DIR)s/release/IceVB-%(version)s/bin
-filelist2=ice.vbasic.tools
-dest2=bin
 
 [php runtime]
 elements=1
 active=1
 targets=vc60,~vc71,~vc80
-source1=%(BUILD_DIR)s/release/IcePHP-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/php/bin
 filelist1=ice.php.runtime
 dest1=bin
 
@@ -300,10 +286,10 @@ dest1=bin
 elements=2
 active=1
 targets=vc60
-source1=%(BUILD_DIR)s/release/IceRuby-%(version)s/ruby
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/rb/ruby
 filelist1=ice.ruby.ruby
 dest1=ruby
-source2=%(BUILD_DIR)s/release/IceRuby-%(version)s/ruby
+source2=%(BUILD_DIR)s/release/Ice-%(version)s/rb/ruby
 filelist2=ice.ruby.module
 dest2=ruby
 
@@ -311,7 +297,7 @@ dest2=ruby
 elements=1
 active=1
 targets=vc60
-source1=%(BUILD_DIR)s/release/IceRuby-%(version)s/demo/
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/rb/demo/
 filelist1=ice.ruby.demo
 dest1=demorb
 
@@ -319,7 +305,7 @@ dest1=demorb
 elements=1
 active=1
 targets=vc60
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist1=ice.ruby.dev
 dest1=bin
 
@@ -327,10 +313,10 @@ dest1=bin
 elements=2
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/IcePy-%(version)s/python
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/py/python
 filelist1=ice.python.python
 dest1=python
-source2=%(BUILD_DIR)s/release/IcePy-%(version)s/python
+source2=%(BUILD_DIR)s/release/Ice-%(version)s/py/python
 filelist2=ice.python.module
 dest2=python
 
@@ -338,14 +324,14 @@ dest2=python
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/bin
 filelist1=ice.python.dev
 dest1=bin
 
 [c++ demo]
 elements=1
 active=1
-source1=%(BUILD_DIR)s/release/Ice-%(version)s/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cpp/demo
 filelist1=ice.demo.%(target)s
 dest1=demo
 
@@ -353,7 +339,7 @@ dest1=demo
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/java/demo
 filelist1=icej.demo
 dest1=demoj
 
@@ -361,7 +347,7 @@ dest1=demoj
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/IceCS-%(version)s/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/cs/demo
 filelist1=icecs.demo.%(target)s
 dest1=democs
 
@@ -369,7 +355,7 @@ dest1=democs
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/IceVB-%(version)s/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/vb/demo
 filelist1=icevb.demo
 dest1=demovb
 
@@ -377,7 +363,7 @@ dest1=demovb
 elements=1
 active=1
 targets=vc60,~vc71,~vc80
-source1=%(BUILD_DIR)s/release/IcePHP-%(version)s/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/php/demo
 filelist1=icephp.demo
 dest1=demophp
 
@@ -385,7 +371,7 @@ dest1=demophp
 elements=1
 active=1
 targets=~vc60,~vc71,vc80
-source1=%(BUILD_DIR)s/release/IcePy-%(version)s/demo
+source1=%(BUILD_DIR)s/release/Ice-%(version)s/py/demo
 filelist1=icepy.demo
 dest1=demopy
 
diff --git a/distribution/src/windows/components/expat.dev.lib b/distribution/src/windows/components/expat.dev.lib
new file mode 100755
index 00000000000..e18f5a497fb
--- /dev/null
+++ b/distribution/src/windows/components/expat.dev.lib
@@ -0,0 +1,2 @@
+f,Release/libexpat.lib
+f,Release-w/libexpatw.lib
diff --git a/distribution/src/windows/components/ice.config.files b/distribution/src/windows/components/ice.config.files
index 9243809f541..f66bf35875b 100755
--- a/distribution/src/windows/components/ice.config.files
+++ b/distribution/src/windows/components/ice.config.files
@@ -1,5 +1,2 @@
 templates.xml

 convertssl.py

-upgradeicegrid.py

-upgradeicestorm.py

-icegrid-slice.3.1.ice.gz

diff --git a/distribution/src/windows/components/ice.headers b/distribution/src/windows/components/ice.headers
index cd1c87c67a4..bf9319784c5 100755
--- a/distribution/src/windows/components/ice.headers
+++ b/distribution/src/windows/components/ice.headers
@@ -120,7 +120,6 @@ IceGrid/UserAccountMapper
 IcePatch2/ClientUtil
 IcePatch2/FileInfo
 IcePatch2/FileServer
-IcePatch2/Util
 IceSSL/Plugin
 IceStorm/IceStorm
 IceStorm/Service
diff --git a/distribution/src/windows/components/ice.runtime.icestormservice b/distribution/src/windows/components/ice.runtime.icestormservice
index 2f47ecd6304..b44a06d2067 100755
--- a/distribution/src/windows/components/ice.runtime.icestormservice
+++ b/distribution/src/windows/components/ice.runtime.icestormservice
@@ -1 +1 @@
-icestormservice32.dll

+icestormservice33.dll

diff --git a/distribution/src/windows/components/openssl.dev.lib b/distribution/src/windows/components/openssl.dev.lib
new file mode 100755
index 00000000000..465250f181b
--- /dev/null
+++ b/distribution/src/windows/components/openssl.dev.lib
@@ -0,0 +1,2 @@
+libeay32.lib
+ssleay32.lib
diff --git a/distribution/src/windows/components/sample.config.files b/distribution/src/windows/components/sample.config.files
index e3b6ea1d216..403cc833f06 100755
--- a/distribution/src/windows/components/sample.config.files
+++ b/distribution/src/windows/components/sample.config.files
@@ -1,3 +1,6 @@
 icegridregistry.cfg

 icegridnode.cfg

 glacier2router.cfg

+upgradeicegrid.py

+upgradeicestorm.py

+icegrid-slice.3.1.ice.gz

diff --git a/distribution/src/windows/vc80/Ice.ism b/distribution/src/windows/vc80/Ice.ism
index ad72bc65768..00a6ee26b90 100755
--- a/distribution/src/windows/vc80/Ice.ism
+++ b/distribution/src/windows/vc80/Ice.ism
@@ -52,13 +52,13 @@
 	<summary>

 		<codepage>1252</codepage>

 		<title>Installation Database</title>

-		<subject>Ice 3.2.0 for Visual Studio 2005</subject>

+		<subject>Ice 3.3.0 for Visual Studio 2005</subject>

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

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

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

 		<template>Intel;1033</template>

 		<lastauthor>Administrator</lastauthor>

-		<revnumber>{508F6222-17A8-4EF4-AD1C-C5F21EFEEBCD}</revnumber>

+		<revnumber>{2072CF19-062E-4D4C-8B04-32C6BFF79D22}</revnumber>

 		<lastprinted/>

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

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

@@ -350,7 +350,6 @@
 		<row><td>GAC_icecs</td><td>{FB8FD85C-EC0E-4A07-BC20-A96EF1F44909}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt; "2.0"</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>{56E42CD0-C070-48BE-A5F5-5698330D04D7}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "2.0"</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>{7F6E4D01-1F91-4D8B-BA25-8A494FEE18C6}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "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_icesslcs</td><td>{723AA376-D482-4400-A776-8B97C0DF2F69}</td><td>GlobalAssemblyCache</td><td>8</td><td>AdminUser And MsiNetAssemblySupport &gt;  "2.0"</td><td>icesslcs.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 &gt;  "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 &gt;  "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>

@@ -361,9 +360,6 @@
 		<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>IceDotnetPDBs</td><td>{DB8BA03D-603E-4397-813F-585455B24B68}</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>IceDotnetSSL</td><td>{B5D46268-BF84-4EFB-BBE2-757D430DAB67}</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>IceDotnetSSLPDB</td><td>{75EB3E31-8E3A-43EC-9F9E-5DBBC13B71D1}</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>IceJavaDemo</td><td>{76F76C01-E468-46DC-8989-15EE4BC662F8}</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>IceJavaDev</td><td>{23924FBE-9F6C-4DDD-BB38-4D6431973B01}</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>IceJavaRuntime</td><td>{3B1D1400-067A-40CE-A243-2CEB8F504FB7}</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>

@@ -371,7 +367,6 @@
 		<row><td>IcePythonDev</td><td>{DBEF9446-CEED-4917-B5A1-D8E7A4220A1D}</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>IcePythonRuntime</td><td>{3AD51C61-A673-45A1-89AD-AA473FB32078}</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>

 

@@ -1085,9 +1080,8 @@
 		<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.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>INSTALLDIR</td><td>ICE_3.2.0</td><td>.</td><td/><td>0</td><td/></row>

+		<row><td>ICE_3.3.0</td><td>WindowsVolume</td><td>ICE-3_~3|Ice-3.3.0</td><td/><td>0</td><td/></row>

+		<row><td>INSTALLDIR</td><td>ICE_3.3.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>ISUpdateServiceFolder</td><td>ISCommonFilesFolder</td><td>UPDATE~1|UpdateService</td><td/><td>0</td><td/></row>

@@ -1339,18 +1333,13 @@
 		<row><td>ice_dev_cpp</td><td>IceCppDev</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>IceDotnetPDBs</td></row>

-		<row><td>ice_dev_csharp</td><td>IceDotnetSSLPDB</td></row>

 		<row><td>ice_dev_java</td><td>IceJavaDemo</td></row>

 		<row><td>ice_dev_java</td><td>IceJavaDev</td></row>

 		<row><td>ice_dev_java</td><td>IceJavaRuntime</td></row>

 		<row><td>ice_dev_python</td><td>IcePythonDemo</td></row>

 		<row><td>ice_dev_python</td><td>IcePythonDev</td></row>

 		<row><td>ice_dev_python</td><td>IcePythonRuntime</td></row>

-		<row><td>ice_dev_vbasic</td><td>IceDotnetPDBs</td></row>

-		<row><td>ice_dev_vbasic</td><td>IceDotnetSSLPDB</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_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>

@@ -1360,11 +1349,9 @@
 		<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_icesslcs</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>ice_runtime_dotnet</td><td>IceDotnetSSL</td></row>

 		<row><td>ice_runtime_java</td><td>IceJavaRuntime</td></row>

 		<row><td>ice_runtime_python</td><td>IcePythonRuntime</td></row>

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

@@ -1389,7 +1376,6 @@
 		<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>icesslcs.dll</td><td>GAC_icesslcs</td><td>icesslcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl\runtime\bin\icesslcs.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>

 

@@ -1551,7 +1537,6 @@
 		<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_icesslcs</td><td/><td/><td>_CA59BF71_6AD0_410E_84B9_908398C1170C_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>

@@ -1562,9 +1547,6 @@
 		<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>IceDotnetPDBs</td><td/><td/><td>_39AF7DA2_D52B_4526_B1B9_B5AF796A59DD_FILTER</td><td/><td/><td/><td/></row>

-		<row><td>IceDotnetSSL</td><td/><td/><td>_BCDD9CDF_578A_46C1_BFAE_7D8FB023F2ED_FILTER</td><td/><td/><td/><td/></row>

-		<row><td>IceDotnetSSLPDB</td><td/><td/><td>_A47DEC1F_25EB_42FF_9F94_9E075522AE29_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceJavaDemo</td><td/><td/><td>_CDB69F49_081A_4B76_A0E6_FB3312C328F7_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceJavaDev</td><td/><td/><td>_109869C1_DCF5_4B8D_A5FE_B1C4DFDFCF56_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IceJavaRuntime</td><td/><td/><td>_9DED8A42_54C6_45D9_8CDB_5DD14869E158_FILTER</td><td/><td/><td/><td/></row>

@@ -1572,7 +1554,6 @@
 		<row><td>IcePythonDev</td><td/><td/><td>_37D67ECC_6F7F_43FB_A312_4B2BC92EBA4E_FILTER</td><td/><td/><td/><td/></row>

 		<row><td>IcePythonRuntime</td><td/><td/><td>_EC956E1E_E548_4E9D_A837_18AB200F9E4D_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>

 

@@ -1610,9 +1591,6 @@
 		<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>IceDotnetPDBs</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\pdbs</td><td>4</td><td/><td/><td>2</td></row>

-		<row><td>IceDotnetSSL</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl\runtime</td><td>4</td><td/><td/><td>2</td></row>

-		<row><td>IceDotnetSSLPDB</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl\dev</td><td>4</td><td/><td/><td>2</td></row>

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

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

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

@@ -1620,7 +1598,6 @@
 		<row><td>IcePythonDev</td><td>&lt;ISProjectFolder&gt;\install\ice\python\dev</td><td>4</td><td/><td/><td>2</td></row>

 		<row><td>IcePythonRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\python\runtime</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>

 

@@ -1810,7 +1787,7 @@
 		<row><td>ISProjectDataFolder</td><td/><td/><td>1</td></row>

 		<row><td>ISProjectFolder</td><td/><td/><td>1</td></row>

 		<row><td>IceAssemblyPublicKey</td><td>1f998c50fec78381</td><td/><td>2</td></row>

-		<row><td>IceAssemblyVersion</td><td>3.1.0.0</td><td/><td>2</td></row>

+		<row><td>IceAssemblyVersion</td><td>3.3.0.0</td><td/><td>2</td></row>

 		<row><td>PATH_TO_TEMP_FILES</td><td>F:\temp</td><td/><td>2</td></row>

 		<row><td>ProgramFilesFolder</td><td/><td/><td>1</td></row>

 		<row><td>SystemFolder</td><td/><td/><td>1</td></row>

@@ -1835,7 +1812,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.3.0-VC80</td></row>

 		<row><td>ZEROC</td><td>PackageCode</td><td>{609F1FBF-C54E-44EC-9B8A-97AB8B3DAD0B}</td></row>

 		<row><td>ZEROC</td><td>ProductCode</td><td>{DB52AD39-F307-4F99-BD42-13EC77E6B4AB}</td></row>

 		<row><td>ZEROC</td><td>SetupFileName</td><td/></row>

@@ -1929,7 +1906,6 @@
 	<table name="ISStorages">

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

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

-		<row><td>NewCustomAction2</td><td>&lt;PATH_TO_TEMP_FILES&gt;\Ice-3.2b-VC80-x64.msi</td></row>

 	</table>

 

 	<table name="ISString">

@@ -2501,9 +2477,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.3.0 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.3.0 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>

@@ -2808,7 +2784,6 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA=
 		<row><td>GAC_icecs</td><td>processorArchitecture</td><td>MSIL</td></row>

 		<row><td>GAC_icegridcs</td><td>processorArchitecture</td><td>MSIL</td></row>

 		<row><td>GAC_icepatch2cs</td><td>processorArchitecture</td><td>MSIL</td></row>

-		<row><td>GAC_icesslcs</td><td>processorArchitecture</td><td>MSIL</td></row>

 		<row><td>GAC_icestormcs</td><td>processorArchitecture</td><td>MSIL</td></row>

 	</table>

 

@@ -2924,11 +2899,11 @@ 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>{3E05FD23-8F76-4711-941B-22F52479091C}</td><td/></row>

+		<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.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.3.0 for Visual Studio 2005</td><td/></row>

+		<row><td>ProductVersion</td><td>3.3.0</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>

@@ -2937,7 +2912,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>{FD2A4499-D9C9-4005-897D-D486080BF333}</td><td/></row>

+		<row><td>UpgradeCode</td><td>{646429FA-02EF-4465-9C82-5B4C32704957}</td><td/></row>

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

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

 	</table>

diff --git a/distribution/src/windows/vc80/ThirdParty.ism b/distribution/src/windows/vc80/ThirdParty.ism
index b8abecdafde..5559f4e5dec 100755
--- a/distribution/src/windows/vc80/ThirdParty.ism
+++ b/distribution/src/windows/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.3.0 Third Party Packages for Visual Studio 2005</subject>

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

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

 		<comments>##ID_STRING5##</comments>

@@ -1137,8 +1137,8 @@
 		<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>INSTALLDIR</td><td>ICE_3.2.0_THIRDPARTY_VC80</td><td>.</td><td/><td>0</td><td/></row>

+		<row><td>ICE_3.3.0_THIRDPARTY_VC80</td><td>WindowsVolume</td><td>ICE-3_~3|Ice-3.3.0-ThirdParty-VC80</td><td/><td>0</td><td/></row>

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

 		<row><td>ISMyProductDir</td><td>ISMyCompanyDir</td><td>MYPROD~1|My Product Name</td><td/><td>0</td><td/></row>

@@ -1795,11 +1795,11 @@
 		<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-ThirdParty-VC80</td></row>

-		<row><td>ZEROC</td><td>PackageCode</td><td>{C1AA107F-6B97-4129-8E7F-E12CD6EBEFC7}</td></row>

-		<row><td>ZEROC</td><td>ProductCode</td><td>{4140870E-7844-482D-9CB8-684BDEEB3042}</td></row>

+		<row><td>ZEROC</td><td>MSIPackageFileName</td><td>Ice-3.3.0-ThirdParty-VC80</td></row>

+		<row><td>ZEROC</td><td>PackageCode</td><td>{F1779DC0-CD5F-41D2-90D5-808237248D65}</td></row>

+		<row><td>ZEROC</td><td>ProductCode</td><td>{2F0AAC46-1AD3-4737-8A84-B1D0E390AA6A}</td></row>

 		<row><td>ZEROC</td><td>SetupFileName</td><td/></row>

-		<row><td>ZEROC</td><td>UpgradeCode</td><td>{9E49A9BC-91C1-428B-8839-A8B558280227}</td></row>

+		<row><td>ZEROC</td><td>UpgradeCode</td><td>{94971278-0721-4111-A591-9A06E4C13028}</td></row>

 	</table>

 

 	<table name="ISRelease">

@@ -2901,11 +2901,11 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA
 		<row><td>NewProperty2111</td><td>0</td><td/></row>

 		<row><td>NewProperty2112</td><td>0</td><td/></row>

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

-		<row><td>ProductCode</td><td>{16888E89-D574-48F5-8241-9CE2BB41CDBF}</td><td/></row>

+		<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.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.3.0 Third Party Packages for Visual Studio 2005</td><td/></row>

+		<row><td>ProductVersion</td><td>3.3.0</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>

@@ -2914,7 +2914,7 @@ VABIAEkAUgBEAF8AUABBAFIAVABZAF8ATQBTAEkAAQBaAEUAUgBPAEMA
 		<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>{2105326A-E260-46E0-951A-A9440FE5D608}</td><td/></row>

+		<row><td>UpgradeCode</td><td>{1818C2DC-2095-491C-8294-8692BDF34306}</td><td/></row>

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

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

 	</table>