maybe finally have worked out the conditional installation for .net?

2 files changed, 6 insertions, 28 deletions

diff --git a/cpp/install/common/stage.xml b/cpp/install/common/stage.xml
index 65766cce76a..ee78034b4a6 100755
--- a/cpp/install/common/stage.xml
+++ b/cpp/install/common/stage.xml
@@ -124,25 +124,16 @@
 		<include name="icegrid30.dll"/>
 	    </fileset>
 	    <fileset dir="${ice.dir}/src">
-
-		<include name="Ice/Release/ice30.pdb"/>
-		<include name="Freeze/Release/freeze30.pdb"/>
-		<include name="IceSSL/Release/icessl30.pdb"/>
-		<include name="IceUtil/Release/iceutil30.pdb"/>
-
 		<include name="FreezeScript/Release/dumpdb.exe"/>
 		<include name="FreezeScript/Release/transformdb.exe"/>
 		<include name="Glacier2/Release/glacier2router.exe"/>
-		<include name="Glacier2/Release/glacier230.pdb"/>
 		<include name="IceBox/Release/icebox.exe"/>
-		<include name="IceBox/Release/icebox.pdb"/>
 		<include name="IceBox/Release/iceboxadmin.exe"/>
 		<include name="icecpp/Release/icecpp.exe"/>
 		<include name="IcePatch2/Release/icepatch2calc.exe"/>
 		<include name="IcePatch2/Release/icepatch2client.exe"/>
 		<include name="IcePatch2/Release/icepatch2server.exe"/>
 		<include name="IceStorm/Release/icestormadmin.exe"/>
-		<include name="IceStorm/Release/icestorm30.pdb"/>
 		<include name="slice2docbook/Release/slice2docbook.exe"/>
 		<include name="IceGrid/Release/icegridadmin.exe"/>
 		<include name="IceGrid/Release/icegridnode.exe"/>
@@ -310,7 +301,6 @@
 	    <fileset dir="${icecs.dir}/bin">
 		<include name="*.dll"/>
 		<include name="iceboxnet.exe"/>
-		<include name="iceboxnet.exe"/>
 	    </fileset>
 	</copy>
 
@@ -419,19 +409,12 @@
     <!-- Ice for Python Runtime -->
     <target name="ice-python-runtime" depends="setup">
 
-	<!-- Binaries -->
-	<mkdir dir="${stage.dir}/ice-python/runtime/bin"/>
-	<copy todir="${stage.dir}/ice-python/runtime/bin">
-	    <fileset dir="${icepy.dir}/bin">
-		<include name="*.dll"/>
-	    </fileset>
-	</copy>
-
 	<!-- Python Files -->
 	<mkdir dir="${stage.dir}/ice-python/runtime/python"/>
 	<copy todir="${stage.dir}/ice-python/runtime/python">
 	    <fileset dir="${icepy.dir}/python">
 		<include name="**/*.py"/>
+		<include name="*.dll"/>
 	    </fileset>
 	</copy>
 
diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism
index fcd7d56ff24..2c28ad674b0 100755
--- a/cpp/install/vc71/Ice.ism
+++ b/cpp/install/vc71/Ice.ism
@@ -375,7 +375,7 @@
 		<col key="yes" def="s38">Feature_</col>

 		<col key="yes" def="i2">Level</col>

 		<col def="S255">Condition</col>

-		<row><td>ice_runtime_dotnet</td><td>200</td><td>AdminUser and (MsiNetAssemblySupport &gt;= "1.1.4322")</td></row>

+		<row><td>ice_runtime_dotnet</td><td>1</td><td>AdminUser and (MsiNetAssemblySupport &gt;= "1.1.4322")</td></row>

 	</table>

 

 	<table name="Control">

@@ -869,9 +869,9 @@
 		<row><td>CustomSetup</td><td>ChangeFolder</td><td>SelectionBrowse</td><td>InstallChangeFolder</td><td>1</td><td>0</td></row>

 		<row><td>CustomSetup</td><td>Details</td><td>SelectionBrowse</td><td>DiskSpaceRequirements</td><td>1</td><td>1</td></row>

 		<row><td>CustomSetup</td><td>Help</td><td>SpawnDialog</td><td>CustomSetupTips</td><td>1</td><td>1</td></row>

-		<row><td>CustomSetup</td><td>Next</td><td>NewDialog</td><td>OutOfSpace</td><td>OutOfNoRbDiskSpace = 1</td><td>0</td></row>

-		<row><td>CustomSetup</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>OutOfNoRbDiskSpace &lt;&gt; 1</td><td>0</td></row>

-		<row><td>CustomSetup</td><td>Next</td><td>[_IsSetupTypeMin]</td><td>Custom</td><td>1</td><td>0</td></row>

+		<row><td>CustomSetup</td><td>Next</td><td>NewDialog</td><td>OutOfSpace</td><td>OutOfNoRbDiskSpace = 1</td><td>1</td></row>

+		<row><td>CustomSetup</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>OutOfNoRbDiskSpace &lt;&gt; 1</td><td>2</td></row>

+		<row><td>CustomSetup</td><td>Next</td><td>[_IsSetupTypeMin]</td><td>Custom</td><td>1</td><td>3</td></row>

 		<row><td>CustomSetupTips</td><td>OK</td><td>EndDialog</td><td>Return</td><td>1</td><td>1</td></row>

 		<row><td>CustomerInformation</td><td>Back</td><td>NewDialog</td><td>LicenseAgreement</td><td>1</td><td>1</td></row>

 		<row><td>CustomerInformation</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>

@@ -979,7 +979,7 @@
 		<row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>CustomSetup</td><td>_IsSetupTypeMin = "Custom"</td><td>1</td></row>

 		<row><td>SetupType</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>_IsSetupTypeMin &lt;&gt; "Custom"</td><td>2</td></row>

 		<row><td>SetupType</td><td>Next</td><td>SetInstallLevel</td><td>100</td><td>_IsSetupTypeMin = "Typical"</td><td>3</td></row>

-		<row><td>SetupType</td><td>Next</td><td>SetInstallLevel</td><td>200</td><td>AdminUser and (MsiNetAssemblySupport &gt;= "1.1.4322")</td><td/></row>

+		<row><td>SetupType</td><td>Next</td><td>SetInstallLevel</td><td>200</td><td>AdminUser and (MsiNetAssemblySupport &gt;= "1.1.4322")</td><td>4</td></row>

 		<row><td>SplashBitmap</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>

 		<row><td>SplashBitmap</td><td>Next</td><td>NewDialog</td><td>InstallWelcome</td><td>1</td><td>0</td></row>

 	</table>

@@ -1004,10 +1004,8 @@
 		<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>RegisterIceOfficeCodeGroups</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepatch2cs,icestormcs, icegridcs, iceboxcs) DO [WindowsFolder]\microsoft.net\framework\v1.1.4322\CasPol.exe -q -m -ag Trusted_Zone -strong -file [INSTALLDIR]bin\%f.dll  %f -noversion FullTrust -name %f</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>UnRegisterIceOfficeCodeGroups</td><td>1650</td><td>CMD_EXE</td><td>/c FOR %f in (glacier2cs,icecs,icepatch2cs,icestormcs, icegridcs, iceboxcs) DO [WindowsFolder]\microsoft.net\framework\v1.1.4322\CasPol.exe -q -m -rg %f</td><td/></row>

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

 		<row><td>setUserProfileNT</td><td>51</td><td>USERPROFILE</td><td>[%USERPROFILE]</td><td/></row>

 	</table>

@@ -2631,7 +2629,6 @@
 		<row><td>RegisterComPlus</td><td/><td>5700</td><td>RegisterComPlus</td><td/></row>

 		<row><td>RegisterExtensionInfo</td><td/><td>4700</td><td>RegisterExtensionInfo</td><td/></row>

 		<row><td>RegisterFonts</td><td/><td>5300</td><td>RegisterFonts</td><td/></row>

-		<row><td>RegisterIceOfficeCodeGroups</td><td>(&amp;ice_dev_csharp=3) Or (&amp;ice_dev_vbasic=3)</td><td>6268</td><td/><td/></row>

 		<row><td>RegisterMIMEInfo</td><td/><td>4900</td><td>RegisterMIMEInfo</td><td/></row>

 		<row><td>RegisterProduct</td><td/><td>6100</td><td>RegisterProduct</td><td/></row>

 		<row><td>RegisterProgIdInfo</td><td/><td>4800</td><td>RegisterProgIdInfo</td><td/></row>

@@ -2653,7 +2650,6 @@
 		<row><td>SetODBCFolders</td><td/><td>1100</td><td>SetODBCFolders</td><td/></row>

 		<row><td>StartServices</td><td>VersionNT</td><td>5900</td><td>StartServices</td><td/></row>

 		<row><td>StopServices</td><td>VersionNT</td><td>1900</td><td>StopServices</td><td/></row>

-		<row><td>UnRegisterIceOfficeCodeGroups</td><td>(&amp;ice_dev_csharp=3) Or (&amp;ice_dev_vbasic=3)</td><td>6259</td><td/><td/></row>

 		<row><td>UnpublishComponents</td><td/><td>1700</td><td>UnpublishComponents</td><td/></row>

 		<row><td>UnpublishFeatures</td><td/><td>1800</td><td>UnpublishFeatures</td><td/></row>

 		<row><td>UnregisterClassInfo</td><td/><td>2700</td><td>UnregisterClassInfo</td><td/></row>

@@ -2895,7 +2891,6 @@ 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>