[WinOF] dapl socket cm name change dapl2-scmd.dll --> dapl2-ofa-scmd.dll

Handle the absence of ND components: be verbose, don't fail.
Skip .cdf file copy.

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

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 19317a564706692ab7b6c4e3cb6ee50ac3e609a3..4199654962a74aa39c39574b3f066f2880be9f0d 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -162,7 +162,12 @@ xcopy %bin_dir%\ipoib.pdb %2\net\x86\ /yq
 xcopy %bin_dir%\qlgcvnic.pdb %2\net\x86\ /yq\r
 xcopy %bin_dir%\ibsrp.pdb %2\storage\x86\ /yq\r
 \r
-xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq\r
+rem Use netipoib.inf without WSD support for XP32\r
+if /I "%OSE%" == "wxp" (\r
+    copy /A /Y %1\ulp\ipoib\kernel\netipoib-xp32.inf %2\net\x86\netipoib.inf\r
+) else (\r
+    xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq\r
+)\r
 xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq\r
 \r
@@ -215,7 +220,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-scmd.dll dapl2-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.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
@@ -273,7 +278,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-scmd.dll dapl2-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.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
@@ -333,7 +338,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-scmd.dll dapl2-scmd.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.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
@@ -419,9 +424,14 @@ for %%i in ( %F% ) do (
 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
-xcopy %bin_dir%\ndinstall.exe %2\net\amd64\ /yq \r
-xcopy %bin_dir%\ndinstall.exe %2\tools\amd64\release\ /yq\r
-xcopy %bin_dir%\ibndprov.dll %2\net\amd64\ /yq\r
+\r
+if exist "%bin_dir%\ndinstall.exe" (\r
+    xcopy %bin_dir%\ndinstall.exe %2\net\amd64\ /yq \r
+    xcopy %bin_dir%\ndinstall.exe %2\tools\amd64\release\ /yq\r
+    xcopy %bin_dir%\ibndprov.dll %2\net\amd64\ /yq\r
+) else (\r
+    echo %0 - missing x64 Network Direct components [ibndprov.dll,ndinstall.exe]\r
+)\r
 \r
 echo xcopy amd64 Free *.exe tools\amd64\release\ \r
 xcopy %bin_dir%\*.exe %2\tools\amd64\release\ /yq 1>nul\r
@@ -443,7 +453,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-scm.dll dapl2-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.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
@@ -490,8 +500,8 @@ for %%i in ( %F% ) do (
 \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
-xcopy %bin_dir%\ibndprov.dll %2\net\ia64\ /yq\r
+rem xcopy %bin_dir%\ndinstall.exe %2\net\ia64\ /yq\r
+rem xcopy %bin_dir%\ibndprov.dll %2\net\ia64\ /yq\r
 \r
 echo xcopy IA64 Free *.exe tools\ia64\release\ \r
 xcopy %bin_dir%\*.exe %2\tools\ia64\release\ /yq 1>nul\r
@@ -513,7 +523,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-scm.dll dapl2-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.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
@@ -580,7 +590,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-scm.dll dapl2-scm.pdb dat2.dll dat2.lib dat2.pdb\r
+set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.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
@@ -590,12 +600,15 @@ 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
+if exist "%bin_dir%\ndinstall.exe" (\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
+) else (\r
+    echo %0 - missing x86 Network Direct components [ibndprov.dll,ndinstall.exe]\r
+)\r
 \r
+if /I "%OSE%" == "wxp" goto mk_sym_bin\r
 rem free x86 items\r
 \r
 if "%DBG%" == "TRUE" echo DBG: copy x86 Free WSD\r
@@ -608,8 +621,10 @@ rem free x86 DLLs --> WOW64 DLLs
 \r
 if "%DBG%" == "TRUE" echo DBG: x86 Free dlls to WOW64\r
 \r
-copy %bin_dir%\ibndprov.dll %2\net\amd64\ibndprov32.dll /y\r
-copy %bin_dir%\ibndprov.dll %2\net\ia64\ibndprov32.dll /y\r
+if exist "%bin_dir%\ibndprov.dll" (\r
+    copy %bin_dir%\ibndprov.dll %2\net\amd64\ibndprov32.dll /y\r
+    copy %bin_dir%\ibndprov.dll %2\net\ia64\ibndprov32.dll /y\r
+)\r
 copy /B %bin_dir%\ibwsd.dll %2\net\amd64\ibwsd32.dll /y\r
 copy /B %bin_dir%\ibwsd.dll %2\net\ia64\ibwsd32.dll /y\r
 \r
@@ -655,64 +670,7 @@ copy /B %bin_dir%\dat2.dll %2\DAPL2\amd64\dat232.dll /y
 copy /B %bin_dir%\dapl2.dll %2\DAPL2\ia64\dapl232.dll /y\r
 copy /B %bin_dir%\dat2.dll %2\DAPL2\ia64\dat232.dll /y\r
 \r
-\r
-rem Copy x86 .cdf files to arch specific dirs for Driver signing\r
-rem .inf files now resident alongside .sys files\r
-\r
-:inf_files\r
-\r
-if "%DBG%" == "TRUE" echo DBG: cpy %OSE% x86 INF files\r
-\r
-copy /A/Y %1\hw\mthca\kernel\mthca32.cdf %2\HCA\x86\mthca.cdf\r
-copy /A/Y %1\hw\mlx4\kernel\hca\mlx4_hca32.cdf %2\HCA\x86\mlx4_hca.cdf\r
-copy /A/Y %1\hw\mlx4\kernel\bus\drv\mlx4_bus32.cdf %2\HCA\x86\mlx4_bus.cdf\r
-copy /A/Y %1\core\iou\kernel\ib_iou.cdf %2\HCA\x86\ib_iou.cdf\r
-rem [future?]copy /A/Y %1\core\winverbs\kernel\winverbs32.cdf %2\HCA\x86\winverbs.cdf\r
-copy /A/Y %1\core\winverbs\kernel\winverbs.cdf %2\HCA\x86\winverbs.cdf\r
-\r
-rem No WSD support for XP32\r
-if /I "%OSE%" == "wxp" (\r
-    copy /A /Y %1\ulp\ipoib\kernel\netipoib-xp32.inf %2\net\x86\netipoib.inf\r
-    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
-)\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
-\r
-if /I "%OSE%" == "wxp" goto cpy_bin_files\r
-\r
-if "%DBG%" == "TRUE" echo DBG: copy 64bit INF files\r
-\r
-xcopy %1\hw\mthca\kernel\mthca.cdf %2\HCA\amd64 /yq\r
-\r
-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
-\r
-xcopy %1\core\iou\kernel\ib_iou.cdf %2\HCA\amd64\ /yq\r
-xcopy %1\core\winverbs\kernel\winverbs.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\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.cdf %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\iou\kernel\ib_iou.cdf %2\HCA\ia64\ /yq\r
-xcopy %1\core\winverbs\kernel\winverbs.cdf %2\HCA\ia64\ /yq\r
-\r
-xcopy %1\hw\mthca\kernel\mthca.cdf %2\HCA\ia64\ /yq\r
-\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\ulp\srp\kernel\ib_srp.cdf %2\storage\ia64\ /yq\r
-\r
-\r
-:cpy_bin_files\r
+:mk_sym_bin\r
 \r
 rem bin\bin used to generate a web based symbol store in build-ofa-dist.bat.\r
 \r
@@ -774,26 +732,31 @@ if exist %1\ulp\dapl\dat\include\dat (
 )\r
 \r
 rem Copy DAT v2.0 header files\r
-if "%DBG%" == "TRUE" echo DBG: DAT v2.0 header files\r
-if exist %1\ulp\dapl2\dat\include\dat (\r
-    pushd %1\ulp\dapl2\dat\include\dat\r
-\r
-    xcopy dat.h %2\DAPL2 /Y/Q  \r
-    xcopy dat_error.h %2\DAPL2 /Y/Q\r
-    xcopy dat_platform_specific.h %2\DAPL2 /Y/Q\r
-    xcopy dat_redirection.h %2\DAPL2 /Y/Q\r
-    xcopy dat_registry.h %2\DAPL2 /Y/Q\r
-    xcopy dat_vendor_specific.h %2\DAPL2 /Y/Q\r
-    xcopy udat.h %2\DAPL2 /Y/Q\r
-    xcopy udat_config.h %2\DAPL2 /Y/Q\r
-    xcopy udat_redirection.h %2\DAPL2 /Y/Q\r
-    xcopy udat_vendor_specific.h %2\DAPL2 /Y/Q\r
-    popd\r
-    pushd %1\ulp\dapl2\test\dapltest\scripts\r
-    xcopy dt-svr.bat %2\DAPL2 /Y/Q\r
-    xcopy dt-cli.bat %2\DAPL2 /Y/Q\r
-    popd\r
-)\r
+\r
+if "%DBG%" == "TRUE" echo DBG: [%OSE%] DAT v2.0 header files\r
+\r
+if exist %1\ulp\dapl2\dat\include\dat (set DATINC=dat) else (set DATINC=dat2)\r
+pushd %1\ulp\dapl2\dat\include\%DATINC%\r
+if ERRORLEVEL 1 (\r
+    echo %0: ERR - missing DAT files @ %1\ulp\dapl2\dat\include\%DATINC%\r
+    exit /B 1\r
+)\r
+xcopy dat.h %2\DAPL2 /Y/Q  \r
+xcopy dat_error.h %2\DAPL2 /Y/Q\r
+xcopy dat_platform_specific.h %2\DAPL2 /Y/Q\r
+xcopy dat_redirection.h %2\DAPL2 /Y/Q\r
+xcopy dat_registry.h %2\DAPL2 /Y/Q\r
+xcopy dat_vendor_specific.h %2\DAPL2 /Y/Q\r
+xcopy udat.h %2\DAPL2 /Y/Q\r
+xcopy udat_config.h %2\DAPL2 /Y/Q\r
+xcopy udat_redirection.h %2\DAPL2 /Y/Q\r
+xcopy udat_vendor_specific.h %2\DAPL2 /Y/Q\r
+popd\r
+\r
+pushd %1\ulp\dapl2\test\dapltest\scripts\r
+xcopy dt-svr.bat %2\DAPL2 /Y/Q\r
+xcopy dt-cli.bat %2\DAPL2 /Y/Q\r
+popd\r
 \r
 rem Copy IBAL header files\r
 if "%DBG%" == "TRUE" echo DBG: IBAL header files\r