[WinOF] support DAPL2-ofa-cma.dll (winverbs rdma CM) provider.

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

diff --git a/trunk/WinOF/WIX/common/checked.inc b/trunk/WinOF/WIX/common/checked.inc
index acc31c4ac6efe744f08c1f00b2346c7b312fbe0f..2b1eba5e29c796f7b03fcc9eb69efb8dfd940b1a 100644 (file)
--- a/trunk/WinOF/WIX/common/checked.inc
+++ b/trunk/WinOF/WIX/common/checked.inc
@@ -104,7 +104,11 @@
         <Component Id="cCHK_user"\r
                    Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
           <CreateFolder />\r
-          <File Id="file83" Name="DAPL2-_1.DLL"\r
+          <File Id="file82" Name="d2-cmad.dll"\r
+            LongName="dapl2-ofa-cmad.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />\r
+          <File Id="file83" Name="d2-scmd.dll"\r
             LongName="dapl2-ofa-scmd.dll"\r
             DiskId="1" Compressed="yes"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r

diff --git a/trunk/WinOF/WIX/common/dapl_rt.inc b/trunk/WinOF/WIX/common/dapl_rt.inc
index 9137d04797f7552e69b1a90ecb7b2106a6d4992c..a6ba84bec26004228eaf5f33d6297ccc8263ca71 100644 (file)
--- a/trunk/WinOF/WIX/common/dapl_rt.inc
+++ b/trunk/WinOF/WIX/common/dapl_rt.inc
@@ -113,6 +113,16 @@
           <File Id="_dapl2_ofa_scmd.dll" Compressed="yes" DiskId="1"\r
                  LongName="dapl2-ofa-scmd.dll" Name="D2-scmd.DLL"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r
+          <File Id="_dapl2_ofa_cma.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-ofa-cma.dll" Name="D2-cma.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cma.dll" />\r
+          <CopyFile Id="dupDAPL2_ofa-cma" FileId="_dapl2_ofa_cma.dll"\r
+                    DestinationName="d2-cma.dll"\r
+                    DestinationLongName="dapl2-ofa-cma.dll"\r
+                    DestinationProperty="WindowsFolder" />\r
+          <File Id="_dapl2_ofa_cmad.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-ofa-cmad.dll" Name="D2-cmad.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />\r
           <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
                  LongName="dat2.dll" Name="DAT2.DLL"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />\r

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 4199654962a74aa39c39574b3f066f2880be9f0d..92e4242e06e8ef5a5aad52ac1c298c944af759cc 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -168,6 +168,10 @@ if /I "%OSE%" == "wxp" (
 ) else (\r
     xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq\r
 )\r
+\r
+rem allow XP SRP build & sign, WIX skips SRP for XP\r
+rem otherwise there is too much special casing for SRP on XP.\r
+xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq\r
 \r
@@ -220,7 +224,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul\r
@@ -278,7 +282,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul\r
@@ -338,7 +342,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul\r
@@ -453,7 +457,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set 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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul\r
@@ -523,7 +527,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set 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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul\r
@@ -590,7 +594,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set 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
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul\r