[ofw] [PATCH] simplify OFED SDK creation

Smith, Stan stan.smith at intel.com
Fri Apr 9 16:00:35 PDT 2010


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

Revision: 2775
Author: stansmith
Date: 3:32:33 PM, Friday, April 09, 2010
Message:
[WIX] IB SDK - create %SystemDrive%\OFED_SDK\ in a single place (moved from ofed.wxs).

Include missing headers, libs and symbols.
----
Modified : /gen1/trunk/OFED/WIX/common/ib_sdk.inc

--- a/trunk/OFED/WIX/common/ib_sdk.inc  Fri Apr 09 15:28:54 2010
+++ b/trunk/OFED/WIX/common/ib_sdk.inc  Wed Apr 07 17:20:25 2010
@@ -1,4 +1,9 @@
 <Include>
+
+  <!-- Copy header files (.h) to %SystemDrive%\OFED_SDK -->
+
+  <Directory Id="OFED_SDK" Name="OFED_SDK">
+
     <Directory Id="IB_libs" Name="lib">
       <Component Id="cIBAL_Libs"
                  Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">
@@ -59,9 +64,16 @@
         <File Id="winverbs.lib" DiskId="1"
               Name="winverbs.lib"
               Source="..\bin\HCA\$(var.ARCH)\winverbs.lib" />
+        <File Id="winverbs.pdb" DiskId="1"
+              Name="winverbs.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\winverbs.pdb" />
+
         <File Id="winverbsd.lib" DiskId="1"
               Name="winverbsd.lib"
               Source="..\bin\HCA\$(var.ARCH)\winverbsd.lib" />
+        <File Id="winverbsd.pdb" DiskId="1"
+              Name="winverbsd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\winverbsd.pdb" />

         <File Id="libibverbs.lib" DiskId="1"
               Name="libibverbs.lib"
@@ -69,6 +81,7 @@
         <File Id="libibverbs2.pdb" DiskId="1"
               Name="libibverbs.pdb"
               Source="..\bin\HCA\$(var.ARCH)\libibverbs.pdb" />
+
         <File Id="libibverbsd.lib" DiskId="1"
               Name="libibverbsd.lib"
               Source="..\bin\HCA\$(var.ARCH)\libibverbsd.lib" />
@@ -76,6 +89,20 @@
               Name="libibverbsd.pdb"
               Source="..\bin\HCA\$(var.ARCH)\libibverbsd.pdb" />

+        <File Id="_librdmacm.lib" DiskId="1"
+              Name="librdmacm.lib"
+              Source="..\bin\HCA\$(var.ARCH)\librdmacm.lib" />
+        <File Id="_librdmacm.pdb" DiskId="1"
+              Name="librdmacm.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\librdmacm.pdb" />
+
+        <File Id="_librdmacmd.lib" DiskId="1"
+              Name="librdmacmd.lib"
+              Source="..\bin\HCA\$(var.ARCH)\librdmacmd.lib" />
+        <File Id="_librdmacmd.pdb" DiskId="1"
+              Name="librdmacmd.pdb"
+              Source="..\bin\HCA\$(var.ARCH)\librdmacmd.pdb" />
+
         <File Id="libibmad.lib" DiskId="1"
               Name="libibmad.lib"
               Source="..\bin\HCA\$(var.ARCH)\libibmad.lib" />
@@ -112,9 +139,21 @@
         <File Id="oib_ver.h" DiskId="1"
                Name="oib_ver.h"
                Source="..\bin\Inc\oib_ver.h" />
+        <File Id="mod_ver.def" DiskId="1"
+               Name="mod_ver.def"
+               Source="..\bin\Inc\mod_ver.def" />
         <File Id="openib.def" DiskId="1"
                Name="openib.def"
                Source="..\bin\Inc\openib.def" />
+        <File Id="comp_channel.h" DiskId="1"
+               Name="comp_channel.h"
+               Source="..\bin\Inc\comp_channel.h" />
+        <File Id="dlist.h" DiskId="1"
+               Name="dlist.h"
+               Source="..\bin\Inc\dlist.h" />
+        <File Id="getopt.h" DiskId="1"
+               Name="getopt.h"
+               Source="..\bin\Inc\getopt.h" />
       </Component>

       <Directory Id="IB_complib" Name="complib">
@@ -301,6 +340,108 @@
                 Source="..\bin\Inc\iba\ib_uvp.h" />
         </Component>
       </Directory>
+
+      <Directory Id="IB_user_etc" Name="etc">
+        <Component Id="cINC_user_etc"
+             Guid="95B9A93E-01A5-44cb-8F90-05812B2DE003">
+          <CreateFolder />
+          <File Id="getopt.c" DiskId="1"
+                Name="getopt.c"
+                Source="..\bin\Inc\etc\user\getopt.c" />
+          <File Id="gtod.c" DiskId="1"
+                Name="gtod.c"
+                Source="..\bin\Inc\etc\user\gtod.c" />
+          <File Id="inet.c" DiskId="1"
+                Name="inet.c"
+                Source="..\bin\Inc\etc\user\inet.c" />
+          <File Id="search.c" DiskId="1"
+                Name="search.c"
+                Source="..\bin\Inc\etc\user\search.c" />
+        </Component>
+      </Directory>
+
+      <Directory Id="IB_user_ib" Name="infiniband">
+        <Component Id="cINC_user_ib"
+             Guid="0BC9A12D-5808-439f-977F-D28D02317091">
+          <CreateFolder />
+          <File Id="verbs.h" DiskId="1"
+                Name="verbs.h"
+                Source="..\bin\Inc\infiniband\verbs.h" />
+        </Component>
+      </Directory>
+
+      <Directory Id="IB_linux" Name="linux">
+        <Component Id="cINC_linux"
+                   Guid="BC479552-6293-4baf-87AE-3C0275A3D44C">
+          <CreateFolder />
+          <File Id="_string.h" DiskId="1"
+                Name="_string.h"
+                Source="..\bin\Inc\linux\_string.h" />
+          <File Id="inttypes.h" DiskId="1"
+                Name="inttypes.h"
+                Source="..\bin\Inc\linux\inttypes.h" />
+          <File Id="netdb.h" DiskId="1"
+                Name="netdb.h"
+                Source="..\bin\Inc\linux\netdb.h" />
+          <File Id="search.h" DiskId="1"
+                Name="search.h"
+                Source="..\bin\Inc\linux\search.h" />
+          <File Id="unistd.h" DiskId="1"
+                Name="unistd.h"
+                Source="..\bin\Inc\linux\unistd.h" />
+        </Component>
+
+        <Directory Id="IB_linux_arpa" Name="arpa">
+          <Component Id="cINC_linux_arpa"
+                 Guid="2CAE74DE-D325-487a-9985-39EF982D45AD">
+            <CreateFolder />
+            <File Id="inet.h" DiskId="1"
+                  Name="inet.h"
+                  Source="..\bin\Inc\linux\arpa\inet.h" />
+          </Component>
+        </Directory>
+
+        <Directory Id="IB_linux_netinet" Name="netinet">
+          <Component Id="cINC_linux_netinet"
+                 Guid="C9C68DEB-C004-4b83-9F3A-F33E1ABB5E86">
+            <CreateFolder />
+            <File Id="in.h" DiskId="1"
+                  Name="in.h"
+                  Source="..\bin\Inc\linux\netinet\in.h" />
+          </Component>
+        </Directory>
+
+        <Directory Id="IB_linux_sys" Name="sys">
+          <Component Id="cINC_linux_sys"
+                 Guid="F5819C72-412E-4853-88F7-33A1B2635903">
+            <CreateFolder />
+            <File Id="socket.h" DiskId="1"
+                  Name="socket.h"
+                  Source="..\bin\Inc\linux\sys\socket.h" />
+            <File Id="time.h" DiskId="1"
+                  Name="time.h"
+                  Source="..\bin\Inc\linux\sys\time.h" />
+          </Component>
+        </Directory>
+
+      </Directory>
+
+      <Directory Id="IB_user_rdma" Name="rdma">
+        <Component Id="cINC_user_rdma"
+             Guid="FE5F3635-2D94-4572-91E4-821C9540BA4E">
+          <CreateFolder />
+          <File Id="rdma_cma.h" DiskId="1"
+                Name="rdma_cma.h"
+                Source="..\bin\Inc\rdma\rdma_cma.h" />
+          <File Id="winverbs.h" DiskId="1"
+                Name="winverbs.h"
+                Source="..\bin\Inc\rdma\winverbs.h" />
+          <File Id="wvstatus.h" DiskId="1"
+                Name="wvstatus.h"
+                Source="..\bin\Inc\rdma\wvstatus.h" />
+        </Component>
+      </Directory>
+
     </Directory>

     <Directory Id="IB_samples" Name="Samples">
@@ -351,4 +492,7 @@
         </Component>
       </Directory>   <!-- End VS -->
     </Directory>   <!-- End Samples -->
+
+  </Directory>
+
 </Include>



More information about the ofw mailing list