summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-12-19 14:00:46 +0000
committerBrent Eagles <brent@zeroc.com>2005-12-19 14:00:46 +0000
commitf07d8a79ef4d4935bcb1994ef5f879f9aa0d7e83 (patch)
treeab26d828d606be29b2f8c0f13331508c604c1cd7 /cpp
parentFixed typo (diff)
downloadice-f07d8a79ef4d4935bcb1994ef5f879f9aa0d7e83.tar.bz2
ice-f07d8a79ef4d4935bcb1994ef5f879f9aa0d7e83.tar.xz
ice-f07d8a79ef4d4935bcb1994ef5f879f9aa0d7e83.zip
*** empty log message ***
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/install/common/components.py6
-rwxr-xr-xcpp/install/common/components/bzip2.dev.dll1
-rwxr-xr-xcpp/install/common/components/bzip2.dev.header1
-rwxr-xr-xcpp/install/common/components/bzip2.runtime1
-rwxr-xr-xcpp/install/common/components/components.ini20
-rwxr-xr-xcpp/install/common/components/ice.demo.vc6057
-rwxr-xr-xcpp/install/common/components/ice.demo.vc7157
-rwxr-xr-xcpp/install/common/components/ice.doc.images12
-rwxr-xr-xcpp/install/common/components/ice.dotnet.assemblies8
-rwxr-xr-xcpp/install/common/components/icegridgui1
-rwxr-xr-xcpp/install/common/components/make_cs_demo_list.sh4
-rwxr-xr-xcpp/install/common/components/make_demo_list_vc60.sh4
-rwxr-xr-xcpp/install/common/components/make_demo_list_vc71.sh4
-rwxr-xr-xcpp/install/common/components/make_vb_demo_list.sh4
-rwxr-xr-xcpp/install/common/components/openssl.runtime1
-rwxr-xr-xcpp/install/vc71/Ice.ism63
-rwxr-xr-xcpp/install/vc71/ThirdParty.ism27
17 files changed, 192 insertions, 79 deletions
diff --git a/cpp/install/common/components.py b/cpp/install/common/components.py
index 13df10db731..357a893706c 100755
--- a/cpp/install/common/components.py
+++ b/cpp/install/common/components.py
@@ -295,7 +295,11 @@ def stage(filename, componentdir, stageDirectory, group, defaults):
logging.log(logging.DEBUG, 'Adding templatized name %s' % computedName)
worker.add(computedName)
else:
- worker.add(current % defaults)
+ try:
+ worker.add(current % defaults)
+ except Exception, e:
+ print str(e) + ": occured while adding %s to worker in element %d in %s" % \
+ (current, i, section)
if worker == None:
msg = "Component file %s is empty." % filename
diff --git a/cpp/install/common/components/bzip2.dev.dll b/cpp/install/common/components/bzip2.dev.dll
index 2163d9d40b0..e69de29bb2d 100755
--- a/cpp/install/common/components/bzip2.dev.dll
+++ b/cpp/install/common/components/bzip2.dev.dll
@@ -1 +0,0 @@
-bzip2d.dll
diff --git a/cpp/install/common/components/bzip2.dev.header b/cpp/install/common/components/bzip2.dev.header
index ef082047431..d70b131499d 100755
--- a/cpp/install/common/components/bzip2.dev.header
+++ b/cpp/install/common/components/bzip2.dev.header
@@ -1,2 +1 @@
bzlib.h
-bzlib_private.h
diff --git a/cpp/install/common/components/bzip2.runtime b/cpp/install/common/components/bzip2.runtime
index c6544d82d29..e2ae7bf194a 100755
--- a/cpp/install/common/components/bzip2.runtime
+++ b/cpp/install/common/components/bzip2.runtime
@@ -1 +1,2 @@
bzip2.dll
+bzip2d.dll
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index dd2fd25ae9d..9fdf44763d8 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -38,7 +38,7 @@ jgoodies-runtime=jgoodies
microsoft-runtime=microsoft runtime
[ice common]
-elements=5
+elements=6
active=1
source1=%(INSTALL_TOOLS)s/common
filelist1=installer.data
@@ -55,6 +55,9 @@ dest4=html/doc/reference
source5=%(BUILD_DIR)s/Ice-%(version)s
filelist5=ice.license
dest5=doc
+source6=%(BUILD_DIR)s/Ice-%(version)s/doc/images
+filelist6=ice.doc.images
+dest6=html/doc/reference/stylesheet-images
[ice packages common]
elements=3
@@ -70,7 +73,7 @@ filelist3=packages.licenses.%(target)s
dest3=doc
[ice runtime]
-elements=5
+elements=6
active=1
;;
@@ -105,6 +108,10 @@ source5=%(BUILD_DIR)s/Ice-%(version)s/src
filelist5=ice.runtime.icestormservice
dest5=bin
+source6=%(BUILD_DIR)s/IceJ-%(version)s/lib
+filelist6=icegridgui
+dest6=bin
+
[ice dev]
elements=8
active=1
@@ -277,7 +284,7 @@ active=1
targets=~vc60,vc71
source1=%(BUILD_DIR)s/IcePy-%(version)s/demo
filelist1=icepy.demo
-dest1=dempopy
+dest1=demopy
[berkeley db runtime]
elements=1
@@ -319,17 +326,14 @@ filelist1=bzip2.runtime
dest1=bin
[bzip2 dev]
-elements=3
+elements=2
active=1
source1=%(BZIP2_HOME)s
filelist1=bzip2.dev.lib
dest1=lib
source2=%(BZIP2_HOME)s
filelist2=bzip2.dev.header
-dest2=header
-source3=%(BZIP2_HOME)s
-filelist3=bzip2.dev.dll
-dest3=bin
+dest2=include
[expat runtime]
elements=1
diff --git a/cpp/install/common/components/ice.demo.vc60 b/cpp/install/common/components/ice.demo.vc60
index 45da4af8930..cca489eef29 100755
--- a/cpp/install/common/components/ice.demo.vc60
+++ b/cpp/install/common/components/ice.demo.vc60
@@ -1,8 +1,8 @@
-
# To create an explicit listing for the demos run the following command
# in the demo directory of the ice distribution.:
-# find . -name "*" | sed -e '/Debug\|Release\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' |
-# sed -e '/^Freeze\/backup/d' >> file
+# find . -name "*" -type f| sed -e '/Debug\|Release\|.exe$\|.ilk$\|.plg$\
+# \|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' |
+# sed -e '/^Freeze\/backup/d' | sed -e 's/^\.\///' >> file
#
# If you want to use wild card searches instead of explicitly listing
# files, you can delete the filenames and uncomment the following lines:
@@ -23,6 +23,7 @@
# exclude=Freeze/backup/**
#
# Stop uncommenting here!
+# Delete from here to EOF
book/evictor/EvictorBase.cpp
book/evictor/EvictorBase.h
@@ -32,7 +33,9 @@ book/printer/Printer.cpp
book/printer/Printer.h
book/printer/Printer.ice
book/printer/printerC.dsp
+book/printer/printerC.vcproj
book/printer/printerS.dsp
+book/printer/printerS.vcproj
book/printer/README
book/printer/Server.cpp
book/README
@@ -45,10 +48,15 @@ book/simple_filesystem/FilesystemI.h
book/simple_filesystem/README
book/simple_filesystem/Server.cpp
book/simple_filesystem/simplefsC.dsp
+book/simple_filesystem/simplefsC.vcproj
book/simple_filesystem/simplefsS.dsp
+book/simple_filesystem/simplefsS.vcproj
demo.dsp
demo.dsw
+demo.sln
+demo.vcproj
Freeze/bench/bench.dsp
+Freeze/bench/bench.vcproj
Freeze/bench/BenchTypes.cpp
Freeze/bench/BenchTypes.h
Freeze/bench/Client.cpp
@@ -63,6 +71,7 @@ Freeze/library/books
Freeze/library/Client.cpp
Freeze/library/Collocated.cpp
Freeze/library/config
+Freeze/library/dummyinclude/unistd.h
Freeze/library/Grammar.cpp
Freeze/library/Grammar.h
Freeze/library/Grammar.y
@@ -70,10 +79,13 @@ Freeze/library/Library.cpp
Freeze/library/Library.h
Freeze/library/Library.ice
Freeze/library/libraryC.dsp
+Freeze/library/libraryC.vcproj
Freeze/library/libraryCOL.dsp
+Freeze/library/libraryCOL.vcproj
Freeze/library/LibraryI.cpp
Freeze/library/LibraryI.h
Freeze/library/libraryS.dsp
+Freeze/library/libraryS.vcproj
Freeze/library/LibraryTypes.cpp
Freeze/library/LibraryTypes.h
Freeze/library/Parser.cpp
@@ -89,6 +101,7 @@ Freeze/phonebook/config
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
@@ -100,10 +113,13 @@ Freeze/phonebook/PhoneBook.cpp
Freeze/phonebook/PhoneBook.h
Freeze/phonebook/PhoneBook.ice
Freeze/phonebook/phonebookC.dsp
+Freeze/phonebook/phonebookC.vcproj
Freeze/phonebook/phonebookCOL.dsp
+Freeze/phonebook/phonebookCOL.vcproj
Freeze/phonebook/PhoneBookI.cpp
Freeze/phonebook/PhoneBookI.h
Freeze/phonebook/phonebookS.dsp
+Freeze/phonebook/phonebookS.vcproj
Freeze/phonebook/README
Freeze/phonebook/RunParser.cpp
Freeze/phonebook/Scanner.cpp
@@ -121,8 +137,11 @@ Glacier2/callback/config.glacier2
Glacier2/callback/config.server
Glacier2/callback/config.sessionserver
Glacier2/callback/glacier2callbackC.dsp
+Glacier2/callback/glacier2callbackC.vcproj
Glacier2/callback/glacier2callbackS.dsp
+Glacier2/callback/glacier2callbackS.vcproj
Glacier2/callback/glacier2callbackSS.dsp
+Glacier2/callback/glacier2callbackSS.vcproj
Glacier2/callback/README
Glacier2/callback/Server.cpp
Glacier2/callback/SessionI.cpp
@@ -132,7 +151,9 @@ Glacier2/chat/Chat.cpp
Glacier2/chat/Chat.h
Glacier2/chat/Chat.ice
Glacier2/chat/chatC.dsp
+Glacier2/chat/chatC.vcproj
Glacier2/chat/chatS.dsp
+Glacier2/chat/chatS.vcproj
Glacier2/chat/ChatSessionI.cpp
Glacier2/chat/ChatSessionI.h
Glacier2/chat/Client.cpp
@@ -143,7 +164,9 @@ Glacier2/chat/README
Glacier2/chat/Server.cpp
Glacier2/README
Ice/bidir/bidirC.dsp
+Ice/bidir/bidirC.vcproj
Ice/bidir/bidirS.dsp
+Ice/bidir/bidirS.vcproj
Ice/bidir/Callback.cpp
Ice/bidir/Callback.h
Ice/bidir/Callback.ice
@@ -157,7 +180,9 @@ Ice/callback/Callback.cpp
Ice/callback/Callback.h
Ice/callback/Callback.ice
Ice/callback/callbackC.dsp
+Ice/callback/callbackC.vcproj
Ice/callback/callbackS.dsp
+Ice/callback/callbackS.vcproj
Ice/callback/CallbackSenderI.cpp
Ice/callback/CallbackSenderI.h
Ice/callback/Client.cpp
@@ -170,15 +195,19 @@ Ice/hello/Hello.cpp
Ice/hello/Hello.h
Ice/hello/Hello.ice
Ice/hello/helloC.dsp
+Ice/hello/helloC.vcproj
Ice/hello/HelloI.cpp
Ice/hello/HelloI.h
Ice/hello/helloS.dsp
+Ice/hello/helloS.vcproj
Ice/hello/README
Ice/hello/Server.cpp
Ice/invoke/Client.cpp
Ice/invoke/config
Ice/invoke/invokeC.dsp
+Ice/invoke/invokeC.vcproj
Ice/invoke/invokeS.dsp
+Ice/invoke/invokeS.vcproj
Ice/invoke/Printer.cpp
Ice/invoke/Printer.h
Ice/invoke/Printer.ice
@@ -192,7 +221,9 @@ Ice/latency/Latency.cpp
Ice/latency/Latency.h
Ice/latency/Latency.ice
Ice/latency/latencyC.dsp
+Ice/latency/latencyC.vcproj
Ice/latency/latencyS.dsp
+Ice/latency/latencyS.vcproj
Ice/latency/README
Ice/latency/Server.cpp
Ice/MFC/client/config
@@ -205,6 +236,7 @@ Ice/MFC/client/HelloClient.rc
Ice/MFC/client/HelloClientDlg.cpp
Ice/MFC/client/HelloClientDlg.h
Ice/MFC/client/mfchelloC.dsp
+Ice/MFC/client/mfchelloC.vcproj
Ice/MFC/client/README
Ice/MFC/client/res/HelloClient.ico
Ice/MFC/client/res/HelloClient.rc2
@@ -225,6 +257,7 @@ Ice/MFC/server/HelloServerDlg.h
Ice/MFC/server/LogI.cpp
Ice/MFC/server/LogI.h
Ice/MFC/server/mfchelloS.dsp
+Ice/MFC/server/mfchelloS.vcproj
Ice/MFC/server/README
Ice/MFC/server/res/HelloServer.ico
Ice/MFC/server/res/HelloServer.rc2
@@ -238,7 +271,9 @@ Ice/minimal/Hello.ice
Ice/minimal/HelloI.cpp
Ice/minimal/HelloI.h
Ice/minimal/minimalC.dsp
+Ice/minimal/minimalC.vcproj
Ice/minimal/minimalS.dsp
+Ice/minimal/minimalS.vcproj
Ice/minimal/README
Ice/minimal/Server.cpp
Ice/nested/Client.cpp
@@ -247,9 +282,11 @@ Ice/nested/Nested.cpp
Ice/nested/Nested.h
Ice/nested/Nested.ice
Ice/nested/nestedC.dsp
+Ice/nested/nestedC.vcproj
Ice/nested/NestedI.cpp
Ice/nested/NestedI.h
Ice/nested/nestedS.dsp
+Ice/nested/nestedS.vcproj
Ice/nested/README
Ice/nested/Server.cpp
Ice/README
@@ -263,11 +300,13 @@ Ice/session/Session.cpp
Ice/session/Session.h
Ice/session/Session.ice
Ice/session/sessionC.dsp
+Ice/session/sessionC.vcproj
Ice/session/SessionFactoryI.cpp
Ice/session/SessionFactoryI.h
Ice/session/SessionI.cpp
Ice/session/SessionI.h
Ice/session/sessionS.dsp
+Ice/session/sessionS.vcproj
Ice/throughput/Client.cpp
Ice/throughput/config
Ice/throughput/README
@@ -276,9 +315,11 @@ Ice/throughput/Throughput.cpp
Ice/throughput/Throughput.h
Ice/throughput/Throughput.ice
Ice/throughput/throughputC.dsp
+Ice/throughput/throughputC.vcproj
Ice/throughput/ThroughputI.cpp
Ice/throughput/ThroughputI.h
Ice/throughput/throughputS.dsp
+Ice/throughput/throughputS.vcproj
Ice/value/Client.cpp
Ice/value/config
Ice/value/ObjectFactory.cpp
@@ -289,9 +330,11 @@ Ice/value/Value.cpp
Ice/value/Value.h
Ice/value/Value.ice
Ice/value/valueC.dsp
+Ice/value/valueC.vcproj
Ice/value/ValueI.cpp
Ice/value/ValueI.h
Ice/value/valueS.dsp
+Ice/value/valueS.vcproj
IceBox/hello/Client.cpp
IceBox/hello/config
IceBox/hello/Hello.cpp
@@ -300,7 +343,9 @@ IceBox/hello/Hello.ice
IceBox/hello/HelloI.cpp
IceBox/hello/HelloI.h
IceBox/hello/helloiceboxC.dsp
+IceBox/hello/helloiceboxC.vcproj
IceBox/hello/helloiceboxS.dsp
+IceBox/hello/helloiceboxS.vcproj
IceBox/hello/helloservice.dll
IceBox/hello/helloservice.exp
IceBox/hello/helloservice.lib
@@ -324,8 +369,11 @@ IceGrid/simple/HelloI.h
IceGrid/simple/README
IceGrid/simple/Server.cpp
IceGrid/simple/simpleC.dsp
+IceGrid/simple/simpleC.vcproj
IceGrid/simple/simpleS.dsp
+IceGrid/simple/simpleS.vcproj
IcePatch2/MFC/mfcpatchC.dsp
+IcePatch2/MFC/mfcpatchC.vcproj
IcePatch2/MFC/PatchClient.cpp
IcePatch2/MFC/PatchClient.h
IcePatch2/MFC/PatchClient.ico
@@ -341,9 +389,11 @@ IceStorm/clock/Clock.cpp
IceStorm/clock/Clock.h
IceStorm/clock/Clock.ice
IceStorm/clock/clockC.dsp
+IceStorm/clock/clockC.vcproj
IceStorm/clock/ClockI.cpp
IceStorm/clock/ClockI.h
IceStorm/clock/clockS.dsp
+IceStorm/clock/clockS.vcproj
IceStorm/clock/config
IceStorm/clock/config_service
IceStorm/clock/Publisher.cpp
@@ -354,4 +404,5 @@ IceUtil/README
IceUtil/workqueue/README
IceUtil/workqueue/WorkQueue.cpp
IceUtil/workqueue/workqueue.dsp
+IceUtil/workqueue/workqueue.vcproj
README
diff --git a/cpp/install/common/components/ice.demo.vc71 b/cpp/install/common/components/ice.demo.vc71
index 2ebbc3d878e..b09d29342b2 100755
--- a/cpp/install/common/components/ice.demo.vc71
+++ b/cpp/install/common/components/ice.demo.vc71
@@ -1,8 +1,8 @@
-
# To create an explicit listing for the demos run the following command
# in the demo directory of the ice distribution.:
-# find . -name "*" | sed -e '/Debug\|Release\|.dsp$\|.dsw$\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' |
-# sed -e '/^Freeze\/backup/d' >> file
+# find . -name "*" -type f | sed -e '/Debug\|Release\|.dsp$\|.dsw$\|.exe$\
+# \|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' | \
+# sed -e '/^Freeze\/backup/d' | sed -e 's/^\.\///' >> file
#
# If you want to use wild card searches instead of explicitly listing
# files, you can delete the filenames and uncomment the following lines:
@@ -25,6 +25,7 @@
# exclude=Freeze/backup/**
#
# Stop uncommenting here!
+# Delete from here to EOF
book/evictor/EvictorBase.cpp
book/evictor/EvictorBase.h
@@ -33,6 +34,8 @@ book/printer/Client.cpp
book/printer/Printer.cpp
book/printer/Printer.h
book/printer/Printer.ice
+book/printer/printerC.vcproj
+book/printer/printerS.vcproj
book/printer/README
book/printer/Server.cpp
book/README
@@ -44,6 +47,11 @@ book/simple_filesystem/FilesystemI.cpp
book/simple_filesystem/FilesystemI.h
book/simple_filesystem/README
book/simple_filesystem/Server.cpp
+book/simple_filesystem/simplefsC.vcproj
+book/simple_filesystem/simplefsS.vcproj
+demo.sln
+demo.vcproj
+Freeze/bench/bench.vcproj
Freeze/bench/BenchTypes.cpp
Freeze/bench/BenchTypes.h
Freeze/bench/Client.cpp
@@ -58,14 +66,18 @@ Freeze/library/books
Freeze/library/Client.cpp
Freeze/library/Collocated.cpp
Freeze/library/config
+Freeze/library/dummyinclude/unistd.h
Freeze/library/Grammar.cpp
Freeze/library/Grammar.h
Freeze/library/Grammar.y
Freeze/library/Library.cpp
Freeze/library/Library.h
Freeze/library/Library.ice
+Freeze/library/libraryC.vcproj
+Freeze/library/libraryCOL.vcproj
Freeze/library/LibraryI.cpp
Freeze/library/LibraryI.h
+Freeze/library/libraryS.vcproj
Freeze/library/LibraryTypes.cpp
Freeze/library/LibraryTypes.h
Freeze/library/Parser.cpp
@@ -81,6 +93,7 @@ Freeze/phonebook/config
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
@@ -91,8 +104,11 @@ Freeze/phonebook/Parser.h
Freeze/phonebook/PhoneBook.cpp
Freeze/phonebook/PhoneBook.h
Freeze/phonebook/PhoneBook.ice
+Freeze/phonebook/phonebookC.vcproj
+Freeze/phonebook/phonebookCOL.vcproj
Freeze/phonebook/PhoneBookI.cpp
Freeze/phonebook/PhoneBookI.h
+Freeze/phonebook/phonebookS.vcproj
Freeze/phonebook/README
Freeze/phonebook/RunParser.cpp
Freeze/phonebook/Scanner.cpp
@@ -109,6 +125,9 @@ Glacier2/callback/config
Glacier2/callback/config.glacier2
Glacier2/callback/config.server
Glacier2/callback/config.sessionserver
+Glacier2/callback/glacier2callbackC.vcproj
+Glacier2/callback/glacier2callbackS.vcproj
+Glacier2/callback/glacier2callbackSS.vcproj
Glacier2/callback/README
Glacier2/callback/Server.cpp
Glacier2/callback/SessionI.cpp
@@ -117,6 +136,8 @@ Glacier2/callback/SessionServer.cpp
Glacier2/chat/Chat.cpp
Glacier2/chat/Chat.h
Glacier2/chat/Chat.ice
+Glacier2/chat/chatC.vcproj
+Glacier2/chat/chatS.vcproj
Glacier2/chat/ChatSessionI.cpp
Glacier2/chat/ChatSessionI.h
Glacier2/chat/Client.cpp
@@ -126,6 +147,8 @@ Glacier2/chat/config.server
Glacier2/chat/README
Glacier2/chat/Server.cpp
Glacier2/README
+Ice/bidir/bidirC.vcproj
+Ice/bidir/bidirS.vcproj
Ice/bidir/Callback.cpp
Ice/bidir/Callback.h
Ice/bidir/Callback.ice
@@ -138,6 +161,8 @@ Ice/bidir/Server.cpp
Ice/callback/Callback.cpp
Ice/callback/Callback.h
Ice/callback/Callback.ice
+Ice/callback/callbackC.vcproj
+Ice/callback/callbackS.vcproj
Ice/callback/CallbackSenderI.cpp
Ice/callback/CallbackSenderI.h
Ice/callback/Client.cpp
@@ -149,12 +174,16 @@ Ice/hello/config
Ice/hello/Hello.cpp
Ice/hello/Hello.h
Ice/hello/Hello.ice
+Ice/hello/helloC.vcproj
Ice/hello/HelloI.cpp
Ice/hello/HelloI.h
+Ice/hello/helloS.vcproj
Ice/hello/README
Ice/hello/Server.cpp
Ice/invoke/Client.cpp
Ice/invoke/config
+Ice/invoke/invokeC.vcproj
+Ice/invoke/invokeS.vcproj
Ice/invoke/Printer.cpp
Ice/invoke/Printer.h
Ice/invoke/Printer.ice
@@ -167,6 +196,8 @@ Ice/latency/config
Ice/latency/Latency.cpp
Ice/latency/Latency.h
Ice/latency/Latency.ice
+Ice/latency/latencyC.vcproj
+Ice/latency/latencyS.vcproj
Ice/latency/README
Ice/latency/Server.cpp
Ice/MFC/client/config
@@ -178,6 +209,7 @@ Ice/MFC/client/HelloClient.h
Ice/MFC/client/HelloClient.rc
Ice/MFC/client/HelloClientDlg.cpp
Ice/MFC/client/HelloClientDlg.h
+Ice/MFC/client/mfchelloC.vcproj
Ice/MFC/client/README
Ice/MFC/client/res/HelloClient.ico
Ice/MFC/client/res/HelloClient.rc2
@@ -197,6 +229,7 @@ Ice/MFC/server/HelloServerDlg.cpp
Ice/MFC/server/HelloServerDlg.h
Ice/MFC/server/LogI.cpp
Ice/MFC/server/LogI.h
+Ice/MFC/server/mfchelloS.vcproj
Ice/MFC/server/README
Ice/MFC/server/res/HelloServer.ico
Ice/MFC/server/res/HelloServer.rc2
@@ -209,6 +242,8 @@ Ice/minimal/Hello.h
Ice/minimal/Hello.ice
Ice/minimal/HelloI.cpp
Ice/minimal/HelloI.h
+Ice/minimal/minimalC.vcproj
+Ice/minimal/minimalS.vcproj
Ice/minimal/README
Ice/minimal/Server.cpp
Ice/nested/Client.cpp
@@ -216,8 +251,10 @@ Ice/nested/config
Ice/nested/Nested.cpp
Ice/nested/Nested.h
Ice/nested/Nested.ice
+Ice/nested/nestedC.vcproj
Ice/nested/NestedI.cpp
Ice/nested/NestedI.h
+Ice/nested/nestedS.vcproj
Ice/nested/README
Ice/nested/Server.cpp
Ice/README
@@ -230,10 +267,12 @@ Ice/session/Server.cpp
Ice/session/Session.cpp
Ice/session/Session.h
Ice/session/Session.ice
+Ice/session/sessionC.vcproj
Ice/session/SessionFactoryI.cpp
Ice/session/SessionFactoryI.h
Ice/session/SessionI.cpp
Ice/session/SessionI.h
+Ice/session/sessionS.vcproj
Ice/throughput/Client.cpp
Ice/throughput/config
Ice/throughput/README
@@ -241,8 +280,10 @@ Ice/throughput/Server.cpp
Ice/throughput/Throughput.cpp
Ice/throughput/Throughput.h
Ice/throughput/Throughput.ice
+Ice/throughput/throughputC.vcproj
Ice/throughput/ThroughputI.cpp
Ice/throughput/ThroughputI.h
+Ice/throughput/throughputS.vcproj
Ice/value/Client.cpp
Ice/value/config
Ice/value/ObjectFactory.cpp
@@ -252,8 +293,10 @@ Ice/value/Server.cpp
Ice/value/Value.cpp
Ice/value/Value.h
Ice/value/Value.ice
+Ice/value/valueC.vcproj
Ice/value/ValueI.cpp
Ice/value/ValueI.h
+Ice/value/valueS.vcproj
IceBox/hello/Client.cpp
IceBox/hello/config
IceBox/hello/Hello.cpp
@@ -261,6 +304,8 @@ IceBox/hello/Hello.h
IceBox/hello/Hello.ice
IceBox/hello/HelloI.cpp
IceBox/hello/HelloI.h
+IceBox/hello/helloiceboxC.vcproj
+IceBox/hello/helloiceboxS.vcproj
IceBox/hello/helloservice.dll
IceBox/hello/helloservice.exp
IceBox/hello/helloservice.lib
@@ -283,6 +328,9 @@ IceGrid/simple/HelloI.cpp
IceGrid/simple/HelloI.h
IceGrid/simple/README
IceGrid/simple/Server.cpp
+IceGrid/simple/simpleC.vcproj
+IceGrid/simple/simpleS.vcproj
+IcePatch2/MFC/mfcpatchC.vcproj
IcePatch2/MFC/PatchClient.cpp
IcePatch2/MFC/PatchClient.h
IcePatch2/MFC/PatchClient.ico
@@ -297,8 +345,10 @@ IcePatch2/README
IceStorm/clock/Clock.cpp
IceStorm/clock/Clock.h
IceStorm/clock/Clock.ice
+IceStorm/clock/clockC.vcproj
IceStorm/clock/ClockI.cpp
IceStorm/clock/ClockI.h
+IceStorm/clock/clockS.vcproj
IceStorm/clock/config
IceStorm/clock/config_service
IceStorm/clock/Publisher.cpp
@@ -308,4 +358,5 @@ IceStorm/README
IceUtil/README
IceUtil/workqueue/README
IceUtil/workqueue/WorkQueue.cpp
+IceUtil/workqueue/workqueue.vcproj
README
diff --git a/cpp/install/common/components/ice.doc.images b/cpp/install/common/components/ice.doc.images
new file mode 100755
index 00000000000..4a5c9fab7ca
--- /dev/null
+++ b/cpp/install/common/components/ice.doc.images
@@ -0,0 +1,12 @@
+caution.gif
+home.gif
+important.gif
+next.gif
+note.gif
+prev.gif
+tip.gif
+toc-blank.gif
+toc-minus.gif
+toc-plus.gif
+up.gif
+warning.gif
diff --git a/cpp/install/common/components/ice.dotnet.assemblies b/cpp/install/common/components/ice.dotnet.assemblies
index 081a9827f64..f64916aec2e 100755
--- a/cpp/install/common/components/ice.dotnet.assemblies
+++ b/cpp/install/common/components/ice.dotnet.assemblies
@@ -4,3 +4,11 @@ icecs.dll
icegridcs.dll
icepatch2cs.dll
icestormcs.dll
+glacier2cs.pdb
+iceboxcs.pdb
+icecs.pdb
+icegridcs.pdb
+icepatch2cs.pdb
+icestormcs.pdb
+iceboxnet.exe
+iceboxnet.pdb
diff --git a/cpp/install/common/components/icegridgui b/cpp/install/common/components/icegridgui
new file mode 100755
index 00000000000..d2cc8e133f2
--- /dev/null
+++ b/cpp/install/common/components/icegridgui
@@ -0,0 +1 @@
+IceGridGUI.jar
diff --git a/cpp/install/common/components/make_cs_demo_list.sh b/cpp/install/common/components/make_cs_demo_list.sh
index 06b0ece7f71..08e888e6d4d 100755
--- a/cpp/install/common/components/make_cs_demo_list.sh
+++ b/cpp/install/common/components/make_cs_demo_list.sh
@@ -6,7 +6,7 @@ cat >$1 <<\_CMTFILE
# 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].csproj.*$/d' # | \
+# Makefile\|.pdb$\|\.bat$\|\.dummy\|[^D].csproj.*$/d' # | \
# sed -e 's/^\.\///' \
# >> file
#
@@ -32,4 +32,4 @@ cat >$1 <<\_CMTFILE
_CMTFILE
-find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|Makefile\|.pdb$\|*.bat$\|.dummy\|[^D].csproj.*$/d' | sed -e 's/^\.\///' >> $1
+find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|Makefile\|.pdb$\|.bat$\|\.dummy\|[^D].csproj.*$/d' | sed -e 's/^\.\///' >> $1
diff --git a/cpp/install/common/components/make_demo_list_vc60.sh b/cpp/install/common/components/make_demo_list_vc60.sh
index f79e2024397..6eccc28857e 100755
--- a/cpp/install/common/components/make_demo_list_vc60.sh
+++ b/cpp/install/common/components/make_demo_list_vc60.sh
@@ -6,7 +6,7 @@ cat >$1 <<\_CMTFILE
# To create an explicit listing for the demos run the following command
# in the demo directory of the ice distribution.:
# find . -name "*" -type f| sed -e '/Debug\|Release\|.exe$\|.ilk$\|.plg$\
-# \|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' |
+# \|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' |
# sed -e '/^Freeze\/backup/d' | sed -e 's/^\.\///' >> file
#
# If you want to use wild card searches instead of explicitly listing
@@ -32,4 +32,4 @@ cat >$1 <<\_CMTFILE
_CMTFILE
-find . -name "*" -type f | sed -e '/Debug\|Release\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' | sed -e '/^[\.\/]*Freeze\/backup/d' | sed -e 's/^\.\///' >> $1
+find . -name "*" -type f | sed -e '/Debug\|Release\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' | sed -e '/^[\.\/]*Freeze\/backup/d' | sed -e 's/^\.\///' >> $1
diff --git a/cpp/install/common/components/make_demo_list_vc71.sh b/cpp/install/common/components/make_demo_list_vc71.sh
index 606df9aae5f..f30118e4185 100755
--- a/cpp/install/common/components/make_demo_list_vc71.sh
+++ b/cpp/install/common/components/make_demo_list_vc71.sh
@@ -6,7 +6,7 @@ cat >$1 <<\_CMTFILE
# To create an explicit listing for the demos run the following command
# in the demo directory of the ice distribution.:
# find . -name "*" -type f | sed -e '/Debug\|Release\|.dsp$\|.dsw$\|.exe$\
-# \|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' | \
+# \|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' | \
# sed -e '/^Freeze\/backup/d' | sed -e 's/^\.\///' >> file
#
# If you want to use wild card searches instead of explicitly listing
@@ -34,4 +34,4 @@ cat >$1 <<\_CMTFILE
_CMTFILE
-find . -name "*" -type f | sed -e '/Debug\|Release\|.dsp$\|.dsw$\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|*.suo$\|.dummy/d' | sed -e '/^[\.\/]*Freeze\/backup/d' | sed -e 's/^\.\///' >> $1
+find . -name "*" -type f | sed -e '/Debug\|Release\|.dsp$\|.dsw$\|.exe$\|.ilk$\|.plg$\|.depend\|Makefile\|.pdb$\|.ncb$\|.suo$\|\.dummy/d' | sed -e '/^[\.\/]*Freeze\/backup/d' | sed -e 's/^\.\///' >> $1
diff --git a/cpp/install/common/components/make_vb_demo_list.sh b/cpp/install/common/components/make_vb_demo_list.sh
index 3b563273b70..1e6d397f4f6 100755
--- a/cpp/install/common/components/make_vb_demo_list.sh
+++ b/cpp/install/common/components/make_vb_demo_list.sh
@@ -6,7 +6,7 @@ cat >$1 <<\_CMTFILE
# To create an explicit listing for the demos run the following command
# in the demo directory of the IceVB distribution:
# find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|\
-# Makefile\|.pdb$\|\*.bat$\|.dummy\|[^D].vbproj.*$/d' # | \
+# Makefile\|.pdb$\|\*.bat$\|\.dummy\|[^D].vbproj.*$/d' # | \
# sed -e 's/^\.\///' \
# >> file
#
@@ -32,4 +32,4 @@ cat >$1 <<\_CMTFILE
_CMTFILE
-find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|Makefile\|.pdb$\|*.bat$\|.dummy\|[^D].vbproj.*$/d' | sed -e 's/^\.\///' >> $1
+find . -name "*" -type f | sed -e '/generated\|obj\|.exe$\|.dll$\|.depend\|Makefile\|.pdb$\|*.bat$\|\.dummy\|[^D].vbproj.*$/d' | sed -e 's/^\.\///' >> $1
diff --git a/cpp/install/common/components/openssl.runtime b/cpp/install/common/components/openssl.runtime
index 901987de975..e841343ef36 100755
--- a/cpp/install/common/components/openssl.runtime
+++ b/cpp/install/common/components/openssl.runtime
@@ -1,2 +1,3 @@
libeay32.dll
ssleay32.dll
+openssl.exe
diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism
index ba2814bae53..92eafdba17c 100755
--- a/cpp/install/vc71/Ice.ism
+++ b/cpp/install/vc71/Ice.ism
@@ -253,7 +253,6 @@
<col key="yes" def="s72">Name</col>
<col def="V0">Data</col>
<col def="S255">ISBuildSourcePath</col>
- <row><td>ISSELFREG.DLL</td><td/><td>&lt;ISProductFolder&gt;\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\IsDialogBanner.ibd</td></row>
<row><td>NewBinary10</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
@@ -264,9 +263,9 @@
<row><td>NewBinary16</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallFirstUse.ico</td></row>
<row><td>NewBinary17</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallPartial.ico</td></row>
<row><td>NewBinary18</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallStateMenu.ico</td></row>
- <row><td>NewBinary19</td><td/><td>&lt;ISProjectFolder&gt;\install\ice-common\installer-main.bmp</td></row>
+ <row><td>NewBinary19</td><td/><td>&lt;ISProjectFolder&gt;\install\ice\common\installer-main.bmp</td></row>
<row><td>NewBinary2</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\New.ibd</td></row>
- <row><td>NewBinary20</td><td/><td>&lt;ISProjectFolder&gt;\install\ice-common\installer-header.bmp</td></row>
+ <row><td>NewBinary20</td><td/><td>&lt;ISProjectFolder&gt;\install\ice\common\installer-header.bmp</td></row>
<row><td>NewBinary21</td><td/><td>&lt;WindowsFolder&gt;\microsoft.net\framework\v1.1.4322\CasPol.exe</td></row>
<row><td>NewBinary3</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Up.ibd</td></row>
<row><td>NewBinary4</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\WarningIcon.ibd</td></row>
@@ -579,7 +578,7 @@
<row><td>LicenseAgreement</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_ReadLicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>LicenseAgreement</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>LicenseAgreement</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_LicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
- <row><td>LicenseAgreement</td><td>Memo</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td/><td>&lt;ISProjectFolder&gt;\install\ice-common\LICENSE.rtf</td><td/></row>
+ <row><td>LicenseAgreement</td><td>Memo</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td/><td>&lt;ISProjectFolder&gt;\install\ice\common\LICENSE.rtf</td><td/></row>
<row><td>LicenseAgreement</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceType</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceType</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary20</td></row>
@@ -1000,10 +999,6 @@
<row><td>CheckForProductUpdates</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall"</td><td>Checks for product updates</td></row>
<row><td>CheckForProductUpdatesOnReboot</td><td>226</td><td>ISUpdateServiceFolder</td><td>[ISUpdateServiceFolder]agent.exe "/au[ProductCode] /EndOfInstall /Reboot"</td><td>Checks for product updates on reboot</td></row>
<row><td>CopyAssemblyPDBs</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepackcs,icepatch2cs,icestormcs,icegridcs, iceboxcs) DO copy [INSTALLDIR]bin\%f.pdb [WindowsFolder]assembly\GAC\%f\3.0.0.0__1f998c50fec78381</td><td/></row>
- <row><td>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/></row>
- <row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
- <row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
- <row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</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>
@@ -1390,12 +1385,12 @@
<col def="S255">ISBuildSourcePath</col>
<col def="I4">ISAttributes</col>
<col def="S72">ISComponentSubFolder_</col>
- <row><td>glacier2cs.dll</td><td>GAC_glacier2cs</td><td>GLACIE~1.DLL|glacier2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\glacier2cs.dll</td><td>1</td><td/></row>
- <row><td>iceboxcs.dll</td><td>GAC_iceboxcs</td><td>iceboxcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\iceboxcs.dll</td><td>1</td><td/></row>
- <row><td>icecs.dll</td><td>GAC_icecs</td><td>icecs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\icecs.dll</td><td>1</td><td/></row>
- <row><td>icegridcs.dll</td><td>GAC_icegridcs</td><td>ICEGRI~1.DLL|icegridcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\icegridcs.dll</td><td>1</td><td/></row>
- <row><td>icepatch2cs.dll</td><td>GAC_icepatch2cs</td><td>ICEPAT~1.DLL|icepatch2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\icepatch2cs.dll</td><td>1</td><td/></row>
- <row><td>icestormcs.dll</td><td>GAC_icestormcs</td><td>ICESTO~1.DLL|icestormcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime\bin\icestormcs.dll</td><td>1</td><td/></row>
+ <row><td>glacier2cs.dll</td><td>GAC_glacier2cs</td><td>GLACIE~1.DLL|glacier2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\glacier2cs.dll</td><td>1</td><td/></row>
+ <row><td>iceboxcs.dll</td><td>GAC_iceboxcs</td><td>iceboxcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\iceboxcs.dll</td><td>1</td><td/></row>
+ <row><td>icecs.dll</td><td>GAC_icecs</td><td>icecs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icecs.dll</td><td>1</td><td/></row>
+ <row><td>icegridcs.dll</td><td>GAC_icegridcs</td><td>ICEGRI~1.DLL|icegridcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icegridcs.dll</td><td>1</td><td/></row>
+ <row><td>icepatch2cs.dll</td><td>GAC_icepatch2cs</td><td>ICEPAT~1.DLL|icepatch2cs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icepatch2cs.dll</td><td>1</td><td/></row>
+ <row><td>icestormcs.dll</td><td>GAC_icestormcs</td><td>ICESTO~1.DLL|icestormcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime\bin\icestormcs.dll</td><td>1</td><td/></row>
</table>
<table name="FileSFPCatalog">
@@ -1602,24 +1597,24 @@
<col def="S255">IncludeFiles</col>
<col def="S255">ExcludeFiles</col>
<col def="I4">ISAttributes</col>
- <row><td>IceCSharpDemo</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\demo</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCSharpDev</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\dev</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCSharpRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice-csharp\runtime</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCppDemo</td><td>&lt;ISProjectFolder&gt;\install\ice-cpp\demo</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCppDev</td><td>&lt;ISProjectFolder&gt;\install\ice-cpp\dev</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceCppRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice-cpp\runtime</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IceDoc</td><td>&lt;ISProjectFolder&gt;\install\ice-common\doc</td><td>4</td><td/><td/><td>0</td></row>
- <row><td>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>
- <row><td>IceManual</td><td>&lt;ISProjectFolder&gt;\install\ice-common\html</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IcePhpDemo</td><td>&lt;ISProjectFolder&gt;\install\ice-php\demo</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IcePhpExtension</td><td>&lt;ISProjectFolder&gt;\install\ice-php\extension</td><td>4</td><td/><td/><td>2</td></row>
- <row><td>IcePythonDemo</td><td>&lt;ISProjectFolder&gt;\install\ice-python\demo</td><td>4</td><td/><td/><td>2</td></row>
- <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>IceCSharpDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\demo</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCSharpDev</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\dev</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCSharpRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\csharp\runtime</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCppDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\demo</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCppDev</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\dev</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCppRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\runtime</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceDoc</td><td>&lt;ISProjectFolder&gt;\install\ice\common\doc</td><td>4</td><td/><td/><td>0</td></row>
+ <row><td>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>
+ <row><td>IceManual</td><td>&lt;ISProjectFolder&gt;\install\ice\common\html</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IcePhpDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\php\demo</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IcePhpExtension</td><td>&lt;ISProjectFolder&gt;\install\ice\php\extension</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IcePythonDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\python\demo</td><td>4</td><td/><td/><td>2</td></row>
+ <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>
@@ -2601,10 +2596,6 @@
<row><td>DuplicateFiles</td><td/><td>4210</td><td>DuplicateFiles</td><td/></row>
<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
<row><td>FindRelatedProducts</td><td>NOT ISSETUPDRIVEN</td><td>420</td><td>FindRelatedProducts</td><td/></row>
- <row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
- <row><td>ISSelfRegisterFiles</td><td/><td>5601</td><td/><td/></row>
- <row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
- <row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
<row><td>InstallInitialize</td><td/><td>1501</td><td>InstallInitialize</td><td/></row>
diff --git a/cpp/install/vc71/ThirdParty.ism b/cpp/install/vc71/ThirdParty.ism
index 95d4210dc44..07d8632fc6c 100755
--- a/cpp/install/vc71/ThirdParty.ism
+++ b/cpp/install/vc71/ThirdParty.ism
@@ -250,7 +250,6 @@
<col key="yes" def="s72">Name</col>
<col def="V0">Data</col>
<col def="S255">ISBuildSourcePath</col>
- <row><td>ISSELFREG.DLL</td><td/><td>&lt;ISProductFolder&gt;\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\IsDialogBanner.ibd</td></row>
<row><td>NewBinary10</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
@@ -261,9 +260,9 @@
<row><td>NewBinary16</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallFirstUse.ico</td></row>
<row><td>NewBinary17</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallPartial.ico</td></row>
<row><td>NewBinary18</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallStateMenu.ico</td></row>
- <row><td>NewBinary19</td><td/><td>&lt;ISProjectFolder&gt;\install\packages-common\installer-main.bmp</td></row>
+ <row><td>NewBinary19</td><td/><td>&lt;ISProjectFolder&gt;\install\packages\common\installer-main.bmp</td></row>
<row><td>NewBinary2</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\New.ibd</td></row>
- <row><td>NewBinary20</td><td/><td>&lt;ISProjectFolder&gt;\install\packages-common\installer-header.bmp</td></row>
+ <row><td>NewBinary20</td><td/><td>&lt;ISProjectFolder&gt;\install\packages\common\installer-header.bmp</td></row>
<row><td>NewBinary3</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Up.ibd</td></row>
<row><td>NewBinary4</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\WarningIcon.ibd</td></row>
<row><td>NewBinary5</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\IsDialogBitmap.ibd</td></row>
@@ -413,7 +412,7 @@
<row><td>Bzip2License</td><td>Line2</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>Bzip2License</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING14##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
<row><td>Bzip2License</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense11</td><td/><td>Cancel</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>Bzip2License</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\BZIP2_LICENSE.rtf</td><td/></row>
+ <row><td>Bzip2License</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\BZIP2_LICENSE.rtf</td><td/></row>
<row><td>Bzip2License</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty11</td><td>##NEW_STRING5##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>Bzip2License</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty21</td><td>##NEW_STRING6##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>CancelSetup</td><td>Icon</td><td>Icon</td><td>15</td><td>15</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary4</td></row>
@@ -529,7 +528,7 @@
<row><td>ExpatLicense</td><td>Line3</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>ExpatLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING22##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
<row><td>ExpatLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense111</td><td/><td>Cancel</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>ExpatLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\EXPAT_LICENSE.rtf</td><td/></row>
+ <row><td>ExpatLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\EXPAT_LICENSE.rtf</td><td/></row>
<row><td>ExpatLicense</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty111</td><td>##NEW_STRING9##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>ExpatLicense</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty211</td><td>##NEW_STRING10##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>FilesInUse</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary20</td></row>
@@ -581,7 +580,7 @@
<row><td>JGoodiesFormsLicense</td><td>Line4</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>JGoodiesFormsLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING30##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
<row><td>JGoodiesFormsLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>187</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense1111</td><td>##NEW_STRING15##</td><td>Cancel</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>JGoodiesFormsLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\JGOODIES_FORMS_LICENSE.rtf</td><td/></row>
+ <row><td>JGoodiesFormsLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\JGOODIES_FORMS_LICENSE.rtf</td><td/></row>
<row><td>JGoodiesFormsLicense</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty1111</td><td>##NEW_STRING13##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>JGoodiesFormsLicense</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty2111</td><td>##NEW_STRING14##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>JGoodiesLooksLicense</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING39##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
@@ -597,7 +596,7 @@
<row><td>JGoodiesLooksLicense</td><td>Line4</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>JGoodiesLooksLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING38##</td><td>RadioButtonGroup1</td><td/><td>0</td><td/><td/><td/></row>
<row><td>JGoodiesLooksLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>189</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense1112</td><td>##NEW_STRING20##</td><td>Cancel</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>JGoodiesLooksLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\JGOODIES_LOOKS_LICENSE.rtf</td><td/></row>
+ <row><td>JGoodiesLooksLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\JGOODIES_LOOKS_LICENSE.rtf</td><td/></row>
<row><td>JGoodiesLooksLicense</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty1112</td><td>##NEW_STRING18##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>JGoodiesLooksLicense</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty2112</td><td>##NEW_STRING19##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>LicenseAgreement</td><td>Agree</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense</td><td/><td>Back</td><td/><td>0</td><td>0</td><td/><td/></row>
@@ -610,7 +609,7 @@
<row><td>LicenseAgreement</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_ReadLicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>LicenseAgreement</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
<row><td>LicenseAgreement</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_LicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
- <row><td>LicenseAgreement</td><td>Memo</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\BERKELEY_DB_LICENSE.rtf</td><td/></row>
+ <row><td>LicenseAgreement</td><td>Memo</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\BERKELEY_DB_LICENSE.rtf</td><td/></row>
<row><td>LicenseAgreement</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceType</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
<row><td>MaintenanceType</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary20</td></row>
@@ -646,7 +645,7 @@
<row><td>OpenSSLLicense</td><td>Line1</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OpenSSLLicense</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##ID_STRING6##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
<row><td>OpenSSLLicense</td><td>RadioButtonGroup1</td><td>RadioButtonGroup</td><td>9</td><td>190</td><td>330</td><td>40</td><td>3</td><td>AgreeToLicense1</td><td/><td>Back</td><td/><td>0</td><td>0</td><td/><td/></row>
- <row><td>OpenSSLLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages-common\OPENSSL_LICENSE.rtf</td><td/></row>
+ <row><td>OpenSSLLicense</td><td>ScrollableText1</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td>0</td><td>&lt;ISProjectFolder&gt;\install\packages\common\OPENSSL_LICENSE.rtf</td><td/></row>
<row><td>OpenSSLLicense</td><td>Text1</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td>NewProperty1</td><td>##NEW_STRING1##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OpenSSLLicense</td><td>Text2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td>NewProperty2</td><td>##NEW_STRING2##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
<row><td>OutOfSpace</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary20</td></row>
@@ -1057,10 +1056,6 @@
<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>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/></row>
- <row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
- <row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
- <row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</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>
@@ -1570,7 +1565,7 @@
<col def="S255">IncludeFiles</col>
<col def="S255">ExcludeFiles</col>
<col def="I4">ISAttributes</col>
- <row><td>CommonDoc</td><td>&lt;ISProjectFolder&gt;\install\packages-common\doc</td><td>4</td><td/><td/><td>0</td></row>
+ <row><td>CommonDoc</td><td>&lt;ISProjectFolder&gt;\install\packages\common\doc</td><td>4</td><td/><td/><td>0</td></row>
<row><td>VisualStudioRuntime</td><td>&lt;ISProjectFolder&gt;\install\microsoft\runtime</td><td>4</td><td/><td/><td>2</td></row>
</table>
@@ -2575,10 +2570,6 @@
<row><td>DuplicateFiles</td><td/><td>4210</td><td>DuplicateFiles</td><td/></row>
<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
<row><td>FindRelatedProducts</td><td>NOT ISSETUPDRIVEN</td><td>420</td><td>FindRelatedProducts</td><td/></row>
- <row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
- <row><td>ISSelfRegisterFiles</td><td/><td>5601</td><td/><td/></row>
- <row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
- <row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
<row><td>InstallInitialize</td><td/><td>1501</td><td>InstallInitialize</td><td/></row>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:14:04 +0000