trying out file list caches so we can get some error help without having to

    maintain file lists

5 files changed, 540 insertions, 473 deletions

diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 0ea97bd0ff4..9e14e783bc0 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -114,12 +114,12 @@ EVERYTHING		= all clean install
 
 
 {$(SDIR)\}.ice{$(HDIR)}.h:
-	del /q $(HDIR)\$(*F).h $(*F).cpp
+	-del /q $(HDIR)\$(*F).h $(*F).cpp
 	$(SLICE2CPP) $(SLICE2CPPFLAGS) $<
 	move $(*F).h $(HDIR)
 
 .ice.cpp:
-	del /q $(*F).h $(*F).cpp
+	-del /q $(*F).h $(*F).cpp
 	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
 
 all:: $(SRCS) $(TARGETS)
diff --git a/cpp/install/common/components.py b/cpp/install/common/components.py
index 63bd8dbaa10..cb4dc1a96d9 100755
--- a/cpp/install/common/components.py
+++ b/cpp/install/common/components.py
@@ -2,7 +2,7 @@
 # Defines Ice components
 #
 
-import ConfigParser, sys, os, logging, fnmatch, os.path, shutil, re
+import ConfigParser, sys, os, logging, fnmatch, os.path, shutil, re, pprint
 
 def listFileLists():
     """Information routine for getting lists of file lists from a components file"""
@@ -54,7 +54,8 @@ def recursiveListing(path):
     return result
 
 class FileSpecWorker:
-    def __init__(self, source, dest):
+    def __init__(self, id, source, dest):
+        self.id = id
         self.source = source
         self.dest = dest
         self.include = []
@@ -173,7 +174,7 @@ class FileSpecWorker:
 
 
         #
-        # Using sets is the "easiest" way to do this. If Python"s set
+        # Using sets is the "easiest" way to do this. If Python's set
         # implementation is/gets buggy then this needs to be written
         # "longhand".
         #
@@ -198,6 +199,66 @@ class FileSpecWorker:
                 logging.debug(f)
 
         #
+        # Detect changes in file list and confirm that changes are okay.
+        #
+        cachedResults = None
+        cacheFilename = os.path.join(os.path.dirname(__file__), "%s.cache" % self.id)
+        if os.path.exists(cacheFilename):
+            cacheFile = open(cacheFilename, "r+b")
+            cachedResults = cacheFile.readlines()
+            cacheFile.close()
+
+        for i in range(0, len(cachedResults)):
+            cachedResults[i] = cachedResults[i].rstrip()
+
+        if cachedResults != None:
+            previous = set(cachedResults)
+            current = set(result)
+            added = current - previous
+            removed = previous - current
+            if len(added) > 0:
+                print "Additions detected:"
+                pprint.pprint(list(added))
+                print "Accept (y/n):",
+                while True:
+                    answer = sys.stdin.read(1)
+                    if answer in ["Y", "y"]:
+                        break
+                    elif answer in ["N", "n"]:
+                        print "\nAborting..."
+                        rejects = open("%s.rejects" % self.id, "w")
+                        rejects.write("Added:\n")
+                        rejects.writelines(pprint.pprint(list(added)))
+                        rejects.write("Deleted:\n")
+                        rejects.writelines(pprint.pprint(list(removed)))
+                        rejects.close()
+                        sys.exit(1)
+                
+            if len(removed) > 0:
+                print "Deletions detected:"
+                pprint.pprint(list(removed))
+                print "Accept (y/n):",
+                while True:
+                    answer = sys.stdin.read(1)
+                    if answer in ["Y", "y"]:
+                        break
+                    elif answer in ["N", "n"]:
+                        print "\nAborting..."
+                        rejects = open("%s.rejects" % self.id, "w")
+                        rejects.write("Added:\n")
+                        rejects.writelines(pprint.pprint(list(added)))
+                        rejects.write("Deleted:\n")
+                        rejects.writelines(pprint.pprint(list(removed)))
+                        rejects.close()
+                        sys.exit(1)
+
+        cacheFile = open(cacheFilename, "w+b")
+        for f in result:
+            cacheFile.write(f)
+            cacheFile.write("\n")
+        cacheFile.close()
+
+        #
         # Scan filename to see if matches one of our designated
         # 'convert to dos file format' name patterns. (These are
         # regex patterns, not patterns for filename globbing).
@@ -310,7 +371,7 @@ def stage(filename, componentdir, stageDirectory, group, defaults):
 
                     componentFile = file(filename, "r")
                     try:
-                        worker = FileSpecWorker(source, os.path.join(currentBase, dest))
+                        worker = FileSpecWorker(filename, source, os.path.join(currentBase, dest))
                         for line in componentFile:
                             current = line.strip()
                             if line.startswith('#'):
diff --git a/cpp/install/common/components/ice.demo.vc60 b/cpp/install/common/components/ice.demo.vc60
index 73236809914..dea9b83d419 100755
--- a/cpp/install/common/components/ice.demo.vc60
+++ b/cpp/install/common/components/ice.demo.vc60
@@ -8,469 +8,472 @@
 # If you want to use wild card searches instead of explicitly listing
 # files, you can delete the filenames and uncomment the following lines:
 #
-# 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/**
+
+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/**
+exclude=**/Makefile.mak
+
 #
 # Stop uncommenting here!
 # Delete from here to EOF
-
-book/evictor/EvictorBase.cpp
-book/evictor/EvictorBase.h
-book/evictor/README
-book/Makefile.mak
-book/printer/Client.cpp
-book/printer/Makefile.mak
-book/printer/Printer.ice
-book/printer/printerC.dsp
-book/printer/printerS.dsp
-book/printer/README
-book/printer/Server.cpp
-book/README
-book/simple_filesystem/Client.cpp
-book/simple_filesystem/Filesystem.ice
-book/simple_filesystem/FilesystemI.cpp
-book/simple_filesystem/FilesystemI.h
-book/simple_filesystem/Makefile.mak
-book/simple_filesystem/README
-book/simple_filesystem/Server.cpp
-book/simple_filesystem/simplefsC.dsp
-book/simple_filesystem/simplefsS.dsp
-Database/Oracle/occi/Client.cpp
-Database/Oracle/occi/config.client
-Database/Oracle/occi/config.server
-Database/Oracle/occi/createTypes.sql
-Database/Oracle/occi/DbTypes.typ
-Database/Oracle/occi/DeptFactoryI.cpp
-Database/Oracle/occi/DeptFactoryI.h
-Database/Oracle/occi/DeptI.cpp
-Database/Oracle/occi/DeptI.h
-Database/Oracle/occi/EmpI.cpp
-Database/Oracle/occi/EmpI.h
-Database/Oracle/occi/HR.ice
-Database/Oracle/occi/Makefile.mak
-Database/Oracle/occi/occiC.dsp
-Database/Oracle/occi/occiS.dsp
-Database/Oracle/occi/README
-Database/Oracle/occi/Server.cpp
-Database/Oracle/occi/Util.cpp
-Database/Oracle/occi/Util.h
-Database/Oracle/proc/Client.cpp
-Database/Oracle/proc/config.client
-Database/Oracle/proc/config.server
-Database/Oracle/proc/CurrentSqlContext.h
-Database/Oracle/proc/CurrentSqlContext.pc
-Database/Oracle/proc/DeptFactoryI.h
-Database/Oracle/proc/DeptFactoryI.pc
-Database/Oracle/proc/DeptI.h
-Database/Oracle/proc/DeptI.pc
-Database/Oracle/proc/EmpI.h
-Database/Oracle/proc/EmpI.pc
-Database/Oracle/proc/HR.ice
-Database/Oracle/proc/Makefile.mak
-Database/Oracle/proc/procC.dsp
-Database/Oracle/proc/procS.dsp
-Database/Oracle/proc/README
-Database/Oracle/proc/Server.pc
-Database/Oracle/proc/Util.h
-Database/Oracle/proc/Util.pc
-demo.dsp
-demo.dsw
-Freeze/bench/bench.dsp
-Freeze/bench/Client.cpp
-Freeze/bench/Makefile.mak
-Freeze/bench/README
-Freeze/bench/Test.ice
-Freeze/library/BookFactory.cpp
-Freeze/library/BookFactory.h
-Freeze/library/books
-Freeze/library/Client.cpp
-Freeze/library/Collocated.cpp
-Freeze/library/config.client
-Freeze/library/config.collocated
-Freeze/library/config.server
-Freeze/library/dummyinclude/unistd.h
-Freeze/library/Grammar.cpp
-Freeze/library/Grammar.h
-Freeze/library/Grammar.y
-Freeze/library/Library.ice
-Freeze/library/libraryC.dsp
-Freeze/library/libraryCOL.dsp
-Freeze/library/LibraryI.cpp
-Freeze/library/LibraryI.h
-Freeze/library/libraryS.dsp
-Freeze/library/Makefile.mak
-Freeze/library/Parser.cpp
-Freeze/library/Parser.h
-Freeze/library/README
-Freeze/library/RunParser.cpp
-Freeze/library/Scanner.cpp
-Freeze/library/Scanner.l
-Freeze/library/Server.cpp
-Freeze/Makefile.mak
-Freeze/phonebook/Client.cpp
-Freeze/phonebook/Collocated.cpp
-Freeze/phonebook/config.client
-Freeze/phonebook/config.collocated
-Freeze/phonebook/config.server
-Freeze/phonebook/ContactFactory.cpp
-Freeze/phonebook/ContactFactory.h
-Freeze/phonebook/contacts
-Freeze/phonebook/dummyinclude/unistd.h
-Freeze/phonebook/Grammar.cpp
-Freeze/phonebook/Grammar.h
-Freeze/phonebook/Grammar.y
-Freeze/phonebook/Makefile.mak
-Freeze/phonebook/Parser.cpp
-Freeze/phonebook/Parser.h
-Freeze/phonebook/PhoneBook.ice
-Freeze/phonebook/phonebookC.dsp
-Freeze/phonebook/phonebookCOL.dsp
-Freeze/phonebook/PhoneBookI.cpp
-Freeze/phonebook/PhoneBookI.h
-Freeze/phonebook/phonebookS.dsp
-Freeze/phonebook/README
-Freeze/phonebook/RunParser.cpp
-Freeze/phonebook/Scanner.cpp
-Freeze/phonebook/Scanner.l
-Freeze/phonebook/Server.cpp
-Freeze/README
-Glacier2/callback/Callback.ice
-Glacier2/callback/CallbackI.cpp
-Glacier2/callback/CallbackI.h
-Glacier2/callback/Client.cpp
-Glacier2/callback/config.client
-Glacier2/callback/config.glacier2
-Glacier2/callback/config.server
-Glacier2/callback/config.sessionserver
-Glacier2/callback/glacier2callbackC.dsp
-Glacier2/callback/glacier2callbackS.dsp
-Glacier2/callback/glacier2callbackSS.dsp
-Glacier2/callback/Makefile.mak
-Glacier2/callback/README
-Glacier2/callback/Server.cpp
-Glacier2/callback/SessionI.cpp
-Glacier2/callback/SessionI.h
-Glacier2/callback/SessionServer.cpp
-Glacier2/chat/Chat.ice
-Glacier2/chat/chatC.dsp
-Glacier2/chat/chatS.dsp
-Glacier2/chat/ChatSessionI.cpp
-Glacier2/chat/ChatSessionI.h
-Glacier2/chat/Client.cpp
-Glacier2/chat/config.client
-Glacier2/chat/config.glacier2
-Glacier2/chat/config.server
-Glacier2/chat/Makefile.mak
-Glacier2/chat/README
-Glacier2/chat/Server.cpp
-Glacier2/Makefile.mak
-Glacier2/README
-Ice/async/asyncC.dsp
-Ice/async/asyncP.dsp
-Ice/async/asyncS.dsp
-Ice/async/config.client
-Ice/async/config.server
-Ice/async/Consumer.cpp
-Ice/async/Makefile.mak
-Ice/async/Publisher.cpp
-Ice/async/Queue.ice
-Ice/async/QueueI.cpp
-Ice/async/QueueI.h
-Ice/async/README
-Ice/async/Server.cpp
-Ice/bidir/bidirC.dsp
-Ice/bidir/bidirS.dsp
-Ice/bidir/Callback.ice
-Ice/bidir/CallbackI.cpp
-Ice/bidir/CallbackI.h
-Ice/bidir/Client.cpp
-Ice/bidir/config.client
-Ice/bidir/config.server
-Ice/bidir/Makefile.mak
-Ice/bidir/README
-Ice/bidir/Server.cpp
-Ice/callback/Callback.ice
-Ice/callback/callbackC.dsp
-Ice/callback/callbackS.dsp
-Ice/callback/CallbackSenderI.cpp
-Ice/callback/CallbackSenderI.h
-Ice/callback/Client.cpp
-Ice/callback/config.client
-Ice/callback/config.server
-Ice/callback/Makefile.mak
-Ice/callback/README
-Ice/callback/Server.cpp
-Ice/converter/Client.cpp
-Ice/converter/config.client
-Ice/converter/config.server
-Ice/converter/converterC.dsp
-Ice/converter/converterS.dsp
-Ice/converter/Echo.ice
-Ice/converter/EchoI.cpp
-Ice/converter/EchoI.h
-Ice/converter/Makefile.mak
-Ice/converter/README
-Ice/converter/Server.cpp
-Ice/converter/StringConverterI.cpp
-Ice/converter/StringConverterI.h
-Ice/hello/Client.cpp
-Ice/hello/config.client
-Ice/hello/config.server
-Ice/hello/Hello.ice
-Ice/hello/helloC.dsp
-Ice/hello/HelloI.cpp
-Ice/hello/HelloI.h
-Ice/hello/helloS.dsp
-Ice/hello/Makefile.mak
-Ice/hello/README
-Ice/hello/Server.cpp
-Ice/invoke/Client.cpp
-Ice/invoke/config.client
-Ice/invoke/config.server
-Ice/invoke/invokeC.dsp
-Ice/invoke/invokeS.dsp
-Ice/invoke/Makefile.mak
-Ice/invoke/Printer.ice
-Ice/invoke/PrinterI.cpp
-Ice/invoke/PrinterI.h
-Ice/invoke/README
-Ice/invoke/Server.cpp
-Ice/latency/Client.cpp
-Ice/latency/config.client
-Ice/latency/config.server
-Ice/latency/Latency.ice
-Ice/latency/latencyC.dsp
-Ice/latency/latencyS.dsp
-Ice/latency/Makefile.mak
-Ice/latency/README
-Ice/latency/Server.cpp
-Ice/Makefile.mak
-Ice/MFC/client/config
-Ice/MFC/client/Hello.ice
-Ice/MFC/client/HelloClient.cpp
-Ice/MFC/client/HelloClient.h
-Ice/MFC/client/HelloClient.rc
-Ice/MFC/client/HelloClientDlg.cpp
-Ice/MFC/client/HelloClientDlg.h
-Ice/MFC/client/Makefile.mak
-Ice/MFC/client/mfchelloC.dsp
-Ice/MFC/client/README
-Ice/MFC/client/res/HelloClient.ico
-Ice/MFC/client/res/HelloClient.rc2
-Ice/MFC/client/Resource.h
-Ice/MFC/client/stdafx.cpp
-Ice/MFC/client/stdafx.h
-Ice/MFC/Makefile.mak
-Ice/MFC/server/config
-Ice/MFC/server/Hello.ice
-Ice/MFC/server/HelloI.cpp
-Ice/MFC/server/HelloI.h
-Ice/MFC/server/HelloServer.cpp
-Ice/MFC/server/HelloServer.h
-Ice/MFC/server/HelloServer.rc
-Ice/MFC/server/HelloServerDlg.cpp
-Ice/MFC/server/HelloServerDlg.h
-Ice/MFC/server/LogI.cpp
-Ice/MFC/server/LogI.h
-Ice/MFC/server/Makefile.mak
-Ice/MFC/server/mfchelloS.dsp
-Ice/MFC/server/README
-Ice/MFC/server/res/HelloServer.ico
-Ice/MFC/server/res/HelloServer.rc2
-Ice/MFC/server/Resource.h
-Ice/MFC/server/stdafx.cpp
-Ice/MFC/server/stdafx.h
-Ice/minimal/Client.cpp
-Ice/minimal/Hello.ice
-Ice/minimal/HelloI.cpp
-Ice/minimal/HelloI.h
-Ice/minimal/Makefile.mak
-Ice/minimal/minimalC.dsp
-Ice/minimal/minimalS.dsp
-Ice/minimal/README
-Ice/minimal/Server.cpp
-Ice/nested/Client.cpp
-Ice/nested/config.client
-Ice/nested/config.server
-Ice/nested/Makefile.mak
-Ice/nested/Nested.ice
-Ice/nested/nestedC.dsp
-Ice/nested/NestedI.cpp
-Ice/nested/NestedI.h
-Ice/nested/nestedS.dsp
-Ice/nested/README
-Ice/nested/Server.cpp
-Ice/README
-Ice/session/Client.cpp
-Ice/session/config.client
-Ice/session/config.server
-Ice/session/Makefile.mak
-Ice/session/README
-Ice/session/ReapThread.cpp
-Ice/session/ReapThread.h
-Ice/session/Server.cpp
-Ice/session/Session.ice
-Ice/session/sessionC.dsp
-Ice/session/SessionFactoryI.cpp
-Ice/session/SessionFactoryI.h
-Ice/session/SessionI.cpp
-Ice/session/SessionI.h
-Ice/session/sessionS.dsp
-Ice/throughput/Client.cpp
-Ice/throughput/config.client
-Ice/throughput/config.server
-Ice/throughput/Makefile.mak
-Ice/throughput/README
-Ice/throughput/Server.cpp
-Ice/throughput/Throughput.ice
-Ice/throughput/throughputC.dsp
-Ice/throughput/ThroughputI.cpp
-Ice/throughput/ThroughputI.h
-Ice/throughput/throughputS.dsp
-Ice/value/Client.cpp
-Ice/value/config.client
-Ice/value/config.server
-Ice/value/Makefile.mak
-Ice/value/ObjectFactory.cpp
-Ice/value/ObjectFactory.h
-Ice/value/README
-Ice/value/Server.cpp
-Ice/value/Value.ice
-Ice/value/valueC.dsp
-Ice/value/ValueI.cpp
-Ice/value/ValueI.h
-Ice/value/valueS.dsp
-IceBox/hello/Client.cpp
-IceBox/hello/config.client
-IceBox/hello/config.icebox
-IceBox/hello/Hello.ice
-IceBox/hello/HelloI.cpp
-IceBox/hello/HelloI.h
-IceBox/hello/helloiceboxC.dsp
-IceBox/hello/helloiceboxS.dsp
-IceBox/hello/HelloServiceI.cpp
-IceBox/hello/HelloServiceI.h
-IceBox/hello/Makefile.mak
-IceBox/hello/README
-IceBox/Makefile.mak
-IceBox/README
-IceGrid/allocate/allocateC.dsp
-IceGrid/allocate/allocateS.dsp
-IceGrid/allocate/application-multiple.xml
-IceGrid/allocate/application-single.xml
-IceGrid/allocate/Client.cpp
-IceGrid/allocate/config.client
-IceGrid/allocate/config.grid
-IceGrid/allocate/Hello.ice
-IceGrid/allocate/HelloI.cpp
-IceGrid/allocate/HelloI.h
-IceGrid/allocate/Makefile.mak
-IceGrid/allocate/README
-IceGrid/allocate/Server.cpp
-IceGrid/Makefile.mak
-IceGrid/README
-IceGrid/sessionActivation/application.xml
-IceGrid/sessionActivation/Client.cpp
-IceGrid/sessionActivation/config.client
-IceGrid/sessionActivation/config.grid
-IceGrid/sessionActivation/Hello.ice
-IceGrid/sessionActivation/HelloI.cpp
-IceGrid/sessionActivation/HelloI.h
-IceGrid/sessionActivation/Makefile.mak
-IceGrid/sessionActivation/README
-IceGrid/sessionActivation/Server.cpp
-IceGrid/sessionActivation/sessionActivationC.dsp
-IceGrid/sessionActivation/sessionActivationS.dsp
-IceGrid/simple/application.xml
-IceGrid/simple/application_with_replication.xml
-IceGrid/simple/application_with_template.xml
-IceGrid/simple/Client.cpp
-IceGrid/simple/config.client
-IceGrid/simple/config.grid
-IceGrid/simple/config.master
-IceGrid/simple/config.node1
-IceGrid/simple/config.replica1
-IceGrid/simple/config.replica2
-IceGrid/simple/Hello.ice
-IceGrid/simple/HelloI.cpp
-IceGrid/simple/HelloI.h
-IceGrid/simple/Makefile.mak
-IceGrid/simple/README
-IceGrid/simple/Server.cpp
-IceGrid/simple/simpleC.dsp
-IceGrid/simple/simpleS.dsp
-IcePatch2/Makefile.mak
-IcePatch2/MFC/Makefile.mak
-IcePatch2/MFC/mfcpatchC.dsp
-IcePatch2/MFC/PatchClient.cpp
-IcePatch2/MFC/PatchClient.h
-IcePatch2/MFC/PatchClient.ico
-IcePatch2/MFC/PatchClient.rc
-IcePatch2/MFC/PatchClientDlg.cpp
-IcePatch2/MFC/PatchClientDlg.h
-IcePatch2/MFC/README
-IcePatch2/MFC/resource.h
-IcePatch2/MFC/stdafx.cpp
-IcePatch2/MFC/stdafx.h
-IcePatch2/README
-IceStorm/clock/Clock.ice
-IceStorm/clock/clockC.dsp
-IceStorm/clock/clockS.dsp
-IceStorm/clock/config.icebox
-IceStorm/clock/config.pub
-IceStorm/clock/config.service
-IceStorm/clock/config.sub
-IceStorm/clock/Makefile.mak
-IceStorm/clock/Publisher.cpp
-IceStorm/clock/README
-IceStorm/clock/Subscriber.cpp
-IceStorm/counter/Client.cpp
-IceStorm/counter/config.client
-IceStorm/counter/config.icebox
-IceStorm/counter/config.server
-IceStorm/counter/config.service
-IceStorm/counter/Counter.ice
-IceStorm/counter/counterC.dsp
-IceStorm/counter/CounterI.cpp
-IceStorm/counter/CounterI.h
-IceStorm/counter/CounterObserverI.cpp
-IceStorm/counter/CounterObserverI.h
-IceStorm/counter/counterS.dsp
-IceStorm/counter/Makefile.mak
-IceStorm/counter/README
-IceStorm/counter/Server.cpp
-IceStorm/Makefile.mak
-IceStorm/README
-IceUtil/Makefile.mak
-IceUtil/README
-IceUtil/workqueue/Makefile.mak
-IceUtil/workqueue/README
-IceUtil/workqueue/WorkQueue.cpp
-IceUtil/workqueue/workqueue.dsp
-Makefile.mak
-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
+#
+#book/evictor/EvictorBase.cpp
+#book/evictor/EvictorBase.h
+#book/evictor/README
+#book/Makefile.mak
+#book/printer/Client.cpp
+#book/printer/Makefile.mak
+#book/printer/Printer.ice
+#book/printer/printerC.dsp
+#book/printer/printerS.dsp
+#book/printer/README
+#book/printer/Server.cpp
+#book/README
+#book/simple_filesystem/Client.cpp
+#book/simple_filesystem/Filesystem.ice
+#book/simple_filesystem/FilesystemI.cpp
+#book/simple_filesystem/FilesystemI.h
+#book/simple_filesystem/Makefile.mak
+#book/simple_filesystem/README
+#book/simple_filesystem/Server.cpp
+#book/simple_filesystem/simplefsC.dsp
+#book/simple_filesystem/simplefsS.dsp
+#Database/Oracle/occi/Client.cpp
+#Database/Oracle/occi/config.client
+#Database/Oracle/occi/config.server
+#Database/Oracle/occi/createTypes.sql
+#Database/Oracle/occi/DbTypes.typ
+#Database/Oracle/occi/DeptFactoryI.cpp
+#Database/Oracle/occi/DeptFactoryI.h
+#Database/Oracle/occi/DeptI.cpp
+#Database/Oracle/occi/DeptI.h
+#Database/Oracle/occi/EmpI.cpp
+#Database/Oracle/occi/EmpI.h
+#Database/Oracle/occi/HR.ice
+#Database/Oracle/occi/Makefile.mak
+#Database/Oracle/occi/occiC.dsp
+#Database/Oracle/occi/occiS.dsp
+#Database/Oracle/occi/README
+#Database/Oracle/occi/Server.cpp
+#Database/Oracle/occi/Util.cpp
+#Database/Oracle/occi/Util.h
+#Database/Oracle/proc/Client.cpp
+#Database/Oracle/proc/config.client
+#Database/Oracle/proc/config.server
+#Database/Oracle/proc/CurrentSqlContext.h
+#Database/Oracle/proc/CurrentSqlContext.pc
+#Database/Oracle/proc/DeptFactoryI.h
+#Database/Oracle/proc/DeptFactoryI.pc
+#Database/Oracle/proc/DeptI.h
+#Database/Oracle/proc/DeptI.pc
+#Database/Oracle/proc/EmpI.h
+#Database/Oracle/proc/EmpI.pc
+#Database/Oracle/proc/HR.ice
+#Database/Oracle/proc/Makefile.mak
+#Database/Oracle/proc/procC.dsp
+#Database/Oracle/proc/procS.dsp
+#Database/Oracle/proc/README
+#Database/Oracle/proc/Server.pc
+#Database/Oracle/proc/Util.h
+#Database/Oracle/proc/Util.pc
+#demo.dsp
+#demo.dsw
+#Freeze/bench/bench.dsp
+#Freeze/bench/Client.cpp
+#Freeze/bench/Makefile.mak
+#Freeze/bench/README
+#Freeze/bench/Test.ice
+#Freeze/library/BookFactory.cpp
+#Freeze/library/BookFactory.h
+#Freeze/library/books
+#Freeze/library/Client.cpp
+#Freeze/library/Collocated.cpp
+#Freeze/library/config.client
+#Freeze/library/config.collocated
+#Freeze/library/config.server
+#Freeze/library/dummyinclude/unistd.h
+#Freeze/library/Grammar.cpp
+#Freeze/library/Grammar.h
+#Freeze/library/Grammar.y
+#Freeze/library/Library.ice
+#Freeze/library/libraryC.dsp
+#Freeze/library/libraryCOL.dsp
+#Freeze/library/LibraryI.cpp
+#Freeze/library/LibraryI.h
+#Freeze/library/libraryS.dsp
+#Freeze/library/Makefile.mak
+#Freeze/library/Parser.cpp
+#Freeze/library/Parser.h
+#Freeze/library/README
+#Freeze/library/RunParser.cpp
+#Freeze/library/Scanner.cpp
+#Freeze/library/Scanner.l
+#Freeze/library/Server.cpp
+#Freeze/Makefile.mak
+#Freeze/phonebook/Client.cpp
+#Freeze/phonebook/Collocated.cpp
+#Freeze/phonebook/config.client
+#Freeze/phonebook/config.collocated
+#Freeze/phonebook/config.server
+#Freeze/phonebook/ContactFactory.cpp
+#Freeze/phonebook/ContactFactory.h
+#Freeze/phonebook/contacts
+#Freeze/phonebook/dummyinclude/unistd.h
+#Freeze/phonebook/Grammar.cpp
+#Freeze/phonebook/Grammar.h
+#Freeze/phonebook/Grammar.y
+#Freeze/phonebook/Makefile.mak
+#Freeze/phonebook/Parser.cpp
+#Freeze/phonebook/Parser.h
+#Freeze/phonebook/PhoneBook.ice
+#Freeze/phonebook/phonebookC.dsp
+#Freeze/phonebook/phonebookCOL.dsp
+#Freeze/phonebook/PhoneBookI.cpp
+#Freeze/phonebook/PhoneBookI.h
+#Freeze/phonebook/phonebookS.dsp
+#Freeze/phonebook/README
+#Freeze/phonebook/RunParser.cpp
+#Freeze/phonebook/Scanner.cpp
+#Freeze/phonebook/Scanner.l
+#Freeze/phonebook/Server.cpp
+#Freeze/README
+#Glacier2/callback/Callback.ice
+#Glacier2/callback/CallbackI.cpp
+#Glacier2/callback/CallbackI.h
+#Glacier2/callback/Client.cpp
+#Glacier2/callback/config.client
+#Glacier2/callback/config.glacier2
+#Glacier2/callback/config.server
+#Glacier2/callback/config.sessionserver
+#Glacier2/callback/glacier2callbackC.dsp
+#Glacier2/callback/glacier2callbackS.dsp
+#Glacier2/callback/glacier2callbackSS.dsp
+#Glacier2/callback/Makefile.mak
+#Glacier2/callback/README
+#Glacier2/callback/Server.cpp
+#Glacier2/callback/SessionI.cpp
+#Glacier2/callback/SessionI.h
+#Glacier2/callback/SessionServer.cpp
+#Glacier2/chat/Chat.ice
+#Glacier2/chat/chatC.dsp
+#Glacier2/chat/chatS.dsp
+#Glacier2/chat/ChatSessionI.cpp
+#Glacier2/chat/ChatSessionI.h
+#Glacier2/chat/Client.cpp
+#Glacier2/chat/config.client
+#Glacier2/chat/config.glacier2
+#Glacier2/chat/config.server
+#Glacier2/chat/Makefile.mak
+#Glacier2/chat/README
+#Glacier2/chat/Server.cpp
+#Glacier2/Makefile.mak
+#Glacier2/README
+#Ice/async/asyncC.dsp
+#Ice/async/asyncP.dsp
+#Ice/async/asyncS.dsp
+#Ice/async/config.client
+#Ice/async/config.server
+#Ice/async/Consumer.cpp
+#Ice/async/Makefile.mak
+#Ice/async/Publisher.cpp
+#Ice/async/Queue.ice
+#Ice/async/QueueI.cpp
+#Ice/async/QueueI.h
+#Ice/async/README
+#Ice/async/Server.cpp
+#Ice/bidir/bidirC.dsp
+#Ice/bidir/bidirS.dsp
+#Ice/bidir/Callback.ice
+#Ice/bidir/CallbackI.cpp
+#Ice/bidir/CallbackI.h
+#Ice/bidir/Client.cpp
+#Ice/bidir/config.client
+#Ice/bidir/config.server
+#Ice/bidir/Makefile.mak
+#Ice/bidir/README
+#Ice/bidir/Server.cpp
+#Ice/callback/Callback.ice
+#Ice/callback/callbackC.dsp
+#Ice/callback/callbackS.dsp
+#Ice/callback/CallbackSenderI.cpp
+#Ice/callback/CallbackSenderI.h
+#Ice/callback/Client.cpp
+#Ice/callback/config.client
+#Ice/callback/config.server
+#Ice/callback/Makefile.mak
+#Ice/callback/README
+#Ice/callback/Server.cpp
+#Ice/converter/Client.cpp
+#Ice/converter/config.client
+#Ice/converter/config.server
+#Ice/converter/converterC.dsp
+#Ice/converter/converterS.dsp
+#Ice/converter/Echo.ice
+#Ice/converter/EchoI.cpp
+#Ice/converter/EchoI.h
+#Ice/converter/Makefile.mak
+#Ice/converter/README
+#Ice/converter/Server.cpp
+#Ice/converter/StringConverterI.cpp
+#Ice/converter/StringConverterI.h
+#Ice/hello/Client.cpp
+#Ice/hello/config.client
+#Ice/hello/config.server
+#Ice/hello/Hello.ice
+#Ice/hello/helloC.dsp
+#Ice/hello/HelloI.cpp
+#Ice/hello/HelloI.h
+#Ice/hello/helloS.dsp
+#Ice/hello/Makefile.mak
+#Ice/hello/README
+#Ice/hello/Server.cpp
+#Ice/invoke/Client.cpp
+#Ice/invoke/config.client
+#Ice/invoke/config.server
+#Ice/invoke/invokeC.dsp
+#Ice/invoke/invokeS.dsp
+#Ice/invoke/Makefile.mak
+#Ice/invoke/Printer.ice
+#Ice/invoke/PrinterI.cpp
+#Ice/invoke/PrinterI.h
+#Ice/invoke/README
+#Ice/invoke/Server.cpp
+#Ice/latency/Client.cpp
+#Ice/latency/config.client
+#Ice/latency/config.server
+#Ice/latency/Latency.ice
+#Ice/latency/latencyC.dsp
+#Ice/latency/latencyS.dsp
+#Ice/latency/Makefile.mak
+#Ice/latency/README
+#Ice/latency/Server.cpp
+#Ice/Makefile.mak
+#Ice/MFC/client/config
+#Ice/MFC/client/Hello.ice
+#Ice/MFC/client/HelloClient.cpp
+#Ice/MFC/client/HelloClient.h
+#Ice/MFC/client/HelloClient.rc
+#Ice/MFC/client/HelloClientDlg.cpp
+#Ice/MFC/client/HelloClientDlg.h
+#Ice/MFC/client/Makefile.mak
+#Ice/MFC/client/mfchelloC.dsp
+#Ice/MFC/client/README
+#Ice/MFC/client/res/HelloClient.ico
+#Ice/MFC/client/res/HelloClient.rc2
+#Ice/MFC/client/Resource.h
+#Ice/MFC/client/stdafx.cpp
+#Ice/MFC/client/stdafx.h
+#Ice/MFC/Makefile.mak
+#Ice/MFC/server/config
+#Ice/MFC/server/Hello.ice
+#Ice/MFC/server/HelloI.cpp
+#Ice/MFC/server/HelloI.h
+#Ice/MFC/server/HelloServer.cpp
+#Ice/MFC/server/HelloServer.h
+#Ice/MFC/server/HelloServer.rc
+#Ice/MFC/server/HelloServerDlg.cpp
+#Ice/MFC/server/HelloServerDlg.h
+#Ice/MFC/server/LogI.cpp
+#Ice/MFC/server/LogI.h
+#Ice/MFC/server/Makefile.mak
+#Ice/MFC/server/mfchelloS.dsp
+#Ice/MFC/server/README
+#Ice/MFC/server/res/HelloServer.ico
+#Ice/MFC/server/res/HelloServer.rc2
+#Ice/MFC/server/Resource.h
+#Ice/MFC/server/stdafx.cpp
+#Ice/MFC/server/stdafx.h
+#Ice/minimal/Client.cpp
+#Ice/minimal/Hello.ice
+#Ice/minimal/HelloI.cpp
+#Ice/minimal/HelloI.h
+#Ice/minimal/Makefile.mak
+#Ice/minimal/minimalC.dsp
+#Ice/minimal/minimalS.dsp
+#Ice/minimal/README
+#Ice/minimal/Server.cpp
+#Ice/nested/Client.cpp
+#Ice/nested/config.client
+#Ice/nested/config.server
+#Ice/nested/Makefile.mak
+#Ice/nested/Nested.ice
+#Ice/nested/nestedC.dsp
+#Ice/nested/NestedI.cpp
+#Ice/nested/NestedI.h
+#Ice/nested/nestedS.dsp
+#Ice/nested/README
+#Ice/nested/Server.cpp
+#Ice/README
+#Ice/session/Client.cpp
+#Ice/session/config.client
+#Ice/session/config.server
+#Ice/session/Makefile.mak
+#Ice/session/README
+#Ice/session/ReapThread.cpp
+#Ice/session/ReapThread.h
+#Ice/session/Server.cpp
+#Ice/session/Session.ice
+#Ice/session/sessionC.dsp
+#Ice/session/SessionFactoryI.cpp
+#Ice/session/SessionFactoryI.h
+#Ice/session/SessionI.cpp
+#Ice/session/SessionI.h
+#Ice/session/sessionS.dsp
+#Ice/throughput/Client.cpp
+#Ice/throughput/config.client
+#Ice/throughput/config.server
+#Ice/throughput/Makefile.mak
+#Ice/throughput/README
+#Ice/throughput/Server.cpp
+#Ice/throughput/Throughput.ice
+#Ice/throughput/throughputC.dsp
+#Ice/throughput/ThroughputI.cpp
+#Ice/throughput/ThroughputI.h
+#Ice/throughput/throughputS.dsp
+#Ice/value/Client.cpp
+#Ice/value/config.client
+#Ice/value/config.server
+#Ice/value/Makefile.mak
+#Ice/value/ObjectFactory.cpp
+#Ice/value/ObjectFactory.h
+#Ice/value/README
+#Ice/value/Server.cpp
+#Ice/value/Value.ice
+#Ice/value/valueC.dsp
+#Ice/value/ValueI.cpp
+#Ice/value/ValueI.h
+#Ice/value/valueS.dsp
+#IceBox/hello/Client.cpp
+#IceBox/hello/config.client
+#IceBox/hello/config.icebox
+#IceBox/hello/Hello.ice
+#IceBox/hello/HelloI.cpp
+#IceBox/hello/HelloI.h
+#IceBox/hello/helloiceboxC.dsp
+#IceBox/hello/helloiceboxS.dsp
+#IceBox/hello/HelloServiceI.cpp
+#IceBox/hello/HelloServiceI.h
+#IceBox/hello/Makefile.mak
+#IceBox/hello/README
+#IceBox/Makefile.mak
+#IceBox/README
+#IceGrid/allocate/allocateC.dsp
+#IceGrid/allocate/allocateS.dsp
+#IceGrid/allocate/application-multiple.xml
+#IceGrid/allocate/application-single.xml
+#IceGrid/allocate/Client.cpp
+#IceGrid/allocate/config.client
+#IceGrid/allocate/config.grid
+#IceGrid/allocate/Hello.ice
+#IceGrid/allocate/HelloI.cpp
+#IceGrid/allocate/HelloI.h
+#IceGrid/allocate/Makefile.mak
+#IceGrid/allocate/README
+#IceGrid/allocate/Server.cpp
+#IceGrid/Makefile.mak
+#IceGrid/README
+#IceGrid/sessionActivation/application.xml
+#IceGrid/sessionActivation/Client.cpp
+#IceGrid/sessionActivation/config.client
+#IceGrid/sessionActivation/config.grid
+#IceGrid/sessionActivation/Hello.ice
+#IceGrid/sessionActivation/HelloI.cpp
+#IceGrid/sessionActivation/HelloI.h
+#IceGrid/sessionActivation/Makefile.mak
+#IceGrid/sessionActivation/README
+#IceGrid/sessionActivation/Server.cpp
+#IceGrid/sessionActivation/sessionActivationC.dsp
+#IceGrid/sessionActivation/sessionActivationS.dsp
+#IceGrid/simple/application.xml
+#IceGrid/simple/application_with_replication.xml
+#IceGrid/simple/application_with_template.xml
+#IceGrid/simple/Client.cpp
+#IceGrid/simple/config.client
+#IceGrid/simple/config.grid
+#IceGrid/simple/config.master
+#IceGrid/simple/config.node1
+#IceGrid/simple/config.replica1
+#IceGrid/simple/config.replica2
+#IceGrid/simple/Hello.ice
+#IceGrid/simple/HelloI.cpp
+#IceGrid/simple/HelloI.h
+#IceGrid/simple/Makefile.mak
+#IceGrid/simple/README
+#IceGrid/simple/Server.cpp
+#IceGrid/simple/simpleC.dsp
+#IceGrid/simple/simpleS.dsp
+#IcePatch2/Makefile.mak
+#IcePatch2/MFC/Makefile.mak
+#IcePatch2/MFC/mfcpatchC.dsp
+#IcePatch2/MFC/PatchClient.cpp
+#IcePatch2/MFC/PatchClient.h
+#IcePatch2/MFC/PatchClient.ico
+#IcePatch2/MFC/PatchClient.rc
+#IcePatch2/MFC/PatchClientDlg.cpp
+#IcePatch2/MFC/PatchClientDlg.h
+#IcePatch2/MFC/README
+#IcePatch2/MFC/resource.h
+#IcePatch2/MFC/stdafx.cpp
+#IcePatch2/MFC/stdafx.h
+#IcePatch2/README
+#IceStorm/clock/Clock.ice
+#IceStorm/clock/clockC.dsp
+#IceStorm/clock/clockS.dsp
+#IceStorm/clock/config.icebox
+#IceStorm/clock/config.pub
+#IceStorm/clock/config.service
+#IceStorm/clock/config.sub
+#IceStorm/clock/Makefile.mak
+#IceStorm/clock/Publisher.cpp
+#IceStorm/clock/README
+#IceStorm/clock/Subscriber.cpp
+#IceStorm/counter/Client.cpp
+#IceStorm/counter/config.client
+#IceStorm/counter/config.icebox
+#IceStorm/counter/config.server
+#IceStorm/counter/config.service
+#IceStorm/counter/Counter.ice
+#IceStorm/counter/counterC.dsp
+#IceStorm/counter/CounterI.cpp
+#IceStorm/counter/CounterI.h
+#IceStorm/counter/CounterObserverI.cpp
+#IceStorm/counter/CounterObserverI.h
+#IceStorm/counter/counterS.dsp
+#IceStorm/counter/Makefile.mak
+#IceStorm/counter/README
+#IceStorm/counter/Server.cpp
+#IceStorm/Makefile.mak
+#IceStorm/README
+#IceUtil/Makefile.mak
+#IceUtil/README
+#IceUtil/workqueue/Makefile.mak
+#IceUtil/workqueue/README
+#IceUtil/workqueue/WorkQueue.cpp
+#IceUtil/workqueue/workqueue.dsp
+#Makefile.mak
+#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
diff --git a/cpp/install/vc60/BerkeleyDBDevKit.ism b/cpp/install/vc60/BerkeleyDBDevKit.ism
index a7d23dcd0ac..ab2630f9e92 100755
--- a/cpp/install/vc60/BerkeleyDBDevKit.ism
+++ b/cpp/install/vc60/BerkeleyDBDevKit.ism
@@ -689,7 +689,7 @@
 		<col def="S0">Comment</col>

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

 		<row><td>ID_STRING1</td><td>1033</td><td>BerkeleyDB Dev Kit for Visual Studio 6.0</td><td>0</td><td/><td>429507296</td></row>

-		<row><td>ID_STRING2</td><td>1033</td><td>ZeroC</td><td>0</td><td/><td>-2129048628</td></row>

+		<row><td>ID_STRING2</td><td>1033</td><td>ZeroC, Inc</td><td>0</td><td/><td>689696139</td></row>

 	</table>

 

 	<table name="Icon">

diff --git a/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism
index c5727959dbb..9c590104446 100755
--- a/cpp/install/vc80/Ice.ism
+++ b/cpp/install/vc80/Ice.ism
@@ -1001,7 +1001,9 @@
 		<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, icesslcs) DO copy [INSTALLDIR]bin\%f.pdb [WindowsFolder]assembly\GAC_MSIL\%f\3.1.0.0__1f998c50fec78381</td><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, icesslcs) DO copy [INSTALLDIR]bin\%f.pdb [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381</td><td/></row>

+		<row><td>NewCustomAction1</td><td>1394</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs, icesslcs) DO del /q [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381\%f.pdb</td><td/></row>

+		<row><td>NewCustomAction11</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs, icesslcs) DO del /q [WindowsFolder]assembly\GAC_MSIL\%f\3.2.0.0__1f998c50fec78381\%f.pdb</td><td/></row>

 		<row><td>SetARPINSTALLLOCATION</td><td>51</td><td>ARPINSTALLLOCATION</td><td>[INSTALLDIR]</td><td/></row>

 		<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>

 		<row><td>setAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>

@@ -2619,6 +2621,8 @@
 		<row><td>MoveFiles</td><td/><td>3800</td><td>MoveFiles</td><td/></row>

 		<row><td>MsiPublishAssemblies</td><td/><td>6250</td><td>MsiPublishAssemblies</td><td/></row>

 		<row><td>MsiUnpublishAssemblies</td><td/><td>1750</td><td>MsiUnpublishAssemblies</td><td/></row>

+		<row><td>NewCustomAction1</td><td/><td>6287</td><td/><td/></row>

+		<row><td>NewCustomAction11</td><td/><td>1775</td><td/><td/></row>

 		<row><td>PatchFiles</td><td/><td>4090</td><td>PatchFiles</td><td/></row>

 		<row><td>ProcessComponents</td><td/><td>1600</td><td>ProcessComponents</td><td/></row>

 		<row><td>PublishComponents</td><td/><td>6200</td><td>PublishComponents</td><td/></row>

@@ -2891,6 +2895,7 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA=
 		<row><td>AdminWarning</td><td>0</td><td/></row>

 		<row><td>AgreeToLicense</td><td>No</td><td/></row>

 		<row><td>ApplicationUsers</td><td>AllUsers</td><td/></row>

+		<row><td>CMD_EXE</td><td/><td/></row>

 		<row><td>ContinueNotAdminText</td><td>0</td><td/></row>

 		<row><td>DWUSINTERVAL</td><td>30</td><td/></row>

 		<row><td>DefaultUIFont</td><td>Tahoma8</td><td/></row>

@@ -2905,8 +2910,6 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA=
 		<row><td>ISCHECKFORPRODUCTUPDATES</td><td>1</td><td/></row>

 		<row><td>ISENABLEDWUSFINISHDIALOG</td><td/><td/></row>

 		<row><td>ISJITCOMPILEATINSTALLPROPERTY</td><td/><td/></row>

-		<row><td>ISSCRIPT_VERSION_MISSING</td><td>##IDS_ISSCRIPT_VERSION_MISSING##</td><td/></row>

-		<row><td>ISSCRIPT_VERSION_OLD</td><td>##IDS_ISSCRIPT_VERSION_OLD##</td><td/></row>

 		<row><td>ISVROOT_PORT_NO</td><td>0</td><td/></row>

 		<row><td>InstallChoice</td><td>AR</td><td/></row>

 		<row><td>Manufacturer</td><td>##COMPANY_NAME##</td><td/></row>