[ofw] [PATCH] cleanup DATSDK files

Smith, Stan stan.smith at intel.com
Fri Apr 9 15:54:29 PDT 2010


signed-off-by: stan smith <stan.smith at intel.com>

Revision: 2772
Author: stansmith
Date: 3:15:47 PM, Friday, April 09, 2010
Message:
[WIX] simplify by creating %systemdrive%\DAT in a single place (moved from ofed.wxs files).
Create DAT SDK include file to match uDAT ver 2 conventions (DAT --> DAT2)
Include missing DAT file dat_ib_extensions.h
----
Modified : /gen1/trunk/OFED/WIX/common/DAT_config.inc

--- a/OFED/WIX/common/DAT_config.inc    Fri Apr 09 15:17:16 2010
+++ b/OFED/WIX/common/DAT_config.inc    Fri Apr 09 10:05:55 2010
@@ -1,4 +1,9 @@
 <Include>
+
+  <Directory Id="dDATD" Name="DAT">
+
+    <!-- install DAT configuration file to %SystemDrive%\DAT\ -->
+
     <Component Id="cDatCfg"
                Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >
       <CreateFolder />
@@ -7,13 +12,15 @@
              Source="..\..\dat.conf" />
     </Component>

+    <!-- Install DAT header files to %SystemDrive%\DAT\v2-0\DAT2 -->
+
     <Directory Id="v2_0" Name="v2-0">
       <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"
                  KeyPath="yes" SharedDllRefCount="yes">
         <CreateFolder />
       </Component>

-      <Directory Id="DDID2" Name="DAT">
+      <Directory Id="DDID2" Name="DAT2">
         <Component Id="cDatBldV2Hdrs"
                   Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >
           <CreateFolder />
@@ -25,6 +32,10 @@
                 Name="dat_error.h"
                 Source="..\bin\DAPL2\dat_error.h" />

+          <File Id="_dat_ib_extensions.h" DiskId="1"
+                Name="dat_ib_extensions.h"
+                Source="..\bin\DAPL2\dat_ib_extensions.h" />
+
           <File Id="_dat_platform_specific.h"
                 DiskId="1" Name="dat_platform_specific.h"
                 Source="..\bin\DAPL2\dat_platform_specific.h" />
@@ -70,4 +81,7 @@
                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />
       </Component>
     </Directory>
+
+  </Directory>
+
 </Include>



More information about the ofw mailing list