From 8d4e282760d4e5ae224cef36aa463bfab3faa9f5 Mon Sep 17 00:00:00 2001 From: stansmith Date: Mon, 23 Nov 2009 20:13:48 +0000 Subject: [PATCH] [DAPL,ETC,WINOF] Remove DAPL 1.2 from WinOF installer: do not copy DAPL 1.2 files in makebin; remove DAPL 1.2 options from DAT config file. git-svn-id: svn://openib.tc.cornell.edu/gen1@2596 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/WinOF/WIX/dat.conf | 7 ---- trunk/etc/makebin.bat | 87 ++-------------------------------------- 2 files changed, 3 insertions(+), 91 deletions(-) diff --git a/trunk/WinOF/WIX/dat.conf b/trunk/WinOF/WIX/dat.conf index b8419f2a..90ef9009 100644 --- a/trunk/WinOF/WIX/dat.conf +++ b/trunk/WinOF/WIX/dat.conf @@ -9,13 +9,6 @@ # \ # # -# DAT v1.1 dapl provider configuration for HCA0 port 1 -ibnic0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" "" -IbalHca0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" "" -# -# DAT 1.1 debug -ibnic0d u1.1 threadsafe default "C:\\Program Files\\WinOF\\dapld.dll" ri.1.1 "IbalHca0 1" "" -# # DAT 2.0 ibnic0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" "" ibnic1v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca1 1" "" diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat index d486fd4a..eaefcff4 100644 --- a/trunk/etc/makebin.bat +++ b/trunk/etc/makebin.bat @@ -5,7 +5,7 @@ rem usage: rem makebin src dst [win7 | wlh | wnet | wxp] DDK_ROOT WdfCoInstaler_Ver rem rem src(%1) - OpenIB src path ...\gen1\trunk -rem dst(%2) - full path tp where binaries are copied, 'bin\' created here. +rem dst(%2) - full path to where binaries are copied, must exist. rem OSE(%3) - (Operating System Environment) which windows version rem {win7,wxp,wlh,wnet} representing {XP, server 2008 & server 2003} rem DDK_ROOT - {blank == assumes %SystemDrive%\WinDDK\6001.1801} @@ -95,10 +95,6 @@ set DAPL2_F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cm set DAPL2_D=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 -set DAPL_F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb - -set DAPL_D=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb - rem rem KERNEL MODE @@ -254,14 +250,6 @@ for %%i in ( %WV_CHK% ) do ( echo xcopy *.exe tools\amd64\debug\ xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /yq 1>nul -for %%i in ( %DAPL_D% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_D% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul if ERRORLEVEL 1 ( @@ -299,14 +287,6 @@ for %%i in ( %WV_CHK% ) do ( echo xcopy *.exe tools\ia64\debug\ xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /yq 1>nul -for %%i in ( %DAPL_D% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_D% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul if ERRORLEVEL 1 ( @@ -346,14 +326,6 @@ for %%i in ( %WV_CHK% ) do ( if "%DBG%" == "TRUE" echo DBG: checked *.exe to tools\x86\debug\ xcopy %bin_dir%\*.exe %2\tools\x86\debug\ /yq 1>nul -for %%i in ( %DAPL_D% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_D% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul if ERRORLEVEL 1 ( @@ -391,11 +363,6 @@ copy /B %bin_dir%\mthcaud.dll %2\HCA\ia64\mthca32d.dll /y copy /B %bin_dir%\mlx4ud.dll %2\HCA\amd64\mlx4u32d.dll /y copy /B %bin_dir%\mlx4ud.dll %2\HCA\ia64\mlx4u32d.dll /y -copy /B %bin_dir%\dapld.dll %2\DAPL\amd64\dapl32d.dll /y -copy /B %bin_dir%\datd.dll %2\DAPL\amd64\dat32d.dll /y -copy /B %bin_dir%\dapld.dll %2\DAPL\ia64\dapl32d.dll /y -copy /B %bin_dir%\datd.dll %2\DAPL\ia64\dat32d.dll /y - copy /B %bin_dir%\dapl2d.dll %2\DAPL2\amd64\dapl232d.dll /y copy /B %bin_dir%\dat2d.dll %2\DAPL2\amd64\dat232d.dll /y copy /B %bin_dir%\dapl2d.dll %2\DAPL2\ia64\dapl232d.dll /y @@ -449,14 +416,6 @@ if ERRORLEVEL 1 ( exit /B 1 ) -for %%i in ( %DAPL_F% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_F% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul if ERRORLEVEL 1 ( @@ -506,14 +465,6 @@ if ERRORLEVEL 1 ( exit /B 1 ) -for %%i in ( %DAPL_F% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_F% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul if ERRORLEVEL 1 ( @@ -560,14 +511,6 @@ if ERRORLEVEL 1 ( exit /B 1 ) -for %%i in ( %DAPL_F% ) do ( - xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq 1>nul - if ERRORLEVEL 1 ( - echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq - exit /B 1 - ) -) - for %%i in ( %DAPL2_F% ) do ( xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul if ERRORLEVEL 1 ( @@ -637,11 +580,6 @@ copy /B %bin_dir%\mthcau.dll %2\HCA\ia64\mthca32.dll /y copy /B %bin_dir%\mlx4u.dll %2\HCA\amd64\mlx4u32.dll /y copy /B %bin_dir%\mlx4u.dll %2\HCA\ia64\mlx4u32.dll /y -copy /B %bin_dir%\dapl.dll %2\DAPL\amd64\dapl32.dll /y -copy /B %bin_dir%\dat.dll %2\DAPL\amd64\dat32.dll /y -copy /B %bin_dir%\dapl.dll %2\DAPL\ia64\dapl32.dll /y -copy /B %bin_dir%\dat.dll %2\DAPL\ia64\dat32.dll /y - copy /B %bin_dir%\dapl2.dll %2\DAPL2\amd64\dapl232.dll /y copy /B %bin_dir%\dat2.dll %2\DAPL2\amd64\dat232.dll /y copy /B %bin_dir%\dapl2.dll %2\DAPL2\ia64\dapl232.dll /y @@ -690,26 +628,7 @@ rem del /s bin\*.lib > nul rem del /s bin\*.exp > nul rem popd -rem Copy DAT v1.1 header files -if "%DBG%" == "TRUE" echo DBG: DAT v1.1 header files -if exist %1\ulp\dapl\dat\include\dat ( - pushd %1\ulp\dapl\dat\include\dat - - xcopy dat.h %2\DAPL /Y/Q - xcopy dat_error.h %2\DAPL /Y/Q - xcopy dat_platform_specific.h %2\DAPL /Y/Q - xcopy dat_redirection.h %2\DAPL /Y/Q - xcopy dat_registry.h %2\DAPL /Y/Q - xcopy dat_vendor_specific.h %2\DAPL /Y/Q - xcopy udat.h %2\DAPL /Y/Q - xcopy udat_config.h %2\DAPL /Y/Q - xcopy udat_redirection.h %2\DAPL /Y/Q - xcopy udat_vendor_specific.h %2\DAPL /Y/Q - popd -) - rem Copy DAT v2.0 header files - 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) @@ -894,8 +813,8 @@ goto end echo %1\bin\user\objchk_%OSE%_x86\i386 missing :end -echo . +echo. echo Finished OS %3 -echo . +echo. endlocal -- 2.41.0