From fdc89b7c0709236e24b0711022d6582a30ea73f8 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Sun, 26 Apr 2009 21:31:55 +0000
Subject: [PATCH] [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
---
 trunk/WinOF/WIX/common/checked.inc |  6 +++++-
 trunk/WinOF/WIX/common/dapl_rt.inc | 10 ++++++++++
 trunk/etc/makebin.bat              | 16 ++++++++++------
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/trunk/WinOF/WIX/common/checked.inc b/trunk/WinOF/WIX/common/checked.inc
index acc31c4a..2b1eba5e 100644
--- a/trunk/WinOF/WIX/common/checked.inc
+++ b/trunk/WinOF/WIX/common/checked.inc
@@ -104,7 +104,11 @@
         <Component Id="cCHK_user"
                    Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
           <CreateFolder />
-          <File Id="file83" Name="DAPL2-_1.DLL"
+          <File Id="file82" Name="d2-cmad.dll"
+            LongName="dapl2-ofa-cmad.dll"
+            DiskId="1" Compressed="yes"
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />
+          <File Id="file83" Name="d2-scmd.dll"
             LongName="dapl2-ofa-scmd.dll"
             DiskId="1" Compressed="yes"
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />
diff --git a/trunk/WinOF/WIX/common/dapl_rt.inc b/trunk/WinOF/WIX/common/dapl_rt.inc
index 9137d047..a6ba84be 100644
--- 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"
                  LongName="dapl2-ofa-scmd.dll" Name="D2-scmd.DLL"
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />
+          <File Id="_dapl2_ofa_cma.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2-ofa-cma.dll" Name="D2-cma.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cma.dll" />
+          <CopyFile Id="dupDAPL2_ofa-cma" FileId="_dapl2_ofa_cma.dll"
+                    DestinationName="d2-cma.dll"
+                    DestinationLongName="dapl2-ofa-cma.dll"
+                    DestinationProperty="WindowsFolder" />
+          <File Id="_dapl2_ofa_cmad.dll" Compressed="yes" DiskId="1"
+                 LongName="dapl2-ofa-cmad.dll" Name="D2-cmad.DLL"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />
           <File Id="_dat2.dll" Compressed="yes" DiskId="1"
                  LongName="dat2.dll" Name="DAT2.DLL"
                  Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />
diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 41996549..92e4242e 100644
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -168,6 +168,10 @@ if /I "%OSE%" == "wxp" (
 ) else (
     xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq
 )
+
+rem allow XP SRP build & sign, WIX skips SRP for XP
+rem otherwise there is too much special casing for SRP on XP.
+xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq
 xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq
 xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq
 
@@ -220,7 +224,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul
@@ -278,7 +282,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul
@@ -338,7 +342,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul
@@ -453,7 +457,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul
@@ -523,7 +527,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul
@@ -590,7 +594,7 @@ for %%i in ( %F% ) do (
     )
 )
 
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dat2.dll dat2.lib dat2.pdb
+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
 
 for %%i in ( %F% ) do (
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul
-- 
2.41.0