diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/install/vc71/Ice.ism | 26 | ||||
| -rwxr-xr-x | cpp/install/vc71/build.xml | 8 |
2 files changed, 25 insertions, 9 deletions
diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism index d22c5539460..7533e8a99f3 100755 --- a/cpp/install/vc71/Ice.ism +++ b/cpp/install/vc71/Ice.ism @@ -250,6 +250,7 @@ <col key="yes" def="s72">Name</col>
<col def="V0">Data</col>
<col def="S255">ISBuildSourcePath</col>
+ <row><td>ISSELFREG.DLL</td><td/><td><ISProductFolder>\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\IsDialogBanner.ibd</td></row>
<row><td>NewBinary10</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
@@ -344,6 +345,7 @@ <row><td>GAC_icestormcs</td><td>{1E8D7135-C067-4CE8-943C-D21F1760E6C5}</td><td>GlobalAssemblyCache</td><td>8</td><td/><td>icestormcs.dll</td><td>9</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>IceCSharpDemo</td><td>{A4BB2878-87EF-462B-B1D0-EF5A859702FA}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>IceCSharpDev</td><td>{A7182719-2C34-4246-8C00-C0673BE6EBF4}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>IceCSharpRuntime</td><td>{4CA76E20-D92E-476E-A858-C93C152AC964}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>IceCppDemo</td><td>{C1392163-339E-452B-A401-D0B4E27F0600}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>IceCppDev</td><td>{F40D5465-8797-479E-ACD2-89216631CF7F}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>IceCppRuntime</td><td>{218943FB-F791-430F-B27E-9E839F0732C1}</td><td>INSTALLDIR</td><td>8</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@@ -978,6 +980,10 @@ <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>
@@ -1310,6 +1316,7 @@ <row><td>ice_csharp</td><td>GAC_icepatch2cs</td></row>
<row><td>ice_csharp</td><td>GAC_icestormcs</td></row>
<row><td>ice_csharp</td><td>IceCSharpDev</td></row>
+ <row><td>ice_csharp</td><td>IceCSharpRuntime</td></row>
<row><td>ice_csharp_demo</td><td>IceCSharpDemo</td></row>
<row><td>ice_doc</td><td>IceManual</td></row>
<row><td>ice_java</td><td>IceJavaRuntime</td></row>
@@ -1325,6 +1332,7 @@ <row><td>ice_vbasic</td><td>GAC_icepackcs</td></row>
<row><td>ice_vbasic</td><td>GAC_icepatch2cs</td></row>
<row><td>ice_vbasic</td><td>GAC_icestormcs</td></row>
+ <row><td>ice_vbasic</td><td>IceCSharpRuntime</td></row>
<row><td>ice_vbasic</td><td>IceVBasicDev</td></row>
<row><td>ice_vbasic_demo</td><td>IceVBasicDemo</td></row>
<row><td>packages</td><td>VisualStudioRuntime</td></row>
@@ -1342,11 +1350,11 @@ <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><ISProjectFolder>\install\ice-csharp\gac\glacier2cs.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><ISProjectFolder>\install\ice-csharp\gac\icecs.dll</td><td>1</td><td/></row>
- <row><td>icepackcs.dll</td><td>GAC_icepackcs</td><td>ICEPAC~1.DLL|icepackcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\install\ice-csharp\gac\icepackcs.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><ISProjectFolder>\install\ice-csharp\gac\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><ISProjectFolder>\install\ice-csharp\gac\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><ISProjectFolder>\install\ice-csharp\runtime\bin\glacier2cs.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><ISProjectFolder>\install\ice-csharp\runtime\bin\icecs.dll</td><td>1</td><td/></row>
+ <row><td>icepackcs.dll</td><td>GAC_icepackcs</td><td>ICEPAC~1.DLL|icepackcs.dll</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\install\ice-csharp\runtime\bin\icepackcs.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><ISProjectFolder>\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><ISProjectFolder>\install\ice-csharp\runtime\bin\icestormcs.dll</td><td>1</td><td/></row>
</table>
<table name="FileSFPCatalog">
@@ -1506,6 +1514,7 @@ <row><td>GAC_icestormcs</td><td/><td/><td>_74B66A95_80BE_43A1_9A2E_508B6CBB795E_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCSharpDemo</td><td/><td/><td>_7DD0A005_2547_4846_B573_62AFE1194756_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCSharpDev</td><td/><td/><td>_3471DDA3_D6D8_440C_837A_1DF61C7914ED_FILTER</td><td/><td/><td/><td/></row>
+ <row><td>IceCSharpRuntime</td><td/><td/><td>_6805EC31_B95D_4271_9CAF_B0A3E38CF543_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCppDemo</td><td/><td/><td>_FC69CAF8_66AC_4793_A8ED_AFD7D168B544_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCppDev</td><td/><td/><td>_770F5B6A_0687_4BB0_B0D6_E1E5F6EAF0A7_FILTER</td><td/><td/><td/><td/></row>
<row><td>IceCppRuntime</td><td/><td/><td>_DC33EA7A_C8B8_4C51_AA1A_6FA971C84A5F_FILTER</td><td/><td/><td/><td/></row>
@@ -1551,6 +1560,7 @@ <col def="I4">ISAttributes</col>
<row><td>IceCSharpDemo</td><td><ISProjectFolder>\install\ice-csharp\demo</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCSharpDev</td><td><ISProjectFolder>\install\ice-csharp\dev</td><td>4</td><td/><td/><td>2</td></row>
+ <row><td>IceCSharpRuntime</td><td><ISProjectFolder>\install\ice-csharp\runtime</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCppDemo</td><td><ISProjectFolder>\install\ice-cpp\demo</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCppDev</td><td><ISProjectFolder>\install\ice-cpp\dev</td><td>4</td><td/><td/><td>2</td></row>
<row><td>IceCppRuntime</td><td><ISProjectFolder>\install\ice-cpp\runtime</td><td>4</td><td/><td/><td>2</td></row>
@@ -2525,6 +2535,10 @@ <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>
@@ -2890,6 +2904,8 @@ SQBDAEUAXwBNAFMASQABAFoARQBSAE8AQwA= <col def="S0">Value</col>
<col def="s72">Component_</col>
<col def="I4">ISAttributes</col>
+ <row><td>Registry2</td><td>2</td><td>SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders</td><td/><td/><td>IceCSharpRuntime</td><td>0</td></row>
+ <row><td>Registry6</td><td>2</td><td>SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\Ice 2.1.0</td><td/><td>[INSTALLDIR]bin</td><td>IceCSharpRuntime</td><td>0</td></row>
</table>
<table name="RemoveFile">
diff --git a/cpp/install/vc71/build.xml b/cpp/install/vc71/build.xml index 0aed062ef91..e41c0b5a93a 100755 --- a/cpp/install/vc71/build.xml +++ b/cpp/install/vc71/build.xml @@ -270,11 +270,11 @@ </target> <!-- Ice for C# Assemblies --> - <target name="ice-csharp-gac" depends="setup"> + <target name="ice-csharp-runtime" depends="setup"> <!-- Binaries --> - <mkdir dir="${install.dir}/ice-csharp/gac"/> - <copy todir="${install.dir}/ice-csharp/gac"> + <mkdir dir="${install.dir}/ice-csharp/runtime/bin"/> + <copy todir="${install.dir}/ice-csharp/runtime/bin"> <fileset dir="${icecs.dir}/bin"> <include name="*.dll"/> </fileset> @@ -693,7 +693,7 @@ ice-cpp-runtime, ice-cpp-dev, ice-cpp-demo, - ice-csharp-gac, + ice-csharp-runtime, ice-csharp-dev, ice-csharp-demo, ice-java-runtime, |