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