20 files changed, 169 insertions, 53 deletions
diff --git a/cpp/install/common/components/.components.ini.swo b/cpp/install/common/components/.components.ini.swo
deleted file mode 100755
index 2dc06594259..00000000000
--- a/cpp/install/common/components/.components.ini.swo
+++ /dev/null
diff --git a/cpp/install/common/components/.components.ini.swp b/cpp/install/common/components/.components.ini.swp
deleted file mode 100755
index 858a38aaf67..00000000000
--- a/cpp/install/common/components/.components.ini.swp
+++ /dev/null
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index 9e2548bcaa4..e83e5ed1b81 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -3,8 +3,8 @@
 ;;
 
 [ice]
-ice-common=
-ice-packages-common=
+ice-common=ice common
+packages-common=ice packages common
 ice-cpp-runtime=ice runtime
 ice-cpp-dev=ice dev
 ice-java-runtime=java runtime
@@ -20,8 +20,7 @@ ice-php-extension=php runtime
 ice-php-demo=php demo
 ice-vbasic-dev=vbasic dev
 ice-vbasic-demo=vbasic demo
-ice-cpp-demo-vc71=ice demo
-ice-cpp-demo-vc60=ice demo
+ice-cpp-demo=c++ demo
 
 [packages]
 berkeley-dev=berkeley db dev
@@ -36,6 +35,36 @@ openssl-runtime=openssl runtime
 stlport-dev=stlport dev
 stlport-runtime=stlport runtime
 jgoodies-runtime=jgoodies
+microsoft-runtime=microsoft runtime
+
+[ice common]
+elements=4
+active=1
+source1=%(INSTALL_TOOLS)s/common
+filelist1=installer.data
+dest1=.
+source2=%(INSTALL_TOOLS)s/%(target)s/doc
+filelist2=installer.docs
+dest2=doc
+source3=%(BUILD_DIR)s/Ice-%(version)s/doc
+filelist3=ice.docs
+dest3=html/doc
+source4=%(BUILD_DIR)s/Ice-%(version)s/doc/reference
+filelist4=ice.html
+dest4=html/doc/reference
+
+[ice packages common]
+elements=3
+active=1
+source1=%(INSTALL_TOOLS)s/common
+filelist1=packages.data
+dest1=.
+source2=%(INSTALL_TOOLS)s/%(target)s/doc
+filelist2=packages.docs.%(target)s
+dest2=.
+source3=%(INSTALL_TOOLS)s/%(target)s/doc
+filelist3=packages.licenses.%(target)s
+dest3=doc
 
 [ice runtime]
 elements=4
@@ -44,60 +73,83 @@ active=1
 ;;
 ;; DLL files that are installed as part of the runtime. 
 ;;
-source1=%(STAGE_HOME)s/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist1=ice.runtime.dlls
-filetemplate1=%(name)s%(version)s.dll
+filetemplate1=f,%(name)s/Release/%(name)s%(dllversion)s.dll
 dest1=bin
 ;;
 ;; EXE files that are installed as part of the runtime.
 ;;
-source2=%(STAGE_HOME)s/Ice-%(version)s/bin
+source2=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist2=ice.runtime.exes
 filetemplate2=%(name)s.exe
 dest2=bin
 ;;
 ;; Slice files
 ;;
-source3=%(STAGE_HOME)s/Ice-%(version)s/slice
+source3=%(BUILD_DIR)s/Ice-%(version)s/slice
 filelist3=ice.slice
 filetemplate3=%(name)s.ice
 dest3=slice
 ;;
 ;; Certs
 ;;
-source4=%(STAGE_HOME)s/Ice-%(version)s/certs
+source4=%(BUILD_DIR)s/Ice-%(version)s/certs
 filelist4=ice.runtime.certs
 dest4=certs
 
+source5=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist5=ice.runtime.icestormservice
+dest5=bin
+
 [ice dev]
-elements=2
+elements=6
 active=1
-source1=%(STAGE_HOME)s/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist1=ice.dev.exes
 dest1=bin
 ;;
 ;; Header files.
 ;;
-source2=%(STAGE_HOME)s/Ice-%(version)s/include
+source2=%(BUILD_DIR)s/Ice-%(version)s/include
 filelist2=ice.headers
 filetemplate2=%(name)s.h
 dest2=include
 
-source3=%(STAGE_HOME)s/Ice-%(version)s/src
-filelist3=ice.dev.dlls
-filetemplate3=%(name)d.dll
+source3=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist3=ice.runtime.dlls
+filetemplate3=f,%(name)s/Debug/%(name)s%(dllversion)sd.dll
 dest3=bin
 
-source4=%(STAGE_HOME)s/Ice-%(version)s/src
-filelist4=ice.dev.dlls
-filetemplate4=%(name)d.pdb
+source4=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist4=ice.runtime.dlls
+filetemplate4=f,%(name)s/Debug/%(name)s%(dllversion)sd.pdb
 dest4=bin
 
+source5=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist5=ice.runtime.dlls
+filetemplate5=f,%(name)s/Release/%(name)s.lib
+dest5=lib
+
+source6=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist6=ice.runtime.dlls
+filetemplate6=f,%(name)s/Debug/%(name)sd.lib
+dest6=lib
+
+source7=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist7=ice.dev.icestormservice.lib
+filetemplate7=f,IceStorm/Debug/icestormservice%(name)s
+dest7=lib
+
+source8=%(BUILD_DIR)s/Ice-%(version)s/src
+filelist8=ice.dev.icestormservice.dll
+dest8=bin
+
 [java runtime]
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceJ-%(version)s/lib
+source1=%(BUILD_DIR)s/IceJ-%(version)s/lib
 filelist1=ice.java.runtime
 dest1=lib
 
@@ -105,19 +157,19 @@ dest1=lib
 elements=4
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceJ-%(version)s/ant
+source1=%(BUILD_DIR)s/IceJ-%(version)s/ant
 filelist1=ice.java.ant
 dest1=ant
 
-source2=%(STAGE_HOME)s/Ice-%(version)s/bin
+source2=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist2=ice.java.exes
 dest2=bin
 
-source3=%(STAGE_HOME)s/IceJ-%(version)s/config
+source3=%(BUILD_DIR)s/IceJ-%(version)s/config
 filelist3=ice.java.config
 dest3=config
 
-source4=%(STAGE_HOME)s/IceJ-%(version)s/certs
+source4=%(BUILD_DIR)s/IceJ-%(version)s/certs
 filelist4=ice.java.certs
 dest4=certs
 
@@ -125,7 +177,7 @@ dest4=certs
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceCS-%(version)s/certs
+source1=%(BUILD_DIR)s/IceCS-%(version)s/certs
 filelist1=ice.dotnet.assemblies
 dest1=bin
 
@@ -133,10 +185,10 @@ dest1=bin
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.csharp.dev
 dest1=bin
-source2=%(STAGE_HOME)s/IceCS-%(version)s/bin
+source2=%(BUILD_DIR)s/IceCS-%(version)s/bin
 filelist2=ice.csharp.tools
 dest2=bin
 
@@ -144,10 +196,10 @@ dest2=bin
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.vbasic.dev
 dest1=bin
-source2=%(STAGE_HOME)s/IceVB-%(version)s/bin
+source2=%(BUILD_DIR)s/IceVB-%(version)s/bin
 filelist2=ice.vbasic.tools
 dest2=bin
 
@@ -155,7 +207,7 @@ dest2=bin
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IcePHP-%(version)s/src/ice/Release
+source1=%(BUILD_DIR)s/IcePHP-%(version)s/src/ice/Release
 filelist1=ice.php.runtime
 dest1=bin
 
@@ -163,10 +215,10 @@ dest1=bin
 elements=2
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IcePy-%(version)s/python
+source1=%(BUILD_DIR)s/IcePy-%(version)s/python
 filelist1=ice.python.python
 dest1=python
-source2=%(STAGE_HOME)s/IcePy-%(version)s/python
+source2=%(BUILD_DIR)s/IcePy-%(version)s/python
 filelist2=ice.python.module
 dest2=python
 
@@ -174,23 +226,22 @@ dest2=python
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/Ice-%(version)s/bin
+source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.python.dev
 dest1=bin
 
 [c++ demo]
 elements=1
 active=1
-targets=all
-source1=%(STAGE_HOME)s/Ice-%(version)s/demo
+source1=%(BUILD_DIR)s/Ice-%(version)s/demo
 filelist1=ice.demo.%(target)s
-dest1=demo
+dest1=.
 
 [java demo]
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceJ-%(version)s/demo
+source1=%(BUILD_DIR)s/IceJ-%(version)s/demo
 filelist1=icej.demo
 dest1=demoj
 
@@ -198,7 +249,7 @@ dest1=demoj
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceCS-%(version)s/demo
+source1=%(BUILD_DIR)s/IceCS-%(version)s/demo
 filelist1=icecs.demo
 dest1=democs
 
@@ -206,7 +257,7 @@ dest1=democs
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IceVB-%(version)s/demo
+source1=%(BUILD_DIR)s/IceVB-%(version)s/demo
 filelist1=icevb.demo
 dest1=demovb
 
@@ -214,7 +265,7 @@ dest1=demovb
 elements=1
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IcePHP-%(version)s/demo
+source1=%(BUILD_DIR)s/IcePHP-%(version)s/demo
 filelist1=icephp.demo
 dest1=demophp
 
@@ -222,7 +273,7 @@ dest1=demophp
 elements=0
 active=1
 targets=~vc60
-source1=%(STAGE_HOME)s/IcePy-%(version)s/demo
+source1=%(BUILD_DIR)s/IcePy-%(version)s/demo
 filelist1=icepy.demo
 dest1=dempopy
 
@@ -343,3 +394,10 @@ targets=vc60
 source1=%(JGOODIES_HOME)s
 filelist1=jgoodies
 dest1=lib
+
+[microsoft runtime]
+elements=1
+active=1
+source1=%(SystemRoot)s/System32
+filelist1=ms.dlls.%(target)s
+dest1=bin
diff --git a/cpp/install/common/components/ice.demo.vc60 b/cpp/install/common/components/ice.demo.vc60
index b4cd1bec527..f35bfa00317 100755
--- a/cpp/install/common/components/ice.demo.vc60
+++ b/cpp/install/common/components/ice.demo.vc60
@@ -1,3 +1,14 @@
-##% filespec
-include=*.cpp
-include=**/*.cpp
+README
+include=**/*.*
+exclude=**/*.ncb
+exclude=**/*.suo
+exclude=**/*.exe
+exclude=**/*.ilk
+exclude=**/*.pdb
+exclude=**/*.plg
+exclude=**/.depend
+exclude=**/.dummy
+exclude=**/Makefile
+exclude=**/Debug/**
+exclude=**/Release/**
+exclude=Freeze/backup/**
diff --git a/cpp/install/common/components/ice.demo.vc71 b/cpp/install/common/components/ice.demo.vc71
index 2f7d51cd123..d9e675898ac 100755
--- a/cpp/install/common/components/ice.demo.vc71
+++ b/cpp/install/common/components/ice.demo.vc71
@@ -1 +1,16 @@
-##% filespec
+README
+include=**/*.*
+exclude=**/*.dsp
+exclude=**/*.dsw
+exclude=**/*.ncb
+exclude=**/*.suo
+exclude=**/*.exe
+exclude=**/*.ilk
+exclude=**/*.pdb
+exclude=**/*.plg
+exclude=**/.depend
+exclude=**/.dummy
+exclude=**/Makefile
+exclude=**/Debug/**
+exclude=**/Release/**
+exclude=Freeze/backup/**
diff --git a/cpp/install/common/components/ice.dev.exe b/cpp/install/common/components/ice.dev.exe
index cb9b243cddf..c0c7a9d3f5d 100755
--- a/cpp/install/common/components/ice.dev.exe
+++ b/cpp/install/common/components/ice.dev.exe
@@ -1,4 +1,4 @@
-slice2cpp/Release/slice2cpp
-slice2freeze/Release/slice2freeze
-IceBox/Debug/iceboxd.exe
-IceBox/Debug/iceboxd.pdb
+f,slice2cpp/Release/slice2cpp
+f,slice2freeze/Release/slice2freeze
+f,IceBox/Debug/iceboxd.exe
+f,IceBox/Debug/iceboxd.pdb
diff --git a/cpp/install/common/components/ice.dev.icestormservice b/cpp/install/common/components/ice.dev.icestormservice
new file mode 100755
index 00000000000..cff8a15fcff
--- /dev/null
+++ b/cpp/install/common/components/ice.dev.icestormservice
@@ -0,0 +1,2 @@
+.lib
+d.lib
diff --git a/cpp/install/common/components/ice.docs b/cpp/install/common/components/ice.docs
new file mode 100755
index 00000000000..47bbd8d3556
--- /dev/null
+++ b/cpp/install/common/components/ice.docs
@@ -0,0 +1 @@
+README.html
diff --git a/cpp/install/common/components/ice.headers b/cpp/install/common/components/ice.headers
index a694b28c7b0..7991ae6b44d 100755
--- a/cpp/install/common/components/ice.headers
+++ b/cpp/install/common/components/ice.headers
@@ -172,4 +172,4 @@ Glacier2/PermissionsVerifierF
 Glacier2/RouterF
 Glacier2/SessionF
 Glacier2/PermissionsVerifier
-Glacier2/Session.h 
+Glacier2/Session
diff --git a/cpp/install/common/components/ice.html b/cpp/install/common/components/ice.html
new file mode 100755
index 00000000000..f309cd28290
--- /dev/null
+++ b/cpp/install/common/components/ice.html
@@ -0,0 +1 @@
+include=*.*
diff --git a/cpp/install/common/components/ice.java.exes b/cpp/install/common/components/ice.java.exes
index 5e454d158e1..eb9050cf0ba 100755
--- a/cpp/install/common/components/ice.java.exes
+++ b/cpp/install/common/components/ice.java.exes
@@ -1,2 +1,2 @@
-slice2java/Release/slice2java.exe
-slice2freezej/Release/slice2freezej.exe
+f,slice2java/Release/slice2java.exe
+f,slice2freezej/Release/slice2freezej.exe
diff --git a/cpp/install/common/components/ice.runtime.dlls b/cpp/install/common/components/ice.runtime.dlls
index 1558ef5a359..953ff0346c8 100755
--- a/cpp/install/common/components/ice.runtime.dlls
+++ b/cpp/install/common/components/ice.runtime.dlls
@@ -1,11 +1,10 @@
 freeze
 glacier2
 ice
-icepack
+icebox
 icepatch2
 icessl
 icestorm
-icestormservice
 iceutil
 icexml
 slice
diff --git a/cpp/install/common/components/ice.runtime.icestormservice b/cpp/install/common/components/ice.runtime.icestormservice
new file mode 100755
index 00000000000..e364e680101
--- /dev/null
+++ b/cpp/install/common/components/ice.runtime.icestormservice
@@ -0,0 +1 @@
+f,IceStorm/Release/icestormservice30.dll
diff --git a/cpp/install/common/components/installer.data b/cpp/install/common/components/installer.data
new file mode 100755
index 00000000000..457524bf863
--- /dev/null
+++ b/cpp/install/common/components/installer.data
@@ -0,0 +1,3 @@
+installer-main.bmp
+installer-header.bmp
+LICENSE.rtf
diff --git a/cpp/install/common/components/installer.docs b/cpp/install/common/components/installer.docs
new file mode 100755
index 00000000000..cab5e663e23
--- /dev/null
+++ b/cpp/install/common/components/installer.docs
@@ -0,0 +1,3 @@
+include=*.*
+exclude=**.rtf
+exclude=THIRD_PARTY_SOURCES
diff --git a/cpp/install/common/components/packages.data b/cpp/install/common/components/packages.data
new file mode 100755
index 00000000000..457524bf863
--- /dev/null
+++ b/cpp/install/common/components/packages.data
@@ -0,0 +1,3 @@
+installer-main.bmp
+installer-header.bmp
+LICENSE.rtf
diff --git a/cpp/install/common/components/packages.docs.vc60 b/cpp/install/common/components/packages.docs.vc60
new file mode 100755
index 00000000000..d92e70a2d7d
--- /dev/null
+++ b/cpp/install/common/components/packages.docs.vc60
@@ -0,0 +1,7 @@
+BERKELEY_DB_LICENSE.rtf
+BZIP2_LICENSE.rtf
+EXPAT_LICENSE.rtf
+OPENSSL_LICENSE.rtf
+JGOODIES_FORMS_LICENSE.rtf
+JGOODIES_LOOKS_LICENSE.rtf
+STLPORT_LICENSE.rtf
diff --git a/cpp/install/common/components/packages.docs.vc71 b/cpp/install/common/components/packages.docs.vc71
new file mode 100755
index 00000000000..5045cfc66b4
--- /dev/null
+++ b/cpp/install/common/components/packages.docs.vc71
@@ -0,0 +1,6 @@
+BERKELEY_DB_LICENSE.rtf
+BZIP2_LICENSE.rtf
+EXPAT_LICENSE.rtf
+OPENSSL_LICENSE.rtf
+JGOODIES_FORMS_LICENSE.rtf
+JGOODIES_LOOKS_LICENSE.rtf
diff --git a/cpp/install/common/components/packages.licenses.vc60 b/cpp/install/common/components/packages.licenses.vc60
new file mode 100755
index 00000000000..da2d5236f4d
--- /dev/null
+++ b/cpp/install/common/components/packages.licenses.vc60
@@ -0,0 +1,3 @@
+LICENSE.rtf
+LICENSE
+SOURCES
diff --git a/cpp/install/common/components/packages.licenses.vc71 b/cpp/install/common/components/packages.licenses.vc71
new file mode 100755
index 00000000000..da2d5236f4d
--- /dev/null
+++ b/cpp/install/common/components/packages.licenses.vc71
@@ -0,0 +1,3 @@
+LICENSE.rtf
+LICENSE
+SOURCES