[WIX] install DAPL 32-bit binaries in SysWow64 on 64-bit systems.

Install DAPL UCM (Unreliable Datagram Connection Manager) as part of DAPL runtime package.

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

diff --git a/trunk/OFED/WIX/common/system_files.inc b/trunk/OFED/WIX/common/system_files.inc
index 7c5809dd07195eaeaa1061faf53bf144f4bc6b81..c63d0712dd5f8e14a1bacc71efa5a3fed418cfc6 100644 (file)
--- a/trunk/OFED/WIX/common/system_files.inc
+++ b/trunk/OFED/WIX/common/system_files.inc
@@ -78,6 +78,14 @@
             Name="dapl2-ofa-cmad.dll"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />\r
 \r
+      <File Id="_dapl2_ofa_ucm.dll" DiskId="1"\r
+            Name="dapl2-ofa-ucm.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-ucm.dll" />\r
+ \r
+      <File Id="_dapl2_ofa_ucmd.dll" DiskId="1"\r
+            Name="dapl2-ofa-ucmd.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-ucmd.dll" />\r
+\r
       <File Id="_dat2.dll" DiskId="1"\r
             Name="dat2.dll"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />\r
@@ -109,6 +117,31 @@
            <File Id="_dat32d.dll" DiskId="1"\r
                  Name="dat2d.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />\r
+\r
+           <File Id="_dapl2_ofa_scm32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-scm.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scm32.dll" />\r
+ \r
+           <File Id="_dapl2_ofa_scmd32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-scmd.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd32.dll" />\r
+\r
+           <File Id="_dapl2_ofa_cma32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-cma.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cma32.dll" />\r
+ \r
+           <File Id="_dapl2_ofa_cmad32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-cmad.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad32.dll" />\r
+\r
+           <File Id="_dapl2_ofa_ucm32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-ucm.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-ucm32.dll" />\r
+ \r
+           <File Id="_dapl2_ofa_ucmd32.dll" DiskId="1"\r
+                 Name="dapl2-ofa-ucmd.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-ucmd32.dll" />\r
+\r
        </Component>\r
     </DirectoryRef> \r
 \r

diff --git a/trunk/OFED/WIX/dat.conf b/trunk/OFED/WIX/dat.conf
index 22a8720e627eacffcb57fe140556b14bc1882aa4..b661e2c409b2d1ecfa11bbfdc307efdaf3040659 100644 (file)
--- a/trunk/OFED/WIX/dat.conf
+++ b/trunk/OFED/WIX/dat.conf
@@ -31,3 +31,9 @@ ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-cma.dll ri
 #\r
 # DAT 2.0 RDMA-CM (debug)\r
 ibnic0v2-cmad u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-cmad.dll ri.2.0 "rdma_dev0 1" ""\r
+#\r
+# DAT 2.0 UCM - Unreliable Datagram Connection Manager\r
+ibnic0v2-ucm u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-ucm.dll ri.2.0 "ibv_device0 1" ""\r
+#\r
+# DAT 2.0 UCM (debug)\r
+ibnic0v2-ucmd u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-ucmd.dll ri.2.0 "ibv_device0 1" ""\r

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 6366748e1ce0df6bd346e1750c08038e691ffea3..a49fdb02558480943af746886f8ebc8dc5e5526c 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -131,9 +131,9 @@ set WV_CHK=winverbsd.dll winverbsd.lib winverbsd.pdb winmadd.dll winmadd.lib lib
 \r
 set WV_FRE=winverbs.dll winverbs.lib winmad.dll winmad.lib libibverbs.dll libibverbs.lib libibverbs.pdb libibumad.lib libibumad.dll libibumad.pdb libibmad.lib libibmad.dll libibmad.pdb librdmacm.dll librdmacm.lib librdmacm.pdb libibnetdisc.dll libibnetdisc.pdb\r
 \r
-set DAPL2_F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dat2.dll dat2.lib dat2.pdb\r
+set DAPL2_F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dapl2-ofa-ucm.dll dapl2-ofa-ucm.pdb dat2.dll dat2.lib dat2.pdb\r
 \r
-set DAPL2_D=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set DAPL2_D=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dapl2-ofa-ucmd.dll dapl2-ofa-ucmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
 \r
 rem\r
 rem KERNEL MODE\r
@@ -423,8 +423,11 @@ if /I "%_ARCH%" == "x64" (
     copy /B %bin_dir_chk_WOW%\complibd.pdb %2\HCA\amd64\cl32d.pdb /y \r
     copy /B %bin_dir_chk_WOW%\mthcaud.dll %2\HCA\amd64\mthca32d.dll /y \r
     copy /B %bin_dir_chk_WOW%\mlx4ud.dll %2\HCA\amd64\mlx4u32d.dll /y \r
-    copy /B %bin_dir_chk_WOW%\dapl2d.dll %2\DAPL2\amd64\dapl232d.dll /y \r
     copy /B %bin_dir_chk_WOW%\dat2d.dll  %2\DAPL2\amd64\dat232d.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2d.dll %2\DAPL2\amd64\dapl232d.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-scmd.dll %2\DAPL2\amd64\dapl2-ofa-scmd32.dll /y\r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-cmad.dll %2\DAPL2\amd64\dapl2-ofa-cmad32.dll /y\r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-ucmd.dll %2\DAPL2\amd64\dapl2-ofa-ucmd32.dll /y\r
 ) else (\r
     copy /B %bin_dir_chk_WOW%\ibald.dll %2\HCA\ia64\ibal32d.dll /y \r
     copy /B %bin_dir_chk_WOW%\ibald.lib %2\HCA\ia64\ibal32d.lib /y \r
@@ -434,8 +437,11 @@ if /I "%_ARCH%" == "x64" (
     copy /B %bin_dir_chk_WOW%\complibd.pdb %2\HCA\ia64\cl32d.pdb /y \r
     copy /B %bin_dir_chk_WOW%\mthcaud.dll %2\HCA\ia64\mthca32d.dll /y \r
     copy /B %bin_dir_chk_WOW%\mlx4ud.dll %2\HCA\ia64\mlx4u32d.dll /y\r
-    copy /B %bin_dir_chk_WOW%\dapl2d.dll %2\DAPL2\ia64\dapl232d.dll /y \r
     copy /B %bin_dir_chk_WOW%\dat2d.dll  %2\DAPL2\ia64\dat232d.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2d.dll %2\DAPL2\ia64\dapl232d.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-scmd.dll %2\DAPL2\ia64\dapl2-ofa-scmd32.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-cmad.dll %2\DAPL2\ia64\dapl2-ofa-cmad32.dll /y \r
+    copy /B %bin_dir_chk_WOW%\dapl2-ofa-ucmd.dll %2\DAPL2\ia64\dapl2-ofa-ucmd32.dll /y \r
     goto ia64_fre_dll\r
 )\r
 \r
@@ -641,8 +647,11 @@ if /I "%_ARCH%" == "x64" (
     copy /B %bin_dir_fre_WOW%\winmad.pdb %2\HCA\amd64\winverbs32.pdb /y\r
     copy /B %bin_dir_fre_WOW%\mthcau.dll %2\HCA\amd64\mthca32.dll /y\r
     copy /B %bin_dir_fre_WOW%\mlx4u.dll %2\HCA\amd64\mlx4u32.dll /y\r
-    copy /B %bin_dir_fre_WOW%\dapl2.dll %2\DAPL2\amd64\dapl232.dll /y\r
     copy /B %bin_dir_fre_WOW%\dat2.dll %2\DAPL2\amd64\dat232.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2.dll %2\DAPL2\amd64\dapl232.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-scm.dll %2\DAPL2\amd64\dapl2-ofa-scm32.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-cma.dll %2\DAPL2\amd64\dapl2-ofa-cma32.dll /y \r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-ucm.dll %2\DAPL2\amd64\dapl2-ofa-ucm32.dll /y\r
 ) else (\r
     rem IA64\r
     if exist "%bin_dir_fre_WOW%\ibndprov.dll" (\r
@@ -664,8 +673,11 @@ if /I "%_ARCH%" == "x64" (
     copy /B %bin_dir_fre_WOW%\winmad.pdb %2\HCA\ia64\winverbs32.pdb /y\r
     copy /B %bin_dir_fre_WOW%\mthcau.dll %2\HCA\ia64\mthca32.dll /y\r
     copy /B %bin_dir_fre_WOW%\mlx4u.dll %2\HCA\ia64\mlx4u32.dll /y\r
-    copy /B %bin_dir_fre_WOW%\dapl2.dll %2\DAPL2\ia64\dapl232.dll /y\r
     copy /B %bin_dir_fre_WOW%\dat2.dll %2\DAPL2\ia64\dat232.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2.dll %2\DAPL2\ia64\dapl232.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-scm.dll %2\DAPL2\ia64\dapl2-ofa-scm32.dll /y\r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-cma.dll %2\DAPL2\ia64\dapl2-ofa-cma32.dll /y \r
+    copy /B %bin_dir_fre_WOW%\dapl2-ofa-ucm.dll %2\DAPL2\ia64\dapl2-ofa-ucm32.dll /y\r
 )\r
 \r
 :mk_sym_bin\r