From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 26 Jun 2007 23:18:51 +0000 (+0000)
Subject: [WinOF] WIX
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=088f841695b41130d851b3e54c11a173845d07bb;p=~shefty%2Frdma-win.git

[WinOF] WIX
Added dat.conf & dapltest.exe

git-svn-id: svn://openib.tc.cornell.edu/gen1@719 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index 1fd35df5..57c259da 100644
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -66,90 +66,204 @@
         <Directory Id="ProgramFilesFolder" Name="PFiles">
             <Directory Id="INSTALLDIR" Name="WinOF">
                 <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">
-                    <File Id="OFAlogo" Compressed="yes" DiskId="1" LongName="openfabrics.gif" Name="ofa.gif" Source="..\openfabrics.gif" />
-                    <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm" LongName="Manual.htm" Source="..\Manual.htm" Vital="yes" />
-                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir" Name="Manual.htm" LongName="Manual" Target="[INSTALLDIR]\Manual.htm" Show="normal" WorkingDirectory="INSTALLDIR" Icon="openfabrics" IconIndex="0" />
-                    <File Id="dRelnotes" Compressed="yes" DiskId="1" LongName="Release_notes.htm" Name="RELEASE_.HTM" Source="..\Release_notes.htm" />
-                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes" LongName="Release Notes" Target="[INSTALLDIR]\Release_notes.htm" Show="normal" WorkingDirectory="INSTALLDIR" Icon="openfabrics" IconIndex="0" />
-                    <File Id="command_window" Name="COMMAND.LNK" LongName="Command Window.lnk" Compressed="yes" DiskId="1" Source="..\Command Window.lnk" Vital="yes" />
-                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir" Name="COMMAND.LNK" LongName="Command Window.lnk" Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics" IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />
-                    <Shortcut Id="UninstallProduct" Name="UnMyApp" LongName="Uninstall WinOF" Target="[SystemFolder]msiexec.exe" Arguments="/X [ProductCode]" Directory="ProgramMenuDir" Description="Uninstalls Windows OpenFabrics InfinBand stack" />
+                    <File Id="OFAlogo" Compressed="yes" DiskId="1"
+                          LongName="openfabrics.gif" Name="ofa.gif"
+                          Source="..\openfabrics.gif" />
+                    <File Id="manual.htm" Compressed="yes" DiskId="1"
+                          Name="Manual.htm" LongName="Manual.htm"
+                          Source="..\Manual.htm" Vital="yes" />
+                    <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"
+                          Name="Manual.htm" LongName="Manual"
+                          Target="[INSTALLDIR]\Manual.htm" Show="normal"
+                          WorkingDirectory="INSTALLDIR"
+                          Icon="openfabrics" IconIndex="0" />
+                    <File Id="dRelnotes" Compressed="yes" DiskId="1"
+                          LongName="Release_notes.htm" Name="RELEASE_.HTM"
+                          Source="..\Release_notes.htm" />
+                    <Shortcut Id="RelNotes" Directory="ProgramMenuDir"
+                          Name="RelNotes" LongName="Release Notes"
+                          Target="[INSTALLDIR]\Release_notes.htm" Show="normal"
+                          WorkingDirectory="INSTALLDIR" Icon="openfabrics"
+                          IconIndex="0" />
+                    <File Id="command_window" Name="COMMAND.LNK"
+                          LongName="Command Window.lnk" Compressed="yes"
+                          DiskId="1" Source="..\Command Window.lnk"
+                          Vital="yes" />
+                    <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"
+                          Name="COMMAND.LNK" LongName="Command Window.lnk"
+                          Target="[INSTALLDIR]\Command Window.lnk"
+                          Icon="openfabrics" IconIndex="0" Show="normal"
+                          WorkingDirectory="INSTALLDIR" />
+                    <Shortcut Id="UninstallProduct" Name="UnMyApp"
+                          LongName="Uninstall WinOF"
+                          Target="[SystemFolder]msiexec.exe"
+                          Arguments="/X [ProductCode]"
+                          Directory="ProgramMenuDir"
+                          Description="Uninstalls Windows OpenFabrics InfinBand stack" />
                     <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
                 </Component>
                 <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">
-                    <File Id="vstat" Name="vstat.exe" Compressed="yes" DiskId="1" Source="..\bin\tools\x86\release\vstat.exe" Vital="yes" />
-                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes" DiskId="1" Name="TTCP.EXE" Source="..\bin\tools\x86\release\ttcp.exe" />
-                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes" DiskId="1" Name="CMTEST.EXE" Source="..\bin\tools\x86\release\cmtest.exe" />
-                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1" LongName="ib_limits.exe" Name="IB_LIMI.EXE" Source="..\bin\tools\x86\release\ib_limits.exe" />
-                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1" LongName="ib_read_bw.exe" Name="IB_READ.EXE" Source="..\bin\tools\x86\release\ib_read_bw.exe" />
-                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1" LongName="ib_read_lat.exe" Name="IB_READ1.EXE" Source="..\bin\tools\x86\release\ib_read_lat.exe" />
-                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1" LongName="ib_send_bw.exe" Name="IB_SEND.EXE" Source="..\bin\tools\x86\release\ib_send_bw.exe" />
-                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1" LongName="ib_send_lat.exe" Name="IB_SEND1.EXE" Source="..\bin\tools\x86\release\ib_send_lat.exe" />
-                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1" LongName="ib_write_bw.exe" Name="IB_WRIT.EXE" Source="..\bin\tools\x86\release\ib_write_bw.exe" />
-                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1" LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE" Source="..\bin\tools\x86\release\ib_write_lat.exe" />
-                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1" LongName="ibtrapgen.exe" Name="IBTRAPG.EXE" Source="..\bin\tools\x86\release\ibtrapgen.exe" />
-                    <File Id="opensm.exe" Compressed="yes" DiskId="1" LongName="opensm.exe" Name="OPENSM.EXE" Source="..\bin\tools\x86\release\opensm.exe" />
-                    <File Id="osmtest.exe" Compressed="yes" DiskId="1" LongName="osmtest.exe" Name="OSMTEST.EXE" Source="..\bin\tools\x86\release\osmtest.exe" />
-                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1" LongName="PrintIP.exe" Name="PRINTIP.EXE" Source="..\bin\tools\x86\release\PrintIP.exe" />
+                    <File Id="vstat" Name="vstat.exe" Compressed="yes"
+                          DiskId="1" Source="..\bin\tools\x86\release\vstat.exe"
+                          Vital="yes" />
+                    <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"
+                          DiskId="1" Name="TTCP.EXE"
+                          Source="..\bin\tools\x86\release\ttcp.exe" />
+                    <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"
+                          DiskId="1" Name="CMTEST.EXE"
+                          Source="..\bin\tools\x86\release\cmtest.exe" />
+                    <File Id="ib_limits.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_limits.exe" Name="IB_LIMI.EXE"
+                          Source="..\bin\tools\x86\release\ib_limits.exe" />
+                    <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_read_bw.exe" Name="IB_READ.EXE"
+                          Source="..\bin\tools\x86\release\ib_read_bw.exe" />
+                    <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_read_lat.exe" Name="IB_READ1.EXE"
+                          Source="..\bin\tools\x86\release\ib_read_lat.exe" />
+                    <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_send_bw.exe" Name="IB_SEND.EXE"
+                          Source="..\bin\tools\x86\release\ib_send_bw.exe" />
+                    <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"
+                          Source="..\bin\tools\x86\release\ib_send_lat.exe" />
+                    <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"
+                          Source="..\bin\tools\x86\release\ib_write_bw.exe" />
+                    <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"
+                          LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"
+                          Source="..\bin\tools\x86\release\ib_write_lat.exe" />
+                    <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"
+                          LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"
+                          Source="..\bin\tools\x86\release\ibtrapgen.exe" />
+                    <File Id="opensm.exe" Compressed="yes" DiskId="1"
+                          LongName="opensm.exe" Name="OPENSM.EXE"
+                          Source="..\bin\tools\x86\release\opensm.exe" />
+                    <File Id="osmtest.exe" Compressed="yes" DiskId="1"
+                          LongName="osmtest.exe" Name="OSMTEST.EXE"
+                          Source="..\bin\tools\x86\release\osmtest.exe" />
+                    <File Id="PrintIP.exe" Compressed="yes" DiskId="1"
+                          LongName="PrintIP.exe" Name="PRINTIP.EXE"
+                          Source="..\bin\tools\x86\release\PrintIP.exe" />
                 </Component>
                 <Directory Id="HcaDriver" Name="IBcore">
                     <Component Id="HcaDriver" Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
                         <CreateFolder />
-                        <File Id="devman.exe" Compressed="yes" DiskId="1" LongName="devman.exe" Name="devman.exe" Source="devman.exe" />
-                        <File Id="complib.dll" Compressed="yes" DiskId="1" LongName="complib.dll" Name="COMPLIB.DLL" Source="..\bin\HCA\x86\complib.dll" />
-                        <File Id="complibd.dll" Compressed="yes" DiskId="1" LongName="complibd.dll" Name="COMPLIBD.DLL" Source="..\bin\HCA\x86\complibd.dll" />
-                        <File Id="ib_bus.inf" Compressed="yes" DiskId="1" LongName="ib_bus.inf" Name="IB_BUS.INF" Source="..\bin\HCA\x86\ib_bus.inf" />
-                        <File Id="ibal.dll" Compressed="yes" DiskId="1" LongName="ibal.dll" Name="IBAL.DLL" Source="..\bin\HCA\x86\ibal.dll" />
-                        <File Id="ibald.dll" Compressed="yes" DiskId="1" LongName="ibald.dll" Name="IBALD.DLL" Source="..\bin\HCA\x86\ibald.dll" />
-                        <File Id="ibbus.sys" Compressed="yes" DiskId="1" LongName="ibbus.sys" Name="IBBUS.SYS" Source="..\bin\HCA\x86\ibbus.sys" />
-                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1" LongName="IbInstaller.dll" Name="IBINSTA.DLL" Source="..\bin\HCA\x86\IbInstaller.dll" />
-                        <File Id="ibiou.sys" Compressed="yes" DiskId="1" LongName="ibiou.sys" Name="IBIOU.SYS" Source="..\bin\HCA\x86\ibiou.sys" />
-                        <File Id="mthca.inf" Compressed="yes" DiskId="1" LongName="mthca.inf" Name="MTHCA.INF" Source="..\bin\HCA\x86\mthca.inf" />
-                        <File Id="mthca.sys" Compressed="yes" DiskId="1" LongName="mthca.sys" Name="MTHCA.SYS" Source="..\bin\HCA\x86\mthca.sys" />
-                        <File Id="mthcau.dll" Compressed="yes" DiskId="1" LongName="mthcau.dll" Name="MTHCAU.DLL" Source="..\bin\HCA\x86\mthcau.dll" />
-                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1" LongName="mthcaud.dll" Name="MTHCAUD.DLL" Source="..\bin\HCA\x86\mthcaud.dll" />
+                        <File Id="devman.exe" Compressed="yes" DiskId="1"
+                              LongName="devman.exe" Name="devman.exe"
+                              Source="devman.exe" />
+                        <File Id="complib.dll" Compressed="yes" DiskId="1"
+                              LongName="complib.dll" Name="COMPLIB.DLL"
+                              Source="..\bin\HCA\x86\complib.dll" />
+                        <File Id="complibd.dll" Compressed="yes" DiskId="1"
+                              LongName="complibd.dll" Name="COMPLIBD.DLL"
+                              Source="..\bin\HCA\x86\complibd.dll" />
+                        <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
+                              LongName="ib_bus.inf" Name="IB_BUS.INF"
+                              Source="..\bin\HCA\x86\ib_bus.inf" />
+                        <File Id="ibal.dll" Compressed="yes" DiskId="1"
+                              LongName="ibal.dll" Name="IBAL.DLL"
+                              Source="..\bin\HCA\x86\ibal.dll" />
+                        <File Id="ibald.dll" Compressed="yes" DiskId="1"
+                              LongName="ibald.dll" Name="IBALD.DLL"
+                              Source="..\bin\HCA\x86\ibald.dll" />
+                        <File Id="ibbus.sys" Compressed="yes" DiskId="1"
+                              LongName="ibbus.sys" Name="IBBUS.SYS"
+                              Source="..\bin\HCA\x86\ibbus.sys" />
+                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
+                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"
+                              Source="..\bin\HCA\x86\IbInstaller.dll" />
+                        <File Id="ibiou.sys" Compressed="yes" DiskId="1"
+                              LongName="ibiou.sys" Name="IBIOU.SYS"
+                              Source="..\bin\HCA\x86\ibiou.sys" />
+                        <File Id="mthca.inf" Compressed="yes" DiskId="1"
+                              LongName="mthca.inf" Name="MTHCA.INF"
+                              Source="..\bin\HCA\x86\mthca.inf" />
+                        <File Id="mthca.sys" Compressed="yes" DiskId="1"
+                              LongName="mthca.sys" Name="MTHCA.SYS"
+                              Source="..\bin\HCA\x86\mthca.sys" />
+                        <File Id="mthcau.dll" Compressed="yes" DiskId="1"
+                              LongName="mthcau.dll" Name="MTHCAU.DLL"
+                              Source="..\bin\HCA\x86\mthcau.dll" />
+                        <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
+                              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
+                              Source="..\bin\HCA\x86\mthcaud.dll" />
                     </Component>
                 </Directory>
                 <Directory Id="ipoibDir" Name="net">
                     <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
                         <CreateFolder />
-                        <File Id="netipoib_inf" Compressed="yes" DiskId="1" LongName="netipoib.inf" Name="NETIPOI.INF" Source="..\bin\net\x86\netipoib.inf" />
-                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1" LongName="ibwsd.dll" Name="IBWSD.DLL" Source="..\bin\net\x86\ibwsd.dll" />
-                        <File Id="ipoib.sys" Compressed="yes" DiskId="1" LongName="ipoib.sys" Name="IPOIB.SYS" Source="..\bin\net\x86\ipoib.sys" />
+                        <File Id="netipoib_inf" Compressed="yes" DiskId="1"
+                              LongName="netipoib.inf" Name="NETIPOI.INF"
+                              Source="..\bin\net\x86\netipoib.inf" />
+                        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
+                              LongName="ibwsd.dll" Name="IBWSD.DLL"
+                              Source="..\bin\net\x86\ibwsd.dll" />
+                        <File Id="ipoib.sys" Compressed="yes" DiskId="1"
+                              LongName="ipoib.sys" Name="IPOIB.SYS"
+                              Source="..\bin\net\x86\ipoib.sys" />
                     </Component>
                 </Directory>
                 <Component Id="WinsockDirect" Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-                    <File Id="installsp.exe" Compressed="yes" DiskId="1" LongName="installsp.exe" Name="INSTALL.EXE" Source="..\bin\tools\x86\release\installsp.exe" />
+                    <File Id="installsp.exe" Compressed="yes" DiskId="1"
+                              LongName="installsp.exe" Name="INSTALL.EXE"
+                              Source="..\bin\tools\x86\release\installsp.exe" />
                 </Component>
                 <Component Id="DAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-                    <File Id="dapl.dll" Compressed="yes" DiskId="1" LongName="dapl.dll" Name="DAPL.DLL" Source="..\bin\DAPL\x86\dapl.dll" />
+                    <File Id="dapl.dll" Compressed="yes" DiskId="1"
+                              LongName="dapl.dll" Name="DAPL.DLL"
+                              Source="..\bin\DAPL\x86\dapl.dll" />
                     <CopyFile Id="dupDAPL" FileId="dapl.dll"
                               DestinationName="dapl.dll"
                               DestinationProperty="WindowsFolder" />
-                    <File Id="dapld.dll" Compressed="yes" DiskId="1" LongName="dapld.dll" Name="DAPLD.DLL" Source="..\bin\DAPL\x86\dapld.dll" />
-                    <File Id="dat.dll" Compressed="yes" DiskId="1" LongName="dat.dll" Name="DAT.DLL" Source="..\bin\DAPL\x86\dat.dll" />
-                    <CopyFile Id="dupDAT" FileId="dat.dll" DestinationName="dat.dll" DestinationProperty="WindowsFolder" />
-                    <File Id="datd.dll" Compressed="yes" DiskId="1" LongName="datd.dll" Name="DATD.DLL" Source="..\bin\DAPL\x86\datd.dll" />
+                    <File Id="dapld.dll" Compressed="yes" DiskId="1"
+                          LongName="dapld.dll" Name="DAPLD.DLL"
+                              Source="..\bin\DAPL\x86\dapld.dll" />
+                    <File Id="dat.dll" Compressed="yes" DiskId="1"
+                          LongName="dat.dll" Name="DAT.DLL"
+                              Source="..\bin\DAPL\x86\dat.dll" />
+                    <CopyFile Id="dupDAT" FileId="dat.dll"
+                          DestinationName="dat.dll"
+                          DestinationProperty="WindowsFolder" />
+                    <File Id="datd.dll" Compressed="yes" DiskId="1"
+                          LongName="datd.dll" Name="DATD.DLL"
+                          Source="..\bin\DAPL\x86\datd.dll" />
+                    <File Id="dat.conf" Compressed="yes" DiskId="1"
+                          LongName="dat.conf" Name="dat.conf"
+                          Source="..\dat.conf" />
+                    <File Id="dapltest.exe" Compressed="yes" DiskId="1"
+                          LongName="dapltest.exe" Name="dapltest.exe"
+                          Source="..\bin\tools\x86\release\dapltest.exe" />
                 </Component>
                 <Directory Id="vnicDir" Name="VNIC">
                     <Component Id="VNIC" Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
                         <CreateFolder />
-                        <File Id="vnic.sys" Compressed="yes" DiskId="1" LongName="vnic.sys" Name="VNIC.SYS" Source="..\bin\net\x86\vnic.sys" />
-                        <File Id="netvnic.inf" Compressed="yes" DiskId="1" LongName="netvnic.inf" Name="NETVNIC.INF" Source="..\bin\net\x86\netvnic.inf" />
+                        <File Id="vnic.sys" Compressed="yes" DiskId="1"
+                              LongName="vnic.sys" Name="VNIC.SYS"
+                              Source="..\bin\net\x86\vnic.sys" />
+                        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+                              LongName="netvnic.inf" Name="NETVNIC.INF"
+                              Source="..\bin\net\x86\netvnic.inf" />
                     </Component>
                 </Directory>
                 <Directory Id="srpDir" Name="SRP">
                     <Component Id="SRP_inf" Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1" LongName="ib_srp.inf" Name="IB_SRP.INF" Source="..\bin\storage\ib_srp.inf" />
+                        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+                              LongName="ib_srp.inf" Name="IB_SRP.INF"
+                              Source="..\bin\storage\ib_srp.inf" />
                     </Component>
                     <Directory Id="x86Dir" Name="x86">
                         <Component Id="SRP_driver" Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">
-                            <File Id="ibsrp.sys" Compressed="yes" DiskId="1" LongName="ibsrp.sys" Name="IBSRP.SYS" Source="..\bin\storage\x86\ibsrp.sys" />
+                            <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+                                  LongName="ibsrp.sys" Name="IBSRP.SYS"
+                                  Source="..\bin\storage\x86\ibsrp.sys" />
                         </Component>
                     </Directory>
                 </Directory>
                 <Component Id="OpenSM_Service_enabled" Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                    <File Id="opensm.txt" Compressed="yes" DiskId="1" LongName="opensm.service.txt" Name="OPENSM.TXT" Source="..\opensm.service.txt" />
+                    <File Id="opensm.txt" Compressed="yes" DiskId="1"
+                          LongName="opensm.service.txt" Name="OPENSM.TXT"
+                          Source="..\opensm.service.txt" />
                 </Component>
             </Directory>
         </Directory>