[WinOF] copy DAT headers to %SystemDrive%\DAT\include\DAT

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

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index ee70a2a7f6b7c8071bf206e7249defda7b81d025..531b2c06a1726596e64ecc386c2e7dbebb447fc2 100644 (file)
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<!--\r
-    # This comment is generated by WixEdit, the specific commandline\r
-    # arguments for the WiX Toolset are stored here.\r
-\r
-    candleArgs: \r
-    lightArgs: "<projectname>.wixobj" -out "<projectname>_x86.msi" <extensions>\r
--->\r
 <!--\r
    WinOF 1.0 (Windows OpenFabrics InfiniBand) for x86 Win2K3 or XP\r
 -->\r
-<!--\r
-    # This comment is generated by WixEdit, the specific commandline\r
-    # arguments for the WiX Toolset are stored here.\r
-\r
-    candleArgs: \r
-    lightArgs: "<projectname>.wixobj" -out "<projectname>.msi" <extensions>\r
--->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
   <Product Name="Windows OpenFabrics InfiniBand"\r
@@ -62,10 +48,13 @@
     </Condition>\r
     <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
     <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />\r
+\r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
+\r
         <Directory Id="ProgramFilesFolder" Name="PFiles">\r
             <Directory Id="INSTALLDIR" Name="WinOF">\r
-                <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\r
+                <Component Id="Docs"\r
+                           Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\r
                     <File Id="OFAlogo" Compressed="yes" DiskId="1"\r
                           LongName="openfabrics.gif" Name="ofa.gif"\r
                           Source="..\openfabrics.gif" />\r
@@ -103,10 +92,12 @@
                           Target="[SystemFolder]msiexec.exe"\r
                           Arguments="/X [ProductCode]"\r
                           Directory="ProgramMenuDir"\r
-                          Description="Uninstalls Windows OpenFabrics InfinBand stack" />\r
+                          Description="Uninstall Windows OpenFabrics InfinBand stack" />\r
                     <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />\r
                 </Component>\r
-                <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
+\r
+                <Component Id="Tools"\r
+                           Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
                     <File Id="vstat" Name="vstat.exe" Compressed="yes"\r
                           DiskId="1" Source="..\bin\tools\x86\release\vstat.exe"\r
                           Vital="yes" />\r
@@ -150,8 +141,10 @@
                           LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
                           Source="..\bin\tools\x86\release\PrintIP.exe" />\r
                 </Component>\r
+\r
                 <Directory Id="HcaDriver" Name="IBcore">\r
-                    <Component Id="HcaDriver" Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
+                    <Component Id="HcaDriver"\r
+                               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
                         <CreateFolder />\r
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
@@ -194,8 +187,10 @@
                               Source="..\bin\HCA\x86\mthcaud.dll" />\r
                     </Component>\r
                 </Directory>\r
+\r
                 <Directory Id="ipoibDir" Name="net">\r
-                    <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
+                    <Component Id="IPoIB"\r
+                               Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
                         <CreateFolder />\r
                         <File Id="netipoib_inf" Compressed="yes" DiskId="1"\r
                               LongName="netipoib.inf" Name="NETIPOI.INF"\r
@@ -208,12 +203,15 @@
                               Source="..\bin\net\x86\ipoib.sys" />\r
                     </Component>\r
                 </Directory>\r
-                <Component Id="WinsockDirect" Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">\r
+\r
+                <Component Id="WinsockDirect"\r
+                           Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">\r
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\tools\x86\release\installsp.exe" />\r
                 </Component>\r
-                <Component Id="DAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
+                <Component Id="DAPL"\r
+                           Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
                     <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
                               LongName="dapl.dll" Name="DAPL.DLL"\r
                               Source="..\bin\DAPL\x86\dapl.dll" />\r
@@ -239,8 +237,10 @@
                           LongName="dapltest.exe" Name="dapltest.exe"\r
                           Source="..\bin\tools\x86\release\dapltest.exe" />\r
                 </Component>\r
+\r
                 <Directory Id="vnicDir" Name="VNIC">\r
-                    <Component Id="VNIC" Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
+                    <Component Id="VNIC"\r
+                               Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
                         <CreateFolder />\r
                         <File Id="vnic.sys" Compressed="yes" DiskId="1"\r
                               LongName="vnic.sys" Name="VNIC.SYS"\r
@@ -250,21 +250,26 @@
                               Source="..\bin\net\x86\netvnic.inf" />\r
                     </Component>\r
                 </Directory>\r
+\r
                 <Directory Id="srpDir" Name="SRP">\r
-                    <Component Id="SRP_inf" Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
+                    <Component Id="SRP_inf"\r
+                               Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
                         <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
                               LongName="ib_srp.inf" Name="IB_SRP.INF"\r
                               Source="..\bin\storage\ib_srp.inf" />\r
                     </Component>\r
                     <Directory Id="x86Dir" Name="x86">\r
-                        <Component Id="SRP_driver" Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">\r
+                        <Component Id="SRP_driver"\r
+                                   Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">\r
                             <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                                   LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                                   Source="..\bin\storage\x86\ibsrp.sys" />\r
                         </Component>\r
                     </Directory>\r
                 </Directory>\r
-                <Component Id="OpenSM_Service_enabled" Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
+\r
+                <Component Id="OpenSM_Service_enabled"\r
+                           Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
                     <File Id="opensm.txt" Compressed="yes" DiskId="1"\r
                           LongName="opensm.service.txt" Name="OPENSM.TXT"\r
                           Source="..\opensm.service.txt" />\r
@@ -275,7 +280,81 @@
             <Directory Id="ProgramMenuDir" Name="WinOF" />\r
         </Directory>\r
         <Directory Id="DesktopFolder" Name="Desktop" />\r
-    </Directory>\r
+\r
+      <!-- copy DAT header files to %SystemDrive%\DAT\Include\DAT -->\r
+      <Directory Id="WindowsFolder" SourceName="Windows" />    \r
+      <Directory Id="WindowsVolume" SourceName="WinRoot">    \r
+          <Component Id="cDAT0" Guid="10CE9FAB-879F-4B99-B4EF-8177D9258CAB"\r
+                   KeyPath="yes" SharedDllRefCount="yes">\r
+            <CreateFolder />\r
+          </Component>\r
+\r
+          <Directory Id="DAT1" Name="DAT">\r
+            <Component Id="cDAT1" Guid="1C84AD9E-5ADF-4A87-BD4E-F5F4CB429B01"\r
+                       KeyPath="yes" SharedDllRefCount="yes">\r
+              <CreateFolder />\r
+            </Component>\r
+            <Directory Id="INCLUDE" Name="Include">\r
+              <Component Id="cDAT2" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"\r
+                         KeyPath="yes" SharedDllRefCount="yes">\r
+                <CreateFolder />\r
+              </Component>\r
+              <Directory Id="DDID" Name="DAT">    \r
+                <Component Id="cDatHeaders"\r
+                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
+                  <CreateFolder />    \r
+                  <File Id="dat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL\dat.h" />    \r
+\r
+                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat_error.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL\dat_error.h" />    \r
+    \r
+                  <File Id="dat_platform_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_platform_specific.h"    \r
+                        Name="dat_plat.h"    \r
+                       Source="..\bin\DAPL\dat_platform_specific.h" />    \r
+    \r
+                  <File Id="dat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_redirection.h"    \r
+                        Name="dat_redi.h"    \r
+                        Source="..\bin\DAPL\dat_redirection.h" />    \r
+    \r
+                  <File Id="dat_registry.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_registry.h"    \r
+                        Name="dat_reg.h"    \r
+                        Source="..\bin\DAPL\dat_registry.h" />    \r
+    \r
+                  <File Id="dat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_vendor_specific.h"    \r
+                        Name="dat_vend.h"    \r
+                        Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
+    \r
+                  <File Id="udat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat.h" Name="udat.h"    \r
+                        Source="..\bin\DAPL\udat.h" />    \r
+    \r
+                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat_config.h" Name="udat_cfg.h"    \r
+                        Source="..\bin\DAPL\udat_config.h" />    \r
+    \r
+                  <File Id="udat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_redirection.h"    \r
+                        Name="udat_red.h"    \r
+                        Source="..\bin\DAPL\udat_redirection.h" />    \r
+    \r
+                  <File Id="udat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_vendor_specific.h"    \r
+                        Name="udat_ven.h"    \r
+                        Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
+                </Component>    \r
+              </Directory>    \r
+            </Directory>    \r
+          </Directory>    \r
+      </Directory>\r
+    </Directory> <!-- End TARGETDIR -->   \r
+\r
     <Property Id="ARPNOMODIFY">1</Property>\r
     <Property Id="ARPNOREPAIR">1</Property>\r
     <Property Id="ARPCOMMENTS">OpenFabrics Windows InfiniBand stack</Property>\r
@@ -315,6 +394,15 @@
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <Condition Level="201"> IPOIB_EXISTS </Condition>\r
         <ComponentRef Id="DAPL" />\r
+      <Feature Id="fDatHdr" Title="DAT Header Files"\r
+         Description="DAT 1.1 Header Files"\r
+         Display="expand" Level="1" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+         <ComponentRef Id="cDAT0" />\r
+         <ComponentRef Id="cDAT1" />\r
+         <ComponentRef Id="cDAT2" />\r
+         <ComponentRef Id="cDatHeaders" />\r
+      </Feature>\r
     </Feature>\r
     <Feature Id="fVNIC" Title="VNIC" Description="Virtual NIC over InfiniBand"\r
         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r