[WinOF,ETC] When building with latest WDK, turn off OACR (Auto-Code-Review) as it...

Remove extra 'call' when invoking bldwo.bat from buildrelease.bat.

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

diff --git a/WinOF/BuildRelease.bat b/WinOF/BuildRelease.bat
index d599dd9..8d61c9d 100644 (file)
--- a/WinOF/BuildRelease.bat
+++ b/WinOF/BuildRelease.bat
@@ -427,26 +427,26 @@ rem ********* Compile for win7 - Windows 7
 if "%WIN7%" == "yes" (\r
        rem win7 x64\r
        echo %0 - Build win7 x64 Checked\r
-       %COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x64 win7 %OPS%"\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 "call %BSE%\etc\bldwo.bat fre x64 win7 %OPS%"\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 "call %BSE%\etc\bldwo.bat chk x86 win7 %OPS%"\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 "call %BSE%\etc\bldwo.bat fre x86 win7 %OPS%"\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 "call %BSE%\etc\bldwo.bat chk ia64 win7 %OPS%"\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 "call %BSE%\etc\bldwo.bat fre ia64 win7 %OPS%"\r
+       %COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 win7 %OPS%"\r
        if ERRORLEVEL 1 exit /B 1\r
 )\r
 \r
@@ -454,58 +454,58 @@ rem ********* Compile for WLH - Windows Server 2008 & Vista
 \r
 rem WLH x64\r
 echo %0 - Build WLH x64 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x64 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WLH x64 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre x64 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 rem WLH x86\r
 echo %0 - Build WLH x86 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x86 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WLH x86 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre x86 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 rem WLH ia64\r
 echo %0 - Build WLH ia64 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk ia64 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WLH ia64 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre ia64 2008 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 2008 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 rem ********* WXP - Windows XP - x86 only\r
 \r
 echo %0 - Build XP x86 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x86 xp %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 xp %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build XP x86 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre x86 xp %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 xp %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 rem ********* WNET - Windows Server 2003\r
 \r
 echo %0 - Build WNET x64 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x64 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x64 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WNET x64 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre x64 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x64 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 echo %0 - Build WNET x86 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk x86 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk x86 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WNET x86 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre x86 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre x86 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 echo %0 - Build WNET ia64 Checked\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat chk ia64 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat chk ia64 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 echo %0 - Build WNET ia64 Free\r
-%COMSPEC% /C "call %BSE%\etc\bldwo.bat fre ia64 2003 %OPS%"\r
+%COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
 rem compf | allf\r
@@ -569,7 +569,7 @@ echo     %RBIN_WXP%
 \r
 rem build WIX installers --> see WinOF\WIX\r
 \r
-%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %MSI_CMD% %CERTFILE% %SW_PUBLISHER% %IDIR%"\r
+%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET no_oacr & cd /D %WIX% & build-all-MSI %MSI_CMD% %CERTFILE% %SW_PUBLISHER% %IDIR%"\r
 \r
 :finito\r
 \r

diff --git a/etc/bldwo.bat b/etc/bldwo.bat
index 3896e9e..ba5cf1b 100644 (file)
--- a/etc/bldwo.bat
+++ b/etc/bldwo.bat
@@ -63,7 +63,7 @@ goto loop
 :do_build\r
 set DDKBUILDENV=\r
 pushd .\r
-call %WDK_PATH%\bin\setenv.bat %WDK_PATH%\ %wo_bld% %wo_arch% %wo_os%\r
+call %WDK_PATH%\bin\setenv.bat %WDK_PATH%\ %wo_bld% %wo_arch% %wo_os% no_oacr\r
 popd\r
 build %wo_bld_opt%\r
 goto end\r