[OFED] Win7 is part of the 'default' release build; remove conditionals (simplify).

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

diff --git a/trunk/OFED/BuildRelease.bat b/trunk/OFED/BuildRelease.bat
index 65a7d577418d8b9835b8ae010e6dd467732ad374..873af333a31536ab38a50568cc69b61ec6fdef1f 100644 (file)
--- a/trunk/OFED/BuildRelease.bat
+++ b/trunk/OFED/BuildRelease.bat
@@ -380,9 +380,7 @@ goto compile
 :do_msi_chk\r
 \r
 rem make sure building a msi has files to work with.\r
-if "%WIN7%" == "yes" (\r
-       if not EXIST "%RBIN_W7%"  goto InstallBin\r
-)\r
+if not EXIST "%RBIN_W7%"  goto InstallBin\r
 if not EXIST "%RBIN_WLH%"  goto InstallBin\r
 if not EXIST "%RBIN_WNET%" goto InstallBin\r
 if not EXIST "%RBIN_WXP%"  goto InstallBin\r
@@ -445,31 +443,29 @@ if EXIST "%FPATH%" pushd %FPATH%
 \r
 rem ********* Compile for win7 - Windows 7\r
 \r
-if "%WIN7%" == "yes" (\r
-       rem win7 x64\r
-       echo %0 - Build win7 x64 Checked\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-       echo %0 - Build win7 x64 Free\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-\r
-       rem win7 x86\r
-       echo %0 - Build win7 x86 Checked\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-       echo %0 - Build win7 x86 Free\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-\r
-       rem win7 ia64\r
-       echo %0 - Build win7 ia64 Checked\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-       echo %0 - Build win7 ia64 Free\r
-       %COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 win7 %OPS%"\r
-       if ERRORLEVEL 1 exit /B 1\r
-)\r
+rem win7 x64\r
+echo %0 - Build win7 x64 Checked\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
+echo %0 - Build win7 x64 Free\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
+\r
+rem win7 x86\r
+echo %0 - Build win7 x86 Checked\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
+echo %0 - Build win7 x86 Free\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
+\r
+rem win7 ia64\r
+echo %0 - Build win7 ia64 Checked\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
+echo %0 - Build win7 ia64 Free\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 win7 %OPS%"\r
+if ERRORLEVEL 1 exit /B 1\r
 \r
 rem ********* Compile for WLH - Windows Server 2008 & Vista\r
 \r
@@ -548,19 +544,17 @@ if EXIST "%RBIN_WLH%"  (rmdir /S /Q %RBIN_WLH% &  echo %0 - removed %RBIN_WLH%)
 if EXIST "%RBIN_WNET%" (rmdir /S /Q %RBIN_WNET% & echo %0 - removed %RBIN_WNET%)\r
 if EXIST "%RBIN_WXP%"  (rmdir /S /Q %RBIN_WXP% &  echo %0 - removed %RBIN_WXP%)\r
 \r
-if "%WIN7%" == "yes"  mkdir %RBIN_W7%\r
+mkdir %RBIN_W7%\r
 mkdir %RBIN_WLH%\r
 mkdir %RBIN_WNET%\r
 mkdir %RBIN_WXP%\r
 \r
 if EXIST "%BSE%\etc\makebin.bat" (\r
-       if "%WIN7%" == "yes" (\r
-       call %BSE%\etc\makebin.bat %BSE% %RBIN_W7% win7 %_DDK% %_COIN_VER%\r
-       if ERRORLEVEL 1 (\r
-               echo %0: Err in makebin.bat %BSE% %RBIN_W7% wlh %_DDK% %_COIN_VER%\r
-               exit /B 1\r
-       )\r
-    )\r
+   call %BSE%\etc\makebin.bat %BSE% %RBIN_W7% win7 %_DDK% %_COIN_VER%\r
+   if ERRORLEVEL 1 (\r
+               echo %0: Err in makebin.bat %BSE% %RBIN_W7% wlh %_DDK% %_COIN_VER%\r
+               exit /B 1\r
+   )\r
     call %BSE%\etc\makebin.bat %BSE% %RBIN_WLH% wlh %_DDK% %_COIN_VER%\r
     if ERRORLEVEL 1 (\r
         echo %0: Err in makebin.bat %BSE% %RBIN_WLH% wlh %_DDK% %_COIN_VER%\r
@@ -583,8 +577,8 @@ if "%1" == "makebin" goto finito
 :mk_msi\r
 \r
 echo %0 - Drivers Signed with %CERTFILE%\r
-echo   Binary release trees created in\r
-if "%WIN7%" == "yes"  echo     %RBIN_W7%\r
+echo   Binary release trees in\r
+echo     %RBIN_W7%\r
 echo     %RBIN_WLH%\r
 echo     %RBIN_WNET%\r
 echo     %RBIN_WXP%\r