From 6083c9acfed6ee3d60b6363c7c25fc2ea9f67312 Mon Sep 17 00:00:00 2001
From: Stan Smith <stan.smith@intel.com>
Date: Thu, 18 Mar 2010 19:07:55 +0000
Subject: [PATCH] [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
---
 trunk/OFED/BuildRelease.bat | 70 +++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/trunk/OFED/BuildRelease.bat b/trunk/OFED/BuildRelease.bat
index 65a7d577..873af333 100644
--- a/trunk/OFED/BuildRelease.bat
+++ b/trunk/OFED/BuildRelease.bat
@@ -380,9 +380,7 @@ goto compile
 :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 @@ if EXIST "%FPATH%" pushd %FPATH%
 
 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_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%)
 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 @@ if "%1" == "makebin" goto finito
 :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%
-- 
2.41.0