[WinOF] buildrelease no longer contains uglt hack to work around XP32 WSD build problems.

Added a 2nd cmd line arg to set OPENIB_REV value when building installers. Fix eliminates folder structure dependency, making the script more useful to a wider audience.

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

diff --git a/BuildRelease.bat b/BuildRelease.bat
index 5dd10f6..320f52a 100644 (file)
--- a/BuildRelease.bat
+++ b/BuildRelease.bat
@@ -7,7 +7,7 @@ rem           Processor architecture specific WIX installers are constructed
 rem           in %IDIR%\r
 rem\r
 rem BuildRelease option\r
-rem  option == all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean\r
+rem  option == all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean {OPENIB_REV}\r
 rem\r
 \r
 rem This script is an 'example' of a one-command entire IB stack build to\r
@@ -34,7 +34,7 @@ echo Unknown arg '%1' ?
 \r
 :usage\r
 \r
-echo "usage: BuildRelease { all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean}"\r
+echo "usage: BuildRelease all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean {OPENIB_REV value}"\r
 echo where:\r
 echo    all - force recompile, install binaries to WIX tree, sign drivers and\r
 echo          build installers.\r
@@ -49,6 +49,10 @@ echo    msi - assumes binaries are installed in WIX tree, signs drivers and
 echo          create installers (.msi files) in IDIR.\r
 echo    wix - build .msi installers, assumes (drivers signed) .cat files exist\r
 echo    clean - remove build artifacts for a clean build: .obj, .sys, ...\r
+echo :\r
+echo    {OPENIB_REV}\r
+echo       optional, if set then OPENIB_REV is assigned this value.\r
+echo           example: BuildRelease all 1414\r
 \r
 exit /B 1 \r
 \r
@@ -104,13 +108,18 @@ echo %0 - Building with WDK @ %_DDK%
 rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)\r
 set _PSDK=C:\progra~1\mi2578~1\r
 \r
-rem WARNING - SVN set depends on the path '\openIB-windows-svn\xxx\gen1', where SVN is set to XXX\r
-rem  substring[23rd...26th] chars (offset counting) == xxxx\r
+rem setup value for OPENIB_REV assignment.\r
 \r
-rem If this example method doesn't fit your environment, set SVN accordingly.\r
-rem Note - OPENIB_REV is assigned SVN in a child script.\r
+if not "%2" == "" (\r
+    set SVN=%2\r
+) else (\r
+    rem WARNING - SVN value depends on the path '\openIB-windows-svn\XXX\gen1',\r
+    rem where SVN is set to XXX\r
+    rem  substring[23rd...26th] chars (offset counting) == xxxx\r
+    rem Note - OPENIB_REV is assigned SVN in a child script.\r
 \r
-set SVN=%CD:~22,4%\r
+    set SVN=%CD:~22,4%\r
+)\r
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
 set BSE=%CD%\r
@@ -222,10 +231,6 @@ if ERRORLEVEL 1 exit /B 1
 \r
 rem ********* WXP - Windows XP - x86 only\r
 \r
-rem Fix XP WSD/installsp.exe build problems\r
-\r
-if exist .\ulp\wsd\dirs                  rename .\ulp\wsd\dirs Xdirs\r
-if exist .\tools\wsdinstall\dirs  rename .\tools\wsdinstall\dirs Xdirs\r
 echo %0 - Build XP x86 Checked\r
 %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_x86.bat %SVN% %CD% %_DDK% %_PSDK% WXP & build %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
@@ -234,11 +239,6 @@ echo %0 - Build XP x86 Free
 %COMSPEC% /C "call %BSE%\etc\IB_FRE_BLD_x86.bat %SVN% %CD% %_DDK% %_PSDK% WXP & build %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
-rem restore WSD/installsp builds\r
-if exist .\ulp\wsd\Xdirs           rename .\ulp\wsd\Xdirs dirs  \r
-if exist .\tools\wsdinstall\Xdirs  rename .\tools\wsdinstall\Xdirs dirs\r
-\r
-\r
 \r
 rem ********* WNET - Windows Server 2003\r
 echo %0 - Build WNET x64 Checked\r