From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Wed, 15 Aug 2007 23:57:21 +0000 (+0000)
Subject: [WinOF] copy DAT headers to %SystemDrive%\DAT\include\DAT
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c8115d47680dcad32d2299c07dc756145ebbebcd;p=~shefty%2Frdma-win.git

[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 652c18f0..f3faa743 100644
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -2,13 +2,6 @@
 <!--
    WinOF 1.0 for x64 Win2K3 or XP
 -->
-<!--
-    # This comment is generated by WixEdit, the specific commandline
-    # arguments for the WiX Toolset are stored here.
-
-    candleArgs: 
-    lightArgs: "<projectname>.wixobj" -out "<projectname>.msi" <extensions>
--->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
   <Product Name="Windows Open Fabrics InfiniBand"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
@@ -156,8 +149,10 @@
                      LongName="PrintIP.exe" Name="PRINTIP.EXE"
                      Source="..\bin\tools\amd64\release\PrintIP.exe" />
           </Component>
+
           <Directory Id="hcaDir" Name="IBcore">
-            <Component Id="HcaDriver" Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
+            <Component Id="HcaDriver"
+                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">
               <CreateFolder />
               <File Id="devman.exe" Compressed="yes" DiskId="1"
                      LongName="devman.exe" Name="devman.exe"
@@ -242,6 +237,7 @@
                         DestinationProperty="SystemFolder" />
             </Component>
           </Directory>
+
           <Directory Id="ipoibDir" Name="net">
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">
               <CreateFolder />
@@ -270,44 +266,44 @@
                      Source="..\bin\tools\amd64\release\installsp.exe" />
           </Component>
 
-            <Component Id="cDAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32.dll" Name="DAPL32.DLL"
-                     Source="..\bin\DAPL\amd64\dapl32.dll" />
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"
-                     Source="..\bin\DAPL\amd64\dapl32d.dll" />
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"
-                     LongName="dapl.dll" Name="DAPL.DLL"
-                     Source="..\bin\DAPL\amd64\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\amd64\dapld.dll" />
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32.dll" Name="DAT32.DLL"
-                     Source="..\bin\DAPL\amd64\dat32.dll" />
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"
-                     LongName="dat32d.dll" Name="DAT32D.DLL"
-                     Source="..\bin\DAPL\amd64\dat32d.dll" />
-              <File Id="dat.dll" Compressed="yes" DiskId="1"
-                     LongName="dat.dll" Name="DAT.DLL"
-                     Source="..\bin\DAPL\amd64\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\amd64\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\amd64\release\dapltest.exe" />
-            </Component>
+          <Component Id="cDAPL" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">
+            <File Id="dapl32.dll" Compressed="yes" DiskId="1"
+                   LongName="dapl32.dll" Name="DAPL32.DLL"
+                   Source="..\bin\DAPL\amd64\dapl32.dll" />
+            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"
+                   LongName="dapl32d.dll" Name="DAPL32D.DLL"
+                   Source="..\bin\DAPL\amd64\dapl32d.dll" />
+            <File Id="dapl.dll" Compressed="yes" DiskId="1"
+                   LongName="dapl.dll" Name="DAPL.DLL"
+                   Source="..\bin\DAPL\amd64\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\amd64\dapld.dll" />
+            <File Id="dat32.dll" Compressed="yes" DiskId="1"
+                   LongName="dat32.dll" Name="DAT32.DLL"
+                   Source="..\bin\DAPL\amd64\dat32.dll" />
+            <File Id="dat32d.dll" Compressed="yes" DiskId="1"
+                   LongName="dat32d.dll" Name="DAT32D.DLL"
+                   Source="..\bin\DAPL\amd64\dat32d.dll" />
+            <File Id="dat.dll" Compressed="yes" DiskId="1"
+                   LongName="dat.dll" Name="DAT.DLL"
+                   Source="..\bin\DAPL\amd64\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\amd64\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\amd64\release\dapltest.exe" />
+          </Component>
 
           <Directory Id="vnicDir" Name="VNIC">
             <Component Id="cVNIC" Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
@@ -320,6 +316,7 @@
                      Source="..\bin\net\amd64\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"
@@ -327,13 +324,15 @@
                      Source="..\bin\storage\ib_srp.inf" />
             </Component>
             <Directory Id="amd64Dir" Name="amd64">
-              <Component Id="SRP_driver" Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">
+              <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\amd64\ibsrp.sys" />
               </Component>
             </Directory>
           </Directory>
+
           <Component Id="OpenSM_Service_enabled"
                      Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
             <File Id="opensm.txt" Compressed="yes" DiskId="1"
@@ -346,7 +345,80 @@
         <Directory Id="ProgramMenuDir" Name="WinOF" />
       </Directory>
       <Directory Id="DesktopFolder" Name="Desktop" />
-    </Directory>
+
+      <!-- copy DAT header files to %SystemDrive%\DAT\Include\DAT -->
+      <Directory Id="WindowsFolder" SourceName="Windows" />    
+      <Directory Id="WindowsVolume" SourceName="WinRoot">    
+          <Component Id="cDAT0" Guid="10CE9FAB-879F-4B99-B4EF-8177D9258CAB"
+                   KeyPath="yes" SharedDllRefCount="yes">
+            <CreateFolder />
+          </Component>
+
+          <Directory Id="DAT1" Name="DAT">
+            <Component Id="cDAT1" Guid="1C84AD9E-5ADF-4A87-BD4E-F5F4CB429B01"
+                       KeyPath="yes" SharedDllRefCount="yes">
+              <CreateFolder />
+            </Component>
+            <Directory Id="INCLUDE" Name="Include">
+              <Component Id="cDAT2" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"
+                         KeyPath="yes" SharedDllRefCount="yes">
+                <CreateFolder />
+              </Component>
+              <Directory Id="DDID" Name="DAT">    
+                <Component Id="cDatHeaders"
+                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    
+                  <CreateFolder />    
+                  <File Id="dat.h" Compressed="yes" DiskId="1"    
+                        LongName="dat.h" Name="dat.h"    
+                        Source="..\bin\DAPL\dat.h" />    
+
+                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    
+                        LongName="dat_error.h" Name="dat.h"    
+                        Source="..\bin\DAPL\dat_error.h" />    
+    
+                  <File Id="dat_platform_specific.h" Compressed="yes"    
+                        DiskId="1" LongName="dat_platform_specific.h"    
+                        Name="dat_plat.h"    
+                       Source="..\bin\DAPL\dat_platform_specific.h" />    
+    
+                  <File Id="dat_redirection.h" Compressed="yes"    
+                        DiskId="1" LongName="dat_redirection.h"    
+                        Name="dat_redi.h"    
+                        Source="..\bin\DAPL\dat_redirection.h" />    
+    
+                  <File Id="dat_registry.h" Compressed="yes"    
+                        DiskId="1" LongName="dat_registry.h"    
+                        Name="dat_reg.h"    
+                        Source="..\bin\DAPL\dat_registry.h" />    
+    
+                  <File Id="dat_vendor_specific.h" Compressed="yes"    
+                        DiskId="1" LongName="dat_vendor_specific.h"    
+                        Name="dat_vend.h"    
+                        Source="..\bin\DAPL\dat_vendor_specific.h" />    
+    
+                  <File Id="udat.h" Compressed="yes" DiskId="1"    
+                        LongName="udat.h" Name="udat.h"    
+                        Source="..\bin\DAPL\udat.h" />    
+    
+                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    
+                        LongName="udat_config.h" Name="udat_cfg.h"    
+                        Source="..\bin\DAPL\udat_config.h" />    
+    
+                  <File Id="udat_redirection.h" Compressed="yes"    
+                        DiskId="1" LongName="udat_redirection.h"    
+                        Name="udat_red.h"    
+                        Source="..\bin\DAPL\udat_redirection.h" />    
+    
+                  <File Id="udat_vendor_specific.h" Compressed="yes"    
+                        DiskId="1" LongName="udat_vendor_specific.h"    
+                        Name="udat_ven.h"    
+                        Source="..\bin\DAPL\udat_vendor_specific.h" />    
+                </Component>    
+              </Directory>    
+            </Directory>    
+          </Directory>    
+      </Directory>    
+    </Directory> <!-- End TARGETDIR --> 
 
     <Property Id='ARPNOMODIFY'>1</Property>
     <Property Id='ARPNOREPAIR'>1</Property>
@@ -392,6 +464,15 @@
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       <Condition Level="201"> IPOIB_EXISTS </Condition>
       <ComponentRef Id="cDAPL" />
+      <Feature Id="fDatHdr" Title="DAT Header Files"
+         Description="DAT 1.1 Header Files"
+         Display="expand" Level="1" 
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+         <ComponentRef Id="cDAT0" />
+         <ComponentRef Id="cDAT1" />
+         <ComponentRef Id="cDAT2" />
+         <ComponentRef Id="cDatHeaders" />
+      </Feature>
     </Feature>
 
     <Feature Id="fVNIC" Title="VNIC" Description="Virtual NIC over InfiniBand"