Revision: 2751 Author: stansmith Date: 12:07:55 PM, Thursday, March 18, 2010 Message: [OFED] Win7 is part of the 'default' release build; remove conditionals (simplify).
signed-off-by: stan smith <[email protected]> ---- Modified : /gen1/trunk/OFED/BuildRelease.bat --- a/OFED/BuildRelease.bat Thu Mar 18 12:07:32 2010 +++ b/OFED/BuildRelease.bat Mon Feb 22 14:44:55 2010 @@ -380,9 +380,7 @@ :do_msi_chk rem make sure building a msi has files to work with. -if "%WIN7%" == "yes" ( - if not EXIST "%RBIN_W7%" goto InstallBin -) +if not EXIST "%RBIN_W7%" goto InstallBin if not EXIST "%RBIN_WLH%" goto InstallBin if not EXIST "%RBIN_WNET%" goto InstallBin if not EXIST "%RBIN_WXP%" goto InstallBin @@ -445,31 +443,29 @@ rem ********* Compile for win7 - Windows 7 -if "%WIN7%" == "yes" ( - rem win7 x64 - echo %0 - Build win7 x64 Checked - %COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 - echo %0 - Build win7 x64 Free - %COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 - - rem win7 x86 - echo %0 - Build win7 x86 Checked - %COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 - echo %0 - Build win7 x86 Free - %COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 - - rem win7 ia64 - echo %0 - Build win7 ia64 Checked - %COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 - echo %0 - Build win7 ia64 Free - %COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 win7 %OPS%" - if ERRORLEVEL 1 exit /B 1 -) +rem win7 x64 +echo %0 - Build win7 x64 Checked +%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 +echo %0 - Build win7 x64 Free +%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 + +rem win7 x86 +echo %0 - Build win7 x86 Checked +%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 +echo %0 - Build win7 x86 Free +%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 + +rem win7 ia64 +echo %0 - Build win7 ia64 Checked +%COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 +echo %0 - Build win7 ia64 Free +%COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 win7 %OPS%" +if ERRORLEVEL 1 exit /B 1 rem ********* Compile for WLH - Windows Server 2008 & Vista @@ -548,19 +544,17 @@ if EXIST "%RBIN_WNET%" (rmdir /S /Q %RBIN_WNET% & echo %0 - removed %RBIN_WNET%) if EXIST "%RBIN_WXP%" (rmdir /S /Q %RBIN_WXP% & echo %0 - removed %RBIN_WXP%) -if "%WIN7%" == "yes" mkdir %RBIN_W7% +mkdir %RBIN_W7% mkdir %RBIN_WLH% mkdir %RBIN_WNET% mkdir %RBIN_WXP% if EXIST "%BSE%\etc\makebin.bat" ( - if "%WIN7%" == "yes" ( - call %BSE%\etc\makebin.bat %BSE% %RBIN_W7% win7 %_DDK% %_COIN_VER% - if ERRORLEVEL 1 ( - echo %0: Err in makebin.bat %BSE% %RBIN_W7% wlh %_DDK% %_COIN_VER% - exit /B 1 - ) - ) + call %BSE%\etc\makebin.bat %BSE% %RBIN_W7% win7 %_DDK% %_COIN_VER% + if ERRORLEVEL 1 ( + echo %0: Err in makebin.bat %BSE% %RBIN_W7% wlh %_DDK% %_COIN_VER% + exit /B 1 + ) call %BSE%\etc\makebin.bat %BSE% %RBIN_WLH% wlh %_DDK% %_COIN_VER% if ERRORLEVEL 1 ( echo %0: Err in makebin.bat %BSE% %RBIN_WLH% wlh %_DDK% %_COIN_VER% @@ -583,8 +577,8 @@ :mk_msi echo %0 - Drivers Signed with %CERTFILE% -echo Binary release trees created in -if "%WIN7%" == "yes" echo %RBIN_W7% +echo Binary release trees in +echo %RBIN_W7% echo %RBIN_WLH% echo %RBIN_WNET% echo %RBIN_WXP% _______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
