[WinOF] makebin.bat - include winmad, ibverbs & script Progress output(echo).

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

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 1f63d5f0cc6f0314fe2b24e2e3a59871d9af351a..1dfaa144bac8ea9231011a4f447e7939710e0e4c 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -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 ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb\r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul\r
     if ERRORLEVEL 1 (\r
@@ -97,7 +97,7 @@ set dest_dir=%2\HCA\ia64\
 \r
 if "%DBG%" == "TRUE" echo DBG: ia64 free drivers\r
 \r
-set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb \r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -128,7 +128,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 ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb\r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -176,7 +176,7 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\amd64\r
-set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb\r
+set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -234,7 +234,7 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\ia64\r
-set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb\r
+set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -294,7 +294,7 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\x86\r
-set F=winverbsd.dll winverbsd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb\r
+set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -390,7 +390,7 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User free to HCA\amd64\r
-set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib libibverbs.pdb\r
+set F=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\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -407,9 +407,19 @@ xcopy %bin_dir%\ndinstall.exe %2\net\amd64\ /yq
 xcopy %bin_dir%\ndinstall.exe %2\tools\amd64\release\ /yq\r
 xcopy %bin_dir%\ibndprov.dll %2\net\amd64\ /yq\r
 \r
-echo xcopy *.exe tools\amd64\release\ \r
+echo xcopy amd64 Free *.exe tools\amd64\release\ \r
 xcopy %bin_dir%\*.exe %2\tools\amd64\release\ /yq 1>nul\r
 \r
+echo xcopy AMD64 [Winverb-apps].pdb tools\amd64\release\ \r
+set G=ibv_asyncwatch.pdb ibv_devinfo.pdb ibv_rc_pingpong.pdb ibv_read_bw.pdb ibv_read_lat.pdb ibv_send_bw.pdb ibv_send_lat.pdb ibv_uc_pingpong.pdb ibv_ud_pingpong.pdb ibv_write_bw.pdb ibv_write_lat.pdb sminfo.pdb ibstat.pdb perfquery.pdb ibaddr.pdb\r
+for %%i in ( %G% ) do (\r
+    xcopy %bin_dir%\%%i %2\tools\amd64\release\ /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %2\tools\amd64\release\ /yq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
 set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
 \r
 for %%i in ( %F% ) do (\r
@@ -455,7 +465,7 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User free to HCA\ia64\r
-set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib libibverbs.pdb\r
+set F=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\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -470,8 +480,17 @@ xcopy %bin_dir%\installsp.exe %2\net\ia64\ /yq
 xcopy %bin_dir%\ndinstall.exe %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ibndprov.dll %2\net\ia64\ /yq\r
 \r
-echo xcopy *.exe tools\ia64\release\ \r
+echo xcopy IA64 Free *.exe tools\ia64\release\ \r
 xcopy %bin_dir%\*.exe %2\tools\ia64\release\ /yq 1>nul\r
+echo xcopy IA64 [Winverb-apps].pdb tools\ia64\release\ \r
+set G=ibv_asyncwatch.pdb ibv_devinfo.pdb ibv_rc_pingpong.pdb ibv_read_bw.pdb ibv_read_lat.pdb ibv_send_bw.pdb ibv_send_lat.pdb ibv_uc_pingpong.pdb ibv_ud_pingpong.pdb ibv_write_bw.pdb ibv_write_lat.pdb sminfo.pdb ibstat.pdb perfquery.pdb ibaddr.pdb\r
+for %%i in ( %G% ) do (\r
+    xcopy %bin_dir%\%%i %2\tools\ia64\release\ /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %2\tools\ia64\release\ /yq\r
+        exit /B 1\r
+    )\r
+)\r
 \r
 set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb \r
 \r
@@ -520,7 +539,7 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User free to HCA\x86\r
-set F=winverbs.dll winverbs.lib libibverbs.dll libibverbs.lib libibverbs.pdb\r
+set F=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\r
 \r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
@@ -532,6 +551,15 @@ for %%i in ( %F% ) do (
 \r
 echo xcopy x86 free *.exe to tools\x86\release\r
 xcopy %bin_dir%\*.exe %2\tools\x86\release\ /yq 1>nul\r
+echo xcopy X86 Free [Winverb-apps].pdb tools\x86\release\ \r
+set G=ibv_asyncwatch.pdb ibv_devinfo.pdb ibv_rc_pingpong.pdb ibv_read_bw.pdb ibv_read_lat.pdb ibv_send_bw.pdb ibv_send_lat.pdb ibv_uc_pingpong.pdb ibv_ud_pingpong.pdb ibv_write_bw.pdb ibv_write_lat.pdb sminfo.pdb ibstat.pdb perfquery.pdb ibaddr.pdb\r
+for %%i in ( %G% ) do (\r
+    xcopy %bin_dir%\%%i %2\tools\x86\release\ /yq 1>nul\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %bin_dir%\%%i %2\tools\x86\release\ /yq\r
+        exit /B 1\r
+    )\r
+)\r
 \r
 set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
 \r
@@ -585,6 +613,9 @@ copy /B %bin_dir%\complib.pdb %2\HCA\amd64\cl32.pdb /y
 copy /B %bin_dir%\winverbs.dll %2\HCA\amd64\winverbs32.dll /y\r
 copy /B %bin_dir%\winverbs.lib %2\HCA\amd64\winverbs32.lib /y\r
 copy /B %bin_dir%\winverbs.pdb %2\HCA\amd64\winverbs32.pdb /y\r
+copy /B %bin_dir%\winmad.dll %2\HCA\amd64\winverbs32.dll /y\r
+copy /B %bin_dir%\winmad.lib %2\HCA\amd64\winverbs32.lib /y\r
+copy /B %bin_dir%\winmad.pdb %2\HCA\amd64\winverbs32.pdb /y\r
 \r
 copy /B %bin_dir%\ibal.dll %2\HCA\ia64\ibal32.dll /y\r
 copy /B %bin_dir%\ibal.lib %2\HCA\ia64\ibal32.lib /y\r
@@ -595,6 +626,9 @@ copy /B %bin_dir%\complib.pdb %2\HCA\ia64\cl32.pdb /y
 copy /B %bin_dir%\winverbs.dll %2\HCA\ia64\winverbs32.dll /y\r
 copy /B %bin_dir%\winverbs.lib %2\HCA\ia64\winverbs32.lib /y\r
 copy /B %bin_dir%\winverbs.pdb %2\HCA\ia64\winverbs32.pdb /y\r
+copy /B %bin_dir%\winmad.dll %2\HCA\ia64\winverbs32.dll /y\r
+copy /B %bin_dir%\winmad.lib %2\HCA\ia64\winverbs32.lib /y\r
+copy /B %bin_dir%\winmad.pdb %2\HCA\ia64\winverbs32.pdb /y\r
 \r
 copy /B %bin_dir%\mthcau.dll %2\HCA\amd64\mthca32.dll /y\r
 copy /B %bin_dir%\mthcau.dll %2\HCA\ia64\mthca32.dll /y\r
@@ -789,6 +823,7 @@ if NOT exist %2\Chk (
     )\r
 )\r
 \r
+echo "Copy Checked drivers {HCA,net,storage} to %2\Chk"\r
 for %%i in ( HCA net storage ) do (\r
     xcopy %2\%%i %2\Chk\%%i\ /S /Y /Q\r
     if ERRORLEVEL 1 (\r
@@ -802,6 +837,7 @@ for /F %%i in ('dir /B/S Chk\*.pdb') do (
   @del /F/Q %%i\r
 )\r
 \r
+echo "Copy Checked drivers {ibbus,mthca,mlx} to %2\Chk\HCA\{amd64,ia64,x86}"\r
 set B=%2\bin\kernel\objchk_%3\r
 \r
 for %%i in ( ibbus mthca ibiou mlx4_hca mlx4_bus ) do (\r
@@ -821,6 +857,7 @@ for %%i in ( ibbus mthca ibiou mlx4_hca mlx4_bus ) do (
 )\r
 \r
 \r
+echo "Copy Checked drivers {ipoib,qlgcvnic} to %2\Chk\net\{amd64,ia64,x86}"\r
 for %%i in ( ipoib qlgcvnic ) do (\r
     if exist %B%_amd64\amd64\%%i.sys (\r
         copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\net\amd64\%%i.sys\r
@@ -836,6 +873,7 @@ for %%i in ( ipoib qlgcvnic ) do (
     )\r
 )\r
 \r
+echo "Copy Checked drivers {ibsrp} to %2\Chk\storage\{amd64,ia64,x86}"\r
 for %%i in ( ibsrp ) do (\r
     if exist %B%_amd64\amd64\%%i.sys (\r
         copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\storage\amd64\%%i.sys\r