7 files changed, 34 insertions, 637 deletions
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index a55be33aeef..d478179e378 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -325,7 +325,7 @@ dest1=bin
 [python runtime]
 elements=2
 active=1
-targets=~vc60,vc71,~vc80
+targets=~vc60,~vc71,vc80
 source1=%(BUILD_DIR)s/release/IcePy-%(version)s/python
 filelist1=ice.python.python
 dest1=python
diff --git a/cpp/install/common/components/ice.ruby.demo b/cpp/install/common/components/ice.ruby.demo
index eda8c134f12..9eff2cb67a9 100644
--- a/cpp/install/common/components/ice.ruby.demo
+++ b/cpp/install/common/components/ice.ruby.demo
@@ -1,33 +1,3 @@
-book/printer/Client.rb
-book/printer/Printer.ice
-book/printer/README
-book/README
-book/simple_filesystem
-book/simple_filesystem/Client.rb
-book/simple_filesystem/Filesystem.ice
-book/simple_filesystem/README
-Ice/hello/Client.rb
-Ice/hello/config.client
-Ice/hello/Hello.ice
-Ice/hello/README
-Ice/latency/Client.rb
-Ice/latency/config.client
-Ice/latency/Latency.ice
-Ice/latency/README
-Ice/minimal/Client.rb
-Ice/minimal/Hello.ice
-Ice/minimal/README
-Ice/README
-Ice/session/Client.rb
-Ice/session/config.client
-Ice/session/README
-Ice/session/Session.ice
-Ice/throughput/Client.rb
-Ice/throughput/config.client
-Ice/throughput/README
-Ice/throughput/Throughput.ice
-Ice/value/Client.rb
-Ice/value/config.client
-Ice/value/README
-Ice/value/Value.ice
-README
+include=*.*
+include=**/*.*
+exclude=Freeze/backup/**
diff --git a/cpp/install/common/components/icecs.demo.vc80 b/cpp/install/common/components/icecs.demo.vc80
index 50a47feddeb..10b9c38a842 100644
--- a/cpp/install/common/components/icecs.demo.vc80
+++ b/cpp/install/common/components/icecs.demo.vc80
@@ -1,226 +1,20 @@
-# To create an explicit listing for the demos run the following command
-# in the demo directory of the IceCS distribution:
-# find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|\
-#      Makefile\|.pdb$\|\.bat$\|\.dummy/d' # | \
-#      sed -e 's/^\.\///' \
-# >> file
-# find . -name "*" -type d | grep \/db |  sed -e 's/^\.\///' | sed -e '/^Freeze\/backup/d'  >> file
-#
-# If you want to use wild card searches instead of explicitly listing
-# files, you can delete the filenames and uncomment the following lines:
-#
-# *.*
-# include=**/*.*
-# exclude=**/*.csproj*
-# exclude=**/*.exe
-# exclude=**/*.pdb
-# exclude=**/*.dll
-# exclude=**/*.bat
-# exclude=**/.depend
-# exclude=**/.dummy
-# exclude=**/Makefile
-# exclude=**/generated/**
-# exclude=**/obj/**
-#
-# Stop uncommenting here
-# Delete from here to EOF
-
-book/evictor/EvictorBase.cs
-book/evictor/LinkedList.cs
-book/evictor/README
-book/printer/Client.cs
-book/printer/Printer.ice
-book/printer/printerC.csproj
-book/printer/printerS.csproj
-book/printer/README
-book/printer/Server.cs
-book/README
-book/simple_filesystem/Client.cs
-book/simple_filesystem/DirectoryI.cs
-book/simple_filesystem/FileI.cs
-book/simple_filesystem/Filesystem.ice
-book/simple_filesystem/README
-book/simple_filesystem/Server.cs
-book/simple_filesystem/simpleFSC.csproj
-book/simple_filesystem/simpleFSS.csproj
-demo.sln
-Glacier2/callback/Callback.ice
-Glacier2/callback/CallbackI.cs
-Glacier2/callback/CallbackReceiverI.cs
-Glacier2/callback/Client.cs
-Glacier2/callback/config.client
-Glacier2/callback/config.glacier2
-Glacier2/callback/config.server
-Glacier2/callback/config.sessionserver
-Glacier2/callback/glacier2callbackC.csproj
-Glacier2/callback/glacier2callbackS.csproj
-Glacier2/callback/glacier2callbackSS.csproj
-Glacier2/callback/README
-Glacier2/callback/Server.cs
-Glacier2/callback/SessionI.cs
-Glacier2/callback/SessionManagerI.cs
-Glacier2/callback/SessionServer.cs
-Glacier2/README
-Ice/bidir/bidirC.csproj
-Ice/bidir/bidirS.csproj
-Ice/bidir/Callback.ice
-Ice/bidir/CallbackReceiverI.cs
-Ice/bidir/CallbackSenderI.cs
-Ice/bidir/Client.cs
-Ice/bidir/config.client
-Ice/bidir/config.server
-Ice/bidir/README
-Ice/bidir/Server.cs
-Ice/callback/Callback.ice
-Ice/callback/callbackC.csproj
-Ice/callback/CallbackReceiverI.cs
-Ice/callback/callbackS.csproj
-Ice/callback/CallbackSenderI.cs
-Ice/callback/Client.cs
-Ice/callback/config.client
-Ice/callback/config.server
-Ice/callback/README
-Ice/callback/Server.cs
-Ice/hello/Client.cs
-Ice/hello/config.client
-Ice/hello/config.server
-Ice/hello/Hello.ice
-Ice/hello/helloC.csproj
-Ice/hello/HelloI.cs
-Ice/hello/helloS.csproj
-Ice/hello/README
-Ice/hello/Server.cs
-Ice/invoke/Client.cs
-Ice/invoke/config.client
-Ice/invoke/config.server
-Ice/invoke/invokeC.csproj
-Ice/invoke/invokeS.csproj
-Ice/invoke/Printer.ice
-Ice/invoke/PrinterI.cs
-Ice/invoke/README
-Ice/invoke/Server.cs
-Ice/latency/Client.cs
-Ice/latency/config.client
-Ice/latency/config.server
-Ice/latency/Latency.ice
-Ice/latency/latencyC.csproj
-Ice/latency/latencyS.csproj
-Ice/latency/README
-Ice/latency/Server.cs
-Ice/minimal/Client.cs
-Ice/minimal/Hello.ice
-Ice/minimal/HelloI.cs
-Ice/minimal/minimalC.csproj
-Ice/minimal/minimalS.csproj
-Ice/minimal/README
-Ice/minimal/Server.cs
-Ice/nested/Client.cs
-Ice/nested/config.client
-Ice/nested/config.server
-Ice/nested/Nested.ice
-Ice/nested/nestedC.csproj
-Ice/nested/NestedI.cs
-Ice/nested/nestedS.csproj
-Ice/nested/README
-Ice/nested/Server.cs
-Ice/README
-Ice/session/Client.cs
-Ice/session/config.client
-Ice/session/config.server
-Ice/session/HelloI.cs
-Ice/session/README
-Ice/session/ReapThread.cs
-Ice/session/Server.cs
-Ice/session/Session.ice
-Ice/session/sessionC.csproj
-Ice/session/SessionFactoryI.cs
-Ice/session/SessionI.cs
-Ice/session/sessionS.csproj
-Ice/throughput/Client.cs
-Ice/throughput/config.client
-Ice/throughput/config.server
-Ice/throughput/README
-Ice/throughput/Server.cs
-Ice/throughput/Throughput.ice
-Ice/throughput/throughputC.csproj
-Ice/throughput/ThroughputI.cs
-Ice/throughput/throughputS.csproj
-Ice/value/Client.cs
-Ice/value/config.client
-Ice/value/config.server
-Ice/value/DerivedPrinterI.cs
-Ice/value/InitialI.cs
-Ice/value/ObjectFactory.cs
-Ice/value/PrinterI.cs
-Ice/value/README
-Ice/value/Server.cs
-Ice/value/Value.ice
-Ice/value/valueC.csproj
-Ice/value/valueS.csproj
-IceBox/hello/Client.cs
-IceBox/hello/config.client
-IceBox/hello/config.icebox
-IceBox/hello/Hello.ice
-IceBox/hello/HelloI.cs
-IceBox/hello/helloIceBoxC.csproj
-IceBox/hello/helloIceBoxS.csproj
-IceBox/hello/HelloServiceI.cs
-IceBox/hello/README
-IceBox/README
-IceGrid/README
-IceGrid/allocate/allocateC.csproj
-IceGrid/allocate/allocateS.csproj
-IceGrid/allocate/application-multiple.xml
-IceGrid/allocate/application-single.xml
-IceGrid/allocate/Client.cs
-IceGrid/allocate/config.client
-IceGrid/allocate/config.grid
-IceGrid/allocate/Hello.ice
-IceGrid/allocate/HelloI.cs
-IceGrid/allocate/README
-IceGrid/allocate/Server.cs
-IceGrid/sessionActivation/application.xml
-IceGrid/sessionActivation/Client.cs
-IceGrid/sessionActivation/config.client
-IceGrid/sessionActivation/config.grid
-IceGrid/sessionActivation/Hello.ice
-IceGrid/sessionActivation/HelloI.cs
-IceGrid/sessionActivation/README
-IceGrid/sessionActivation/Server.cs
-IceGrid/sessionActivation/sessionActivationC.csproj
-IceGrid/sessionActivation/sessionActivationS.csproj
-IceGrid/simple/application.xml
-IceGrid/simple/application_with_replication.xml
-IceGrid/simple/application_with_template.xml
-IceGrid/simple/Client.cs
-IceGrid/simple/config.client
-IceGrid/simple/config.grid
-IceGrid/simple/Hello.ice
-IceGrid/simple/HelloI.cs
-IceGrid/simple/README
-IceGrid/simple/Server.cs
-IceGrid/simple/simpleIceGridC.csproj
-IceGrid/simple/simpleIceGridS.csproj
-IceStorm/clock/Clock.ice
-IceStorm/clock/clockC.csproj
-#IceStorm/clock/ClockI.cs
-IceStorm/clock/clockS.csproj
-IceStorm/clock/config.icebox
-IceStorm/clock/config.pub
-IceStorm/clock/config.service
-IceStorm/clock/config.sub
-IceStorm/clock/Publisher.cs
-IceStorm/clock/README
-IceStorm/clock/Subscriber.cs
-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
-IceStorm/clock/db
+include=**/*.*
+exclude=**/generated/**
+exclude=**/*.ncb
+exclude=**/*.suo
+exclude=**/*.exe
+exclude=**/*.exe.config
+exclude=**/*.bat
+exclude=**/*.obj
+exclude=**/*.pdb
+exclude=**/*.lib
+exclude=**/*.dll
+exclude=**/*.plg
+exclude=**/*.depend
+exclude=**/*.dummy
+exclude=**/Makefile.*
+exclude=**/*Makefile*
+exclude=**/Debug/**
+exclude=**/Release/**
+exclude=Freeze/backup/**
diff --git a/cpp/install/common/components/icej.demo b/cpp/install/common/components/icej.demo
index 2bd8f1fe42c..e54b9114ca4 100755
--- a/cpp/install/common/components/icej.demo
+++ b/cpp/install/common/components/icej.demo
@@ -7,242 +7,8 @@
 # If you want to use wild card searches instead of explicitly listing
 # files, you can delete the filenames and uncomment the following lines:
 #
-# include=*.*
-# exclude=**/.dummy
-# exclude=**/classes/**
-# exclude=**/generated/**
-#
-# Stop uncommenting here!
-# Delete from here to EOF
-
-book/build.xml
-book/evictor/EvictorBase.java
-book/evictor/LinkedList.java
-book/evictor/README
-book/printer/build.xml
-book/printer/Client.java
-book/printer/Printer.ice
-book/printer/PrinterI.java
-book/printer/README
-book/printer/Server.java
-book/README
-book/simple_filesystem/build.xml
-book/simple_filesystem/Client.java
-book/simple_filesystem/Filesystem/DirectoryI.java
-book/simple_filesystem/Filesystem/FileI.java
-book/simple_filesystem/Filesystem.ice
-book/simple_filesystem/README
-book/simple_filesystem/Server.java
-build.xml
-Freeze/bench/build.xml
-Freeze/bench/Client.java
-Freeze/bench/README
-Freeze/bench/StopWatch.java
-Freeze/bench/Test.ice
-Freeze/build.xml
-Freeze/library/BookFactory.java
-Freeze/library/BookI.java
-Freeze/library/books
-Freeze/library/build.xml
-Freeze/library/Client.java
-Freeze/library/Collocated.java
-Freeze/library/config.client
-Freeze/library/config.server
-Freeze/library/Grammar.java
-Freeze/library/Library.ice
-Freeze/library/LibraryI.java
-Freeze/library/Parser.java
-Freeze/library/README
-Freeze/library/RunParser.java
-Freeze/library/Scanner.java
-Freeze/library/Server.java
-Freeze/library/Token.java
-Freeze/phonebook/build.xml
-Freeze/phonebook/Client.java
-Freeze/phonebook/Collocated.java
-Freeze/phonebook/config.client
-Freeze/phonebook/config.server
-Freeze/phonebook/ContactFactory.java
-Freeze/phonebook/ContactI.java
-Freeze/phonebook/contacts
-Freeze/phonebook/Grammar.java
-Freeze/phonebook/Parser.java
-Freeze/phonebook/PhoneBook.ice
-Freeze/phonebook/PhoneBookI.java
-Freeze/phonebook/README
-Freeze/phonebook/RunParser.java
-Freeze/phonebook/Scanner.java
-Freeze/phonebook/Server.java
-Freeze/phonebook/Token.java
-Freeze/README
-Glacier2/build.xml
-Glacier2/callback/build.xml
-Glacier2/callback/Callback.ice
-Glacier2/callback/CallbackI.java
-Glacier2/callback/CallbackReceiverI.java
-Glacier2/callback/Client.java
-Glacier2/callback/config.client
-Glacier2/callback/config.glacier2
-Glacier2/callback/config.server
-Glacier2/callback/config.sessionserver
-Glacier2/callback/README
-Glacier2/callback/Server.java
-Glacier2/callback/SessionI.java
-Glacier2/callback/SessionManagerI.java
-Glacier2/callback/SessionServer.java
-Glacier2/README
-Ice/bidir/build.xml
-Ice/bidir/Callback.ice
-Ice/bidir/CallbackReceiverI.java
-Ice/bidir/CallbackSenderI.java
-Ice/bidir/Client.java
-Ice/bidir/config.client
-Ice/bidir/config.server
-Ice/bidir/README
-Ice/bidir/Server.java
-Ice/build.xml
-Ice/callback/build.xml
-Ice/callback/Callback.ice
-Ice/callback/CallbackReceiverI.java
-Ice/callback/CallbackSenderI.java
-Ice/callback/Client.java
-Ice/callback/config.client
-Ice/callback/config.server
-Ice/callback/README
-Ice/callback/Server.java
-Ice/hello/build.xml
-Ice/hello/Client.java
-Ice/hello/config.client
-Ice/hello/config.server
-Ice/hello/Hello.ice
-Ice/hello/HelloI.java
-Ice/hello/README
-Ice/hello/Server.java
-Ice/invoke/build.xml
-Ice/invoke/Client.java
-Ice/invoke/config.client
-Ice/invoke/config.server
-Ice/invoke/Printer.ice
-Ice/invoke/PrinterI.java
-Ice/invoke/README
-Ice/invoke/Server.java
-Ice/latency/build.xml
-Ice/latency/Client.java
-Ice/latency/config.client
-Ice/latency/config.server
-Ice/latency/Latency.ice
-Ice/latency/README
-Ice/latency/Server.java
-Ice/minimal/build.xml
-Ice/minimal/Client.java
-Ice/minimal/Hello.ice
-Ice/minimal/HelloI.java
-Ice/minimal/README
-Ice/minimal/Server.java
-Ice/nested/build.xml
-Ice/nested/Client.java
-Ice/nested/config.client
-Ice/nested/config.server
-Ice/nested/Nested.ice
-Ice/nested/NestedI.java
-Ice/nested/README
-Ice/nested/Server.java
-Ice/README
-Ice/session/build.xml
-Ice/session/Client.java
-Ice/session/config.client
-Ice/session/config.server
-Ice/session/HelloI.java
-Ice/session/README
-Ice/session/ReapThread.java
-Ice/session/Server.java
-Ice/session/Session.ice
-Ice/session/SessionFactoryI.java
-Ice/session/SessionI.java
-Ice/throughput/build.xml
-Ice/throughput/Client.java
-Ice/throughput/config.client
-Ice/throughput/config.server
-Ice/throughput/README
-Ice/throughput/Server.java
-Ice/throughput/Throughput.ice
-Ice/throughput/ThroughputI.java
-Ice/value/build.xml
-Ice/value/Client.java
-Ice/value/config.client
-Ice/value/config.server
-Ice/value/DerivedPrinterI.java
-Ice/value/InitialI.java
-Ice/value/ObjectFactory.java
-Ice/value/PrinterI.java
-Ice/value/README
-Ice/value/Server.java
-Ice/value/Value.ice
-IceBox/build.xml
-IceBox/hello/build.xml
-IceBox/hello/Client.java
-IceBox/hello/config.client
-IceBox/hello/config.icebox
-IceBox/hello/Hello.ice
-IceBox/hello/HelloI.java
-IceBox/hello/HelloServiceI.java
-IceBox/hello/README
-IceBox/README
-IceGrid/allocate/application-multiple.xml
-IceGrid/allocate/application-single.xml
-IceGrid/allocate/build.xml
-IceGrid/allocate/Client.java
-IceGrid/allocate/config.client
-IceGrid/allocate/config.grid
-IceGrid/allocate/Hello.ice
-IceGrid/allocate/HelloI.java
-IceGrid/allocate/README
-IceGrid/allocate/Server.java
-IceGrid/build.xml
-IceGrid/README
-IceGrid/sessionActivation/application.xml
-IceGrid/sessionActivation/build.xml
-IceGrid/sessionActivation/Client.java
-IceGrid/sessionActivation/config.client
-IceGrid/sessionActivation/config.grid
-IceGrid/sessionActivation/Hello.ice
-IceGrid/sessionActivation/HelloI.java
-IceGrid/sessionActivation/README
-IceGrid/sessionActivation/Server.java
-IceGrid/simple/application.xml
-IceGrid/simple/application_with_replication.xml
-IceGrid/simple/application_with_template.xml
-IceGrid/simple/build.xml
-IceGrid/simple/Client.java
-IceGrid/simple/config.client
-IceGrid/simple/config.grid
-IceGrid/simple/Hello.ice
-IceGrid/simple/HelloI.java
-IceGrid/simple/README
-IceGrid/simple/Server.java
-IceStorm/build.xml
-IceStorm/clock/build.xml
-IceStorm/clock/Clock.ice
-#IceStorm/clock/ClockI.java
-IceStorm/clock/config.icebox
-IceStorm/clock/config.pub
-IceStorm/clock/config.service
-IceStorm/clock/config.sub
-IceStorm/clock/Publisher.java
-IceStorm/clock/README
-IceStorm/clock/Subscriber.java
-IceStorm/README
-README
-Freeze/bench/db
-Freeze/library/db
-Freeze/phonebook/db
-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
-IceStorm/clock/db
+include=README
+include=**/*.*
+exclude=**/.dummy
+exclude=**/classes/**
+exclude=**/generated/**
diff --git a/cpp/install/common/components/icephp.demo b/cpp/install/common/components/icephp.demo
index ca51399be8f..4614af48ba5 100755
--- a/cpp/install/common/components/icephp.demo
+++ b/cpp/install/common/components/icephp.demo
@@ -1,21 +1,2 @@
-# To create an explicit listing for the demos run the following command
-# in the demo directory of the IcePHP distribution.:
-# find . -name "*" -type f | sed -e 's/^\.\///' >> $1
-#
-# If you want to use wild card searches instead of explicitly listing
-# files, you can delete the filenames and uncomment the following lines:
-#
-# include=*.*
-# include=**/*.*
-#
-# Stop uncommenting here!
-# Delete from here to EOF
-
-Ice/hello/Hello.ice
-Ice/hello/hello.php
-Ice/hello/README
-Ice/README
-Ice/value/Client.php
-Ice/value/php.ini
-Ice/value/README
-Ice/value/Value.ice
+include=*.*
+include=**/*.*
diff --git a/cpp/install/common/components/icepy.demo b/cpp/install/common/components/icepy.demo
index 3a37f08d9e4..9eff2cb67a9 100755
--- a/cpp/install/common/components/icepy.demo
+++ b/cpp/install/common/components/icepy.demo
@@ -1,117 +1,3 @@
-# To create an explicit listing for the demos run the following command
-# in the demo directory of the IcePy distribution.:
-# find . -name "*" -type f | sed -e 's/^\.\///' >> $1
-# find . -name "*" -type d | grep \/db |  sed -e 's/^\.\///' | sed -e '/^Freeze\/backup/d'  >> file
-#
-# If you want to use wild card searches instead of explicitly listing
-# files, you can delete the filenames and uncomment the following lines:
-#
-# include=*.*
-# include=**/*.*
-#
-# Stop uncommenting here!
-# Delete from here to EOF
-
-Glacier2/callback/Callback.ice
-Glacier2/callback/Client.py
-Glacier2/callback/config.client
-Glacier2/callback/config.glacier2
-Glacier2/callback/config.server
-Glacier2/callback/config.sessionserver
-Glacier2/callback/README
-Glacier2/callback/Server.py
-Glacier2/callback/SessionServer.py
-Glacier2/README
-Ice/bidir/Callback.ice
-Ice/bidir/Client.py
-Ice/bidir/config.client
-Ice/bidir/config.server
-Ice/bidir/README
-Ice/bidir/Server.py
-Ice/callback/Callback.ice
-Ice/callback/Client.py
-Ice/callback/config.client
-Ice/callback/config.server
-Ice/callback/README
-Ice/callback/Server.py
-Ice/hello/Client.py
-Ice/hello/config.client
-Ice/hello/config.server
-Ice/hello/Hello.ice
-Ice/hello/README
-Ice/hello/Server.py
-Ice/latency/Client.py
-Ice/latency/config.client
-Ice/latency/config.server
-Ice/latency/Latency.ice
-Ice/latency/README
-Ice/latency/Server.py
-Ice/minimal/Client.py
-Ice/minimal/Hello.ice
-Ice/minimal/README
-Ice/minimal/Server.py
-Ice/README
-Ice/session/Client.py
-Ice/session/config.client
-Ice/session/config.server
-Ice/session/README
-Ice/session/Server.py
-Ice/session/Session.ice
-Ice/throughput/Client.py
-Ice/throughput/config.client
-Ice/throughput/config.server
-Ice/throughput/README
-Ice/throughput/Server.py
-Ice/throughput/Throughput.ice
-Ice/value/Client.py
-Ice/value/config.client
-Ice/value/config.server
-Ice/value/Printer.py
-Ice/value/README
-Ice/value/Server.py
-Ice/value/Value.ice
-IceGrid/allocate/application-multiple.xml
-IceGrid/allocate/application-single.xml
-IceGrid/allocate/Client.py
-IceGrid/allocate/config.client
-IceGrid/allocate/config.grid
-IceGrid/allocate/Hello.ice
-IceGrid/allocate/README
-IceGrid/allocate/Server.py
-IceGrid/sessionActivation/application.xml
-IceGrid/sessionActivation/Client.py
-IceGrid/sessionActivation/config.client
-IceGrid/sessionActivation/config.grid
-IceGrid/sessionActivation/Hello.ice
-IceGrid/sessionActivation/README
-IceGrid/sessionActivation/Server.py
-IceGrid/simple/application.xml
-IceGrid/simple/application_with_replication.xml
-IceGrid/simple/application_with_template.xml
-IceGrid/simple/Client.py
-IceGrid/simple/config.client
-IceGrid/simple/config.grid
-IceGrid/simple/Hello.ice
-IceGrid/simple/README
-IceGrid/simple/Server.py
-IceStorm/clock/Clock.ice
-IceStorm/clock/config.icebox
-IceStorm/clock/config.pub
-IceStorm/clock/config.service
-IceStorm/clock/config.sub
-IceStorm/clock/Publisher.py
-IceStorm/clock/README
-IceStorm/clock/Subscriber.py
-IceStorm/README
-README
-IceGrid/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
-IceStorm/clock/db
+include=*.*
+include=**/*.*
+exclude=Freeze/backup/**
diff --git a/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism
index ec5658616bc..801d178fd91 100755
--- a/cpp/install/vc80/Ice.ism
+++ b/cpp/install/vc80/Ice.ism
@@ -350,7 +350,7 @@
 		<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/><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>