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

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

diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 652c18f04f1a8d6cf3b24d032f1ab0d0065684c1..f3faa743e47859da3d9c3ddc3296ba2dcc763695 100644 (file)
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -2,13 +2,6 @@
 <!--\r
    WinOF 1.0 for x64 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
   <Product Name="Windows Open Fabrics InfiniBand"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
@@ -156,8 +149,10 @@
                      LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
                      Source="..\bin\tools\amd64\release\PrintIP.exe" />\r
           </Component>\r
+\r
           <Directory Id="hcaDir" 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
@@ -242,6 +237,7 @@
                         DestinationProperty="SystemFolder" />\r
             </Component>\r
           </Directory>\r
+\r
           <Directory Id="ipoibDir" Name="net">\r
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
               <CreateFolder />\r
@@ -270,44 +266,44 @@
                      Source="..\bin\tools\amd64\release\installsp.exe" />\r
           </Component>\r
 \r
-            <Component Id="cDAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl32.dll" Name="DAPL32.DLL"\r
-                     Source="..\bin\DAPL\amd64\dapl32.dll" />\r
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"\r
-                     Source="..\bin\DAPL\amd64\dapl32d.dll" />\r
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl.dll" Name="DAPL.DLL"\r
-                     Source="..\bin\DAPL\amd64\dapl.dll" />\r
-                <CopyFile Id="dupDAPL" FileId="dapl.dll"\r
-                        DestinationName="dapl.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="dapld.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapld.dll" Name="DAPLD.DLL"\r
-                     Source="..\bin\DAPL\amd64\dapld.dll" />\r
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat32.dll" Name="DAT32.DLL"\r
-                     Source="..\bin\DAPL\amd64\dat32.dll" />\r
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat32d.dll" Name="DAT32D.DLL"\r
-                     Source="..\bin\DAPL\amd64\dat32d.dll" />\r
-              <File Id="dat.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat.dll" Name="DAT.DLL"\r
-                     Source="..\bin\DAPL\amd64\dat.dll" />\r
-              <CopyFile Id="dupDAT" FileId="dat.dll"\r
-                        DestinationName="dat.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="datd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="datd.dll" Name="DATD.DLL"\r
-                     Source="..\bin\DAPL\amd64\datd.dll" />\r
-              <File Id="dat.conf" Compressed="yes" DiskId="1"\r
-                     LongName="dat.conf" Name="dat.conf"\r
-                     Source="..\dat.conf" />\r
-              <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapltest.exe" Name="dapltest.exe"\r
-                     Source="..\bin\tools\amd64\release\dapltest.exe" />\r
-            </Component>\r
+          <Component Id="cDAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
+            <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapl32.dll" Name="DAPL32.DLL"\r
+                   Source="..\bin\DAPL\amd64\dapl32.dll" />\r
+            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapl32d.dll" Name="DAPL32D.DLL"\r
+                   Source="..\bin\DAPL\amd64\dapl32d.dll" />\r
+            <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapl.dll" Name="DAPL.DLL"\r
+                   Source="..\bin\DAPL\amd64\dapl.dll" />\r
+              <CopyFile Id="dupDAPL" FileId="dapl.dll"\r
+                      DestinationName="dapl.dll"\r
+                      DestinationProperty="WindowsFolder" />\r
+            <File Id="dapld.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapld.dll" Name="DAPLD.DLL"\r
+                   Source="..\bin\DAPL\amd64\dapld.dll" />\r
+            <File Id="dat32.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dat32.dll" Name="DAT32.DLL"\r
+                   Source="..\bin\DAPL\amd64\dat32.dll" />\r
+            <File Id="dat32d.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dat32d.dll" Name="DAT32D.DLL"\r
+                   Source="..\bin\DAPL\amd64\dat32d.dll" />\r
+            <File Id="dat.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dat.dll" Name="DAT.DLL"\r
+                   Source="..\bin\DAPL\amd64\dat.dll" />\r
+            <CopyFile Id="dupDAT" FileId="dat.dll"\r
+                      DestinationName="dat.dll"\r
+                      DestinationProperty="WindowsFolder" />\r
+            <File Id="datd.dll" Compressed="yes" DiskId="1"\r
+                   LongName="datd.dll" Name="DATD.DLL"\r
+                   Source="..\bin\DAPL\amd64\datd.dll" />\r
+            <File Id="dat.conf" Compressed="yes" DiskId="1"\r
+                   LongName="dat.conf" Name="dat.conf"\r
+                   Source="..\dat.conf" />\r
+            <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
+                   LongName="dapltest.exe" Name="dapltest.exe"\r
+                   Source="..\bin\tools\amd64\release\dapltest.exe" />\r
+          </Component>\r
 \r
           <Directory Id="vnicDir" Name="VNIC">\r
             <Component Id="cVNIC" Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
@@ -320,6 +316,7 @@
                      Source="..\bin\net\amd64\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
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
@@ -327,13 +324,15 @@
                      Source="..\bin\storage\ib_srp.inf" />\r
             </Component>\r
             <Directory Id="amd64Dir" Name="amd64">\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\amd64\ibsrp.sys" />\r
               </Component>\r
             </Directory>\r
           </Directory>\r
+\r
           <Component Id="OpenSM_Service_enabled"\r
                      Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
             <File Id="opensm.txt" Compressed="yes" DiskId="1"\r
@@ -346,7 +345,80 @@
         <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
@@ -392,6 +464,15 @@
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <Condition Level="201"> IPOIB_EXISTS </Condition>\r
       <ComponentRef Id="cDAPL" />\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
 \r
     <Feature Id="fVNIC" Title="VNIC" Description="Virtual NIC over InfiniBand"\r