[WinOF] support ND on all architectures. Setup Winverbs files for WIX install.

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

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index ee97848467c68b60ab48fb6726789a19bc6003de..4a57a7cdb28f67d21943e267d4c6e46c19d64a2b 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -1,7 +1,7 @@
 @echo off\r
 setlocal\r
 \r
-rem usage: makebin src dst [wlh,wnet,wxp]\r
+rem usage: makebin src dst [wlh | wnet | wxp]\r
 rem\r
 rem  src - OpenIB src path ...\gen1\trunk\r
 rem  dst - full path tp where binaries are copied, 'bin\' created here.\r
@@ -69,7 +69,7 @@ set dest_dir=%2\HCA\amd64\
 \r
 if "%DBG%" == "TRUE" echo DBG: AMD64 free drivers\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf \r
+set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul\r
     if ERRORLEVEL 1 (\r
@@ -77,7 +77,6 @@ for %%i in ( %F% ) do (
         exit /B 1\r
     )\r
 )\r
-\r
 xcopy %WdfCoInstaller%\amd64\WdfCoInstaller01007.dll %dest_dir% /yq \r
 \r
 xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq\r
@@ -94,7 +93,9 @@ set dest_dir=%2\HCA\ia64\
 \r
 if "%DBG%" == "TRUE" echo DBG: ia64 free drivers\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf\r
+rem add mlx4_hca.inf & mlx4_bus.inf when Connectx on ia64 works.\r
+\r
+set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf winverbs.sys winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -102,6 +103,7 @@ for %%i in ( %F% ) do (
         exit /B 1\r
     )\r
 )\r
+xcopy %WdfCoInstaller%\ia64\WdfCoInstaller01007.dll %dest_dir% /yq \r
 \r
 xcopy %bin_dir%\ipoib.sys %2\net\ia64\ /yq\r
 xcopy %bin_dir%\qlgcvnic.sys %2\net\ia64\ /yq\r
@@ -120,7 +122,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 free drivers
 set bin_dir=%1\bin\kernel\objfre_%OSE%_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf \r
+set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -128,7 +130,6 @@ for %%i in ( %F% ) do (
         exit /B 1\r
     )\r
 )\r
-\r
 xcopy %WdfCoInstaller%\x86\WdfCoInstaller01007.dll %dest_dir% /yq\r
 \r
 xcopy %bin_dir%\ipoib.sys %2\net\x86\ /yq\r
@@ -163,6 +164,17 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
     )\r
 )\r
 \r
+echo xcopy winverbs: User checked to HCA\amd64\r
+set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
 echo xcopy *.exe tools\amd64\debug\\r
 xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /yq 1>nul\r
 \r
@@ -210,6 +222,17 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
     )\r
 )\r
 \r
+echo xcopy winverbs: User checked to HCA\ia64\r
+set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
 echo xcopy *.exe tools\ia64\debug\ \r
 xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /yq 1>nul\r
 \r
@@ -259,7 +282,18 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
     )\r
 )\r
 \r
-if "%DBG%" == "TRUE"  echo DBG: copy debug *.exe to tools\x86\debug\ \r
+echo xcopy winverbs: User checked to HCA\x86\r
+set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+if "%DBG%" == "TRUE"  echo DBG: checked *.exe to tools\x86\debug\ \r
 xcopy %bin_dir%\*.exe %2\tools\x86\debug\ /yq 1>nul\r
 \r
 set F=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb\r
@@ -344,6 +378,17 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
     )\r
 )\r
 \r
+echo xcopy winverbs: User free to HCA\amd64\r
+set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
 xcopy %bin_dir%\ibwsd.dll %2\net\amd64\ /yq\r
 xcopy %bin_dir%\installsp.exe %2\net\amd64\ /yq \r
 xcopy %bin_dir%\installsp.exe %2\tools\amd64\release\ /yq\r
@@ -398,6 +443,17 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
     )\r
 )\r
 \r
+echo xcopy winverbs: User free to HCA\ia64\r
+set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
 xcopy %bin_dir%\ibwsd.dll %2\net\ia64\ /yq\r
 xcopy %bin_dir%\installsp.exe %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ndinstall.exe %2\net\ia64\ /yq\r
@@ -452,7 +508,18 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
     )\r
 )\r
 \r
-echo xcopy *.exe tools\x86\release\\r
+echo xcopy winverbs: User free to HCA\x86\r
+set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib\r
+\r
+for %%i in ( %F% ) do (\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+echo xcopy x86 free *.exe to tools\x86\release\r
 xcopy %bin_dir%\*.exe %2\tools\x86\release\ /yq 1>nul\r
 \r
 set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
@@ -475,6 +542,9 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
+copy %bin_dir%\ndinstall.exe %2\net\x86\ /y\r
+copy %bin_dir%\ndinstall.exe %2\tools\x86\release\ /y\r
+copy %bin_dir%\ibndprov.dll %2\net\x86\ /y\r
 \r
 if /I "%OSE%" == "wxp" goto inf_files\r
 \r
@@ -485,9 +555,6 @@ if "%DBG%" == "TRUE" echo DBG: copy x86 Free WSD
 copy %bin_dir%\ibwsd.dll %2\net\x86\ /y\r
 copy %bin_dir%\installsp.exe %2\net\x86\ /y\r
 copy %bin_dir%\installsp.exe %2\tools\x86\release\ /y\r
-copy %bin_dir%\ndinstall.exe %2\net\x86\ /y\r
-copy %bin_dir%\ndinstall.exe %2\tools\x86\release\ /y\r
-copy %bin_dir%\ibndprov.dll %2\net\x86\ /y\r
 \r
 rem free x86 DLLs --> WOW64 DLLs\r
 \r
@@ -546,7 +613,6 @@ if /I "%OSE%" == "wxp" (
     copy /A /Y %1\ulp\ipoib\kernel\ipoib32-xp.cdf %2\net\x86\ipoib.cdf\r
 ) else (\r
     copy /A/Y %1\ulp\ipoib\kernel\ipoib32.cdf %2\net\x86\ipoib.cdf\r
-    xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\x86\ /yq\r
 )\r
 xcopy %1\ulp\qlgcvnic\kernel\netvnic.cdf %2\net\x86\ /yq\r
 xcopy %1\ulp\srp\kernel\ib_srp.cdf %2\storage\x86\ /yq\r
@@ -560,21 +626,18 @@ xcopy %1\hw\mthca\kernel\mthca.cdf %2\HCA\amd64 /yq
 xcopy %1\hw\mlx4\kernel\hca\mlx4_hca.cdf %2\HCA\amd64\ /yq\r
 xcopy %1\hw\mlx4\kernel\hca\mlx4_hca32.cdf %2\HCA\amd64\ /yq\r
 xcopy %1\hw\mlx4\kernel\bus\drv\mlx4_bus.cdf %2\HCA\amd64\ /yq\r
-xcopy %1\hw\mlx4\kernel\bus\drv\mlx4_bus32.cdf %2\HCA\amd64\ /yq\r
+\r
 \r
 xcopy %1\core\bus\kernel\ib_bus.cdf %2\HCA\amd64\ /yq\r
 xcopy %1\core\iou\kernel\ib_iou.cdf %2\HCA\amd64\ /yq\r
 \r
 xcopy %1\ulp\ipoib\kernel\ipoib.cdf %2\net\amd64\ /yq\r
 xcopy %1\ulp\qlgcvnic\kernel\netvnic.cdf %2\net\amd64\ /yq\r
-xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\amd64\ /yq\r
 xcopy %1\ulp\srp\kernel\ib_srp.cdf %2\storage\amd64\ /yq\r
 \r
 \r
 rem When ConnectX works for ia64\r
-rem xcopy %1\hw\mlx4\kernel\hca\mlx4_hca.inf %2\HCA\ia64\ /yq\r
 rem xcopy %1\hw\mlx4\kernel\hca\mlx4_hca.cdf %2\HCA\ia64\ /yq\r
-rem xcopy %1\hw\mlx4\kernel\bus\drv\mlx4_bus.inf %2\HCA\ia64\ /yq\r
 rem xcopy %1\hw\mlx4\kernel\bus\drv\mlx4_bus.cdf %2\HCA\ia64\ /yq\r
 \r
 xcopy %1\core\bus\kernel\ib_bus.cdf %2\HCA\ia64\ /yq\r
@@ -583,7 +646,6 @@ xcopy %1\hw\mthca\kernel\mthca.cdf %2\HCA\ia64\ /yq
 \r
 xcopy %1\ulp\ipoib\kernel\ipoib.cdf %2\net\ia64\ /yq\r
 xcopy %1\ulp\qlgcvnic\kernel\netvnic.cdf %2\net\ia64\ /yq\r
-xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\ia64\ /yq\r
 xcopy %1\ulp\srp\kernel\ib_srp.cdf %2\storage\ia64\ /yq\r
 \r
 \r