- Adding shell script to populate ice.python.python list.

- Fixing some component definitions and component target lists.
- Adding a missing license file component.

8 files changed, 117 insertions, 36 deletions

diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index f4320d0128f..dd2fd25ae9d 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -38,11 +38,11 @@ jgoodies-runtime=jgoodies
 microsoft-runtime=microsoft runtime
 
 [ice common]
-elements=4
+elements=5
 active=1
 source1=%(INSTALL_TOOLS)s/common
 filelist1=installer.data
-dest1=.
+dest1=./
 source2=%(INSTALL_TOOLS)s/%(target)s/doc
 filelist2=installer.docs
 dest2=doc
@@ -52,6 +52,9 @@ dest3=html/doc
 source4=%(BUILD_DIR)s/Ice-%(version)s/doc/reference
 filelist4=ice.html
 dest4=html/doc/reference
+source5=%(BUILD_DIR)s/Ice-%(version)s
+filelist5=ice.license
+dest5=doc
 
 [ice packages common]
 elements=3
@@ -147,7 +150,7 @@ dest8=bin
 [java runtime]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IceJ-%(version)s/lib
 filelist1=ice.java.runtime
 dest1=lib
@@ -155,12 +158,12 @@ dest1=lib
 [java dev]
 elements=4
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IceJ-%(version)s/ant
 filelist1=ice.java.ant
 dest1=ant
 
-source2=%(BUILD_DIR)s/Ice-%(version)s/bin
+source2=%(BUILD_DIR)s/Ice-%(version)s/src
 filelist2=ice.java.exes
 dest2=bin
 
@@ -175,15 +178,15 @@ dest4=certs
 [dotnet runtime]
 elements=1
 active=1
-targets=~vc60
-source1=%(BUILD_DIR)s/IceCS-%(version)s/certs
+targets=~vc60,vc71
+source1=%(BUILD_DIR)s/IceCS-%(version)s/bin
 filelist1=ice.dotnet.assemblies
 dest1=bin
 
 [csharp dev]
-elements=1
+elements=2
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.csharp.dev
 dest1=bin
@@ -192,9 +195,9 @@ filelist2=ice.csharp.tools
 dest2=bin
 
 [vbasic dev]
-elements=1
+elements=2
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.vbasic.dev
 dest1=bin
@@ -205,7 +208,7 @@ dest2=bin
 [php runtime]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IcePHP-%(version)s/src/ice/Release
 filelist1=ice.php.runtime
 dest1=bin
@@ -213,7 +216,7 @@ dest1=bin
 [python runtime]
 elements=2
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IcePy-%(version)s/python
 filelist1=ice.python.python
 dest1=python
@@ -224,7 +227,7 @@ dest2=python
 [python dev]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/Ice-%(version)s/bin
 filelist1=ice.python.dev
 dest1=bin
@@ -239,7 +242,7 @@ dest1=demo
 [java demo]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IceJ-%(version)s/demo
 filelist1=icej.demo
 dest1=demoj
@@ -247,7 +250,7 @@ dest1=demoj
 [csharp demo]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IceCS-%(version)s/demo
 filelist1=icecs.demo
 dest1=democs
@@ -255,7 +258,7 @@ dest1=democs
 [vbasic demo]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IceVB-%(version)s/demo
 filelist1=icevb.demo
 dest1=demovb
@@ -263,15 +266,15 @@ dest1=demovb
 [php demo]
 elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IcePHP-%(version)s/demo
 filelist1=icephp.demo
 dest1=demophp
 
 [python demo]
-elements=0
+elements=1
 active=1
-targets=~vc60
+targets=~vc60,vc71
 source1=%(BUILD_DIR)s/IcePy-%(version)s/demo
 filelist1=icepy.demo
 dest1=dempopy
@@ -286,6 +289,7 @@ dest1=bin
 
 [berkeley db java]
 elements=2
+targets=~vc60,vc71
 active=1
 source1=%(DB_HOME)s
 filelist1=berkeleydb.java.jar
@@ -335,7 +339,7 @@ filelist1=expat.runtime.dll
 dest1=bin
 
 [expat dev]
-elements=3
+elements=2
 active=1
 source1=%(EXPAT_HOME)s/lib
 filelist1=expat.dev.lib
@@ -343,9 +347,6 @@ dest1=lib
 source2=%(EXPAT_HOME)s/lib
 filelist2=expat.dev.headers
 dest2=include
-source3=%(EXPAT_HOME)s/lib
-filelist3=expat.dev.dll
-dest3=bin
 
 [openssl dev]
 elements=2
@@ -389,7 +390,6 @@ dest1=bin
 [jgoodies]
 elements=1
 active=1
-targets=vc60
 source1=%(JGOODIES_HOME)s
 filelist1=jgoodies
 dest1=lib
diff --git a/cpp/install/common/components/expat.dev.lib b/cpp/install/common/components/expat.dev.lib
index bb7bc8f836c..e18f5a497fb 100755
--- a/cpp/install/common/components/expat.dev.lib
+++ b/cpp/install/common/components/expat.dev.lib
@@ -1,4 +1,2 @@
 f,Release/libexpat.lib
 f,Release-w/libexpatw.lib
-f,Debug/libexpatd.lib
-f,Debug-w/libexpatwd.lib
diff --git a/cpp/install/common/components/ice.java.ant b/cpp/install/common/components/ice.java.ant
index bf48b83d943..b6fb08efee1 100755
--- a/cpp/install/common/components/ice.java.ant
+++ b/cpp/install/common/components/ice.java.ant
@@ -2,11 +2,7 @@ Slice2FreezeJTask$Dict.class
 Slice2FreezeJTask$Dictindex.class
 Slice2FreezeJTask$Index.class
 Slice2FreezeJTask.class
-Slice2FreezeJTask.java
 Slice2JavaTask.class
-Slice2JavaTask.java
 SliceDefine.class
-SliceDefine.java
 SliceTask$SliceDependency.class
 SliceTask.class
-SliceTask.java
diff --git a/cpp/install/common/components/ice.license b/cpp/install/common/components/ice.license
new file mode 100755
index 00000000000..af99ee8b4db
--- /dev/null
+++ b/cpp/install/common/components/ice.license
@@ -0,0 +1 @@
+ICE_LICENSE

diff --git a/cpp/install/common/components/ice.python.module b/cpp/install/common/components/ice.python.module
index 03c142ef03a..4f9c6664afa 100755
--- a/cpp/install/common/components/ice.python.module
+++ b/cpp/install/common/components/ice.python.module
@@ -1 +1 @@
-IcePy.so
+IcePy.dll
diff --git a/cpp/install/common/components/ice.python.python b/cpp/install/common/components/ice.python.python
index 2f7d51cd123..439efe11338 100755
--- a/cpp/install/common/components/ice.python.python
+++ b/cpp/install/common/components/ice.python.python
@@ -1 +1,65 @@
-##% filespec
+# To create an explicit listing for the demos run the following command
+# in the demo directory of the IcePy distribution:
+# find . -name "*.py" -type f | 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:
+#
+# *.py
+# include=**/*.py
+#
+# Stop uncommenting here
+# Delete from here to EOF
+
+Glacier2/__init__.py
+Glacier2_PermissionsVerifierF_ice.py
+Glacier2_PermissionsVerifier_ice.py
+Glacier2_RouterF_ice.py
+Glacier2_Router_ice.py
+Glacier2_SessionF_ice.py
+Glacier2_Session_ice.py
+Ice.py
+IceBox/__init__.py
+IceBox_IceBox_ice.py
+IceGrid/__init__.py
+IceGrid_Admin_ice.py
+IceGrid_Descriptor_ice.py
+IceGrid_Exception_ice.py
+IceGrid_Observer_ice.py
+IceGrid_Query_ice.py
+IcePatch2/__init__.py
+IcePatch2_FileInfo_ice.py
+IcePatch2_FileServer_ice.py
+IceStorm/__init__.py
+IceStorm_IceStorm_ice.py
+Ice_BuiltinSequences_ice.py
+Ice_CommunicatorF_ice.py
+Ice_Communicator_ice.py
+Ice_ConnectionF_ice.py
+Ice_Connection_ice.py
+Ice_Current_ice.py
+Ice_Endpoint_ice.py
+Ice_FacetMap_ice.py
+Ice_Identity_ice.py
+Ice_LocalException_ice.py
+Ice_LocatorF_ice.py
+Ice_Locator_ice.py
+Ice_LoggerF_ice.py
+Ice_Logger_ice.py
+Ice_ObjectAdapterF_ice.py
+Ice_ObjectAdapter_ice.py
+Ice_ObjectFactoryF_ice.py
+Ice_ObjectFactory_ice.py
+Ice_PluginF_ice.py
+Ice_Plugin_ice.py
+Ice_ProcessF_ice.py
+Ice_Process_ice.py
+Ice_PropertiesF_ice.py
+Ice_Properties_ice.py
+Ice_RouterF_ice.py
+Ice_Router_ice.py
+Ice_ServantLocatorF_ice.py
+Ice_ServantLocator_ice.py
+Ice_SliceChecksumDict_ice.py
+Ice_StatsF_ice.py
+Ice_Stats_ice.py
diff --git a/cpp/install/common/components/installer.docs b/cpp/install/common/components/installer.docs
index cab5e663e23..f41206285ec 100755
--- a/cpp/install/common/components/installer.docs
+++ b/cpp/install/common/components/installer.docs
@@ -1,3 +1,4 @@
-include=*.*

-exclude=**.rtf

-exclude=THIRD_PARTY_SOURCES

+LICENSE

+README.txt

+SOURCES

+THIRD_PARTY_LICENSE

diff --git a/cpp/install/common/components/make_py_list.sh b/cpp/install/common/components/make_py_list.sh
new file mode 100755
index 00000000000..529ec87bfea
--- /dev/null
+++ b/cpp/install/common/components/make_py_list.sh
@@ -0,0 +1,21 @@
+#!/bin/bash

+

+echo "">$1

+

+cat >$1 <<\_CMTFILE

+# To create an explicit listing for the demos run the following command

+# in the demo directory of the IcePy distribution:

+# find . -name "*.py" -type f | 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:

+#

+# *.py

+# include=**/*.py

+#

+# Stop uncommenting here

+# Delete from here to EOF

+

+_CMTFILE

+

+find . -name "*.py" -type f | sed -e 's/^\.\///' >> $1