[ofw] buildrelase.bat cleanup

Stan C. Smith stan.smith at intel.com
Fri Jul 18 16:45:29 PDT 2008


Remove ugly workaround to skip XP32 WSD build.
Added a 2nd cmd line arg to set OPENIB_REV instead of depending on folder naming convention.

Signed-off by (Stan Smith) stan.smith at intel.com 

diff C3 Temp/BuildRelease.bat-revBASE.svn001.tmp.bat SVN/gen1/trunk/BuildRelease.bat
*** Temp/BuildRelease.bat-revBASE.svn001.tmp.bat	Fri Jul 18 16:21:22 2008
--- SVN/gen1/trunk/BuildRelease.bat	Fri Jul 18 16:22:22 2008
***************
*** 7,13 ****
  rem           in %IDIR%
  rem
  rem BuildRelease option
! rem  option == all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean
  rem
  
  rem This script is an 'example' of a one-command entire IB stack build to
--- 7,13 ----
  rem           in %IDIR%
  rem
  rem BuildRelease option
! rem  option == all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean {OPENIB_REV}
  rem
  
  rem This script is an 'example' of a one-command entire IB stack build to
***************
*** 34,40 ****
  
  :usage
  
! echo "usage: BuildRelease { all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean}"
  echo where:
  echo    all - force recompile, install binaries to WIX tree, sign drivers and
  echo          build installers.
--- 34,40 ----
  
  :usage
  
! echo "usage: BuildRelease all | allnoforce | compile | compilenoforce | makebin | msi | wix | clean {OPENIB_REV
value}"
  echo where:
  echo    all - force recompile, install binaries to WIX tree, sign drivers and
  echo          build installers.
***************
*** 49,54 ****
--- 49,58 ----
  echo          create installers (.msi files) in IDIR.
  echo    wix - build .msi installers, assumes (drivers signed) .cat files exist
  echo    clean - remove build artifacts for a clean build: .obj, .sys, ...
+ echo :
+ echo    {OPENIB_REV}
+ echo       optional, if set then OPENIB_REV is assigned this value.
+ echo		example: BuildRelease all 1414
  
  exit /B 1 
  
***************
*** 104,116 ****
  rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)
  set _PSDK=C:\progra~1\mi2578~1
  
! rem WARNING - SVN set depends on the path '\openIB-windows-svn\xxx\gen1', where SVN is set to XXX
! rem  substring[23rd...26th] chars (offset counting) == xxxx
  
! rem If this example method doesn't fit your environment, set SVN accordingly.
! rem Note - OPENIB_REV is assigned SVN in a child script.
  
! set SVN=%CD:~22,4%
  
  rem assumes %CD% == '...\gen1\trunk'
  set BSE=%CD%
--- 108,125 ----
  rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)
  set _PSDK=C:\progra~1\mi2578~1
  
! rem setup value for OPENIB_REV assignment.
  
! if not "%2" == "" (
!     set SVN=%2
! ) else (
!     rem WARNING - SVN value depends on the path '\openIB-windows-svn\XXX\gen1',
!     rem where SVN is set to XXX
!     rem  substring[23rd...26th] chars (offset counting) == xxxx
!     rem Note - OPENIB_REV is assigned SVN in a child script.
  
!     set SVN=%CD:~22,4%
! )
  
  rem assumes %CD% == '...\gen1\trunk'
  set BSE=%CD%
***************
*** 222,231 ****
  
  rem ********* WXP - Windows XP - x86 only
  
- rem Fix XP WSD/installsp.exe build problems
- 
- if exist .\ulp\wsd\dirs		  rename .\ulp\wsd\dirs Xdirs
- if exist .\tools\wsdinstall\dirs  rename .\tools\wsdinstall\dirs Xdirs
  echo %0 - Build XP x86 Checked
  %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_x86.bat %SVN% %CD% %_DDK% %_PSDK% WXP & build %OPS%"
  if ERRORLEVEL 1 exit /B 1
--- 231,236 ----
***************
*** 233,243 ****
  echo %0 - Build XP x86 Free
  %COMSPEC% /C "call %BSE%\etc\IB_FRE_BLD_x86.bat %SVN% %CD% %_DDK% %_PSDK% WXP & build %OPS%"
  if ERRORLEVEL 1 exit /B 1
- 
- rem restore WSD/installsp builds
- if exist .\ulp\wsd\Xdirs           rename .\ulp\wsd\Xdirs dirs  
- if exist .\tools\wsdinstall\Xdirs  rename .\tools\wsdinstall\Xdirs dirs
- 
  
  
  rem ********* WNET - Windows Server 2003
--- 238,243 ----




More information about the ofw mailing list