From 5b8c59e19e3c7d157a2dbd229b5d81e0c14069ec Mon Sep 17 00:00:00 2001 From: Stan Smith Date: Mon, 1 Feb 2010 18:13:47 +0000 Subject: [PATCH] [OFED] switch references to WinOF -- >OFED. Support target-OS & target-arch in build scripts & etc\clean-build.bat. Migrate WIX package definitions from ofed.wxs files to new file common\Package.inc (easier maintenance). DAT.conf,dt-cli.bat,dt-svr.bat: WinOF --> OFED as binaries are now installed into %ProgramFiles%\OFED\ . git-svn-id: svn://openib.tc.cornell.edu/gen1@2694 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/OFED/BuildRelease.bat | 21 ++-- trunk/OFED/WIX/build-OFA-dist.bat | 35 +++---- trunk/OFED/WIX/build-all-MSI.bat | 98 ++++++++++++++----- trunk/OFED/WIX/common/Config.inc | 8 +- trunk/OFED/WIX/common/Makefile.inc | 2 +- trunk/OFED/WIX/common/Package.inc | 14 +++ trunk/OFED/WIX/common/arp.inc | 2 +- trunk/OFED/WIX/dat.conf | 6 +- trunk/OFED/WIX/win7/build-MSI.bat | 66 ++++++------- trunk/OFED/WIX/win7/ia64/Makefile | 2 +- trunk/OFED/WIX/win7/ia64/ofed.wxs | 21 ++-- trunk/OFED/WIX/win7/x64/Makefile | 2 +- trunk/OFED/WIX/win7/x64/ofed.wxs | 19 ++-- trunk/OFED/WIX/win7/x86/Makefile | 2 +- trunk/OFED/WIX/win7/x86/ofed.wxs | 19 ++-- trunk/OFED/WIX/wlh/build-MSI.bat | 66 ++++++------- trunk/OFED/WIX/wlh/ia64/Makefile | 2 +- trunk/OFED/WIX/wlh/ia64/ofed.wxs | 21 ++-- trunk/OFED/WIX/wlh/x64/Makefile | 2 +- trunk/OFED/WIX/wlh/x64/ofed.wxs | 19 ++-- trunk/OFED/WIX/wlh/x86/Makefile | 2 +- trunk/OFED/WIX/wlh/x86/ofed.wxs | 19 ++-- trunk/OFED/WIX/wnet/build-MSI.bat | 69 +++++++------ trunk/OFED/WIX/wnet/ia64/Makefile | 2 +- trunk/OFED/WIX/wnet/ia64/ofed.wxs | 21 ++-- trunk/OFED/WIX/wnet/x64/Makefile | 2 +- trunk/OFED/WIX/wnet/x64/ofed.wxs | 19 ++-- trunk/OFED/WIX/wnet/x86/Makefile | 2 +- trunk/OFED/WIX/wnet/x86/ofed.wxs | 19 ++-- trunk/OFED/WIX/wxp/build-MSI.bat | 73 +++++++------- trunk/OFED/WIX/wxp/x86/Makefile | 2 +- trunk/OFED/WIX/wxp/x86/ofed.wxs | 19 ++-- trunk/OFED/WIX/zip-OFA-dist.bat | 34 +++---- trunk/etc/clean-build.bat | 78 ++++++++++++--- trunk/etc/makebin.bat | 2 +- .../dapl2/test/dapltest/scripts/dt-cli.bat | 2 +- .../dapl2/test/dapltest/scripts/dt-svr.bat | 2 +- 37 files changed, 414 insertions(+), 380 deletions(-) create mode 100644 trunk/OFED/WIX/common/Package.inc diff --git a/trunk/OFED/BuildRelease.bat b/trunk/OFED/BuildRelease.bat index 9c57a198..65a7d577 100644 --- a/trunk/OFED/BuildRelease.bat +++ b/trunk/OFED/BuildRelease.bat @@ -5,7 +5,7 @@ rem tabstop=4 rem version: 2.1.0 rem EXAMPLE - Build entire openIB-windows release & WIX installers (.msi) files. -rem Binary release is constructed in WinOF\Wix\OS\bin. +rem Binary release is constructed in OFED\Wix\OS\bin. rem Processor architecture specific WIX installers are constructed rem in %IDIR% rem @@ -15,18 +15,20 @@ rem compf path | compnf path | makebin | msi |sign | wix | clean | rem msi-label | msi-del | msi-dir {OPENIB_REV} rem This script is an 'example' of a one-command entire IB stack build to -rem single-file installer; used to build a WinOF releases. +rem single-file installer; used to build a OFED releases. rem Script is designed to be invoked from the \gen1\trunk folder with -rem \gen1\trunk\WinOF\Wix\* present. +rem \gen1\trunk\OFED\Wix\* present. rem rem Verify the following env vars are suitible for your system configuration. -rem _DDK, _PSDK, SVN, IDIR +rem _DDK, _PSDK, SVN, IDIR, CERTFILE, SW_PUBLISHER rem 'nf path' command variants are required due to a bug in the WDK build env. rem ipoib\ & ipoib_ndis6_cm\ both build ipoib.sys just for different OS rem versions. The problem arises when a compile is forced on one folder or the rem other, all instances of ipoib.sys are deleted +rem WIX Installer files (.msi) destination folder - set for local environment. +set IDIR=%SystemRoot%\temp if "%1" == "" goto usage if "%1" == "/?" goto usage @@ -111,7 +113,7 @@ if not "%WDM_INC_PATH%" == "" ( rem assumes %CD% == '<...>\gen1\trunk' set BSE=%CD% -set WIX=%CD%\WinOF\WIX +set WIX=%CD%\OFED\WIX rem Setup Wix 3.0 items @@ -262,9 +264,6 @@ if NOT EXIST "%WIX%\build-all-MSI.bat" ( exit /B 1 ) -rem WIX Installer files (.msi) destination folder - set for local environment. -set IDIR=%SystemRoot%\temp - if "%1" == "msi-label" ( pushd %IDIR% if exist WOF_wxp_x86.msi ( @@ -346,7 +345,7 @@ if NOT EXIST "%IDIR%" ( rem Verify WIX toolset is available - if not, download from rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109 -rem <...>\WinOF\WIX\WIX_tools\ +rem <...>\OFED\WIX\WIX_tools\ rem if NOT EXIST %WIX%\WIX_tools\%WIX_BIN% ( echo %0 - Missing WIX tools @ %WIX%\WIX_tools\%WIX_BIN% @@ -542,7 +541,7 @@ rem Install binaries into WIX environment, build msi installers. :InstallBin -echo Create binary release tree - suitible for WinOF-WIX installer build. +echo Create binary release tree - suitible for OFED-WIX installer build. if EXIST "%RBIN_W7%" (rmdir /S /Q %RBIN_W7% & echo %0 - removed %RBIN_W7%) if EXIST "%RBIN_WLH%" (rmdir /S /Q %RBIN_WLH% & echo %0 - removed %RBIN_WLH%) @@ -590,7 +589,7 @@ echo %RBIN_WLH% echo %RBIN_WNET% echo %RBIN_WXP% -rem build WIX installers --> see WinOF\WIX +rem build WIX installers --> see OFED\WIX %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%" diff --git a/trunk/OFED/WIX/build-OFA-dist.bat b/trunk/OFED/WIX/build-OFA-dist.bat index 0f22eec8..b3e2e28c 100644 --- a/trunk/OFED/WIX/build-OFA-dist.bat +++ b/trunk/OFED/WIX/build-OFA-dist.bat @@ -3,10 +3,11 @@ setlocal rem TabStop=4 -rem Mfg. a ZIP file of a WinOF distribution, such that the zip file can be -rem pushed to the OFA WinOF download site and unzipped for distribution. +rem Create a ZIP file of an OFED distribution, such that the zip file can be +rem pushed to the OFA OFED for windows download site and unzipped for +rem distribution. -rem populate arch specific distribution folders, zip'em, populate symbols +rem Populate arch specific distribution folders, zip'em, populate symbols rem folder and zip the entire package for transmission to OFA download website. rem calls .\zip-OFA-dist.bat script. @@ -14,7 +15,7 @@ rem Operating assumptions: rem 1) current arch specific installers are in %systemroot%\temp\*.msi rem resultant from trunk\buildrelease.bat execution. rem -rem ASSUMES %CD% == gen1\branches\WinOF\Wix +rem ASSUMES %CD% == gen1\trunk\OFED\Wix rem rem build-OFA-dist release_ID {target_path} rem @@ -39,7 +40,7 @@ if "%1" == "" ( set ID=%1 rem Final zip archive name -set ZIP=WinOF_dist_v%ID%.zip +set ZIP=OFED_dist_v%ID%.zip rem where gen1\trunk\buildRelease.bat created the .msi installer files. set MSI=%SystemRoot%\temp @@ -78,7 +79,7 @@ if "!OSF!" == "" ( echo "Missing components?" echo "Must execute from gen1\trunk\WinOF\WIX -- and --" echo " .\win7,wnet,wxp,wlh\bin\ must be populated." - echo " run gen1\trunk\WinOF\BuildRelease.bat -or- gen1\trunk\etc\makebin" + echo " run gen1\trunk\OFED\BuildRelease.bat -or- gen1\trunk\etc\makebin" exit /B 1 ) @@ -94,9 +95,9 @@ FOR %%s IN ( !OSF! ) DO ( exit /B 1 ) - set DSTx86=WinOF_%ID%_%%s_x86 - set DSTx64=WinOF_%ID%_%%s_x64 - set DSTia64=WinOF_%ID%_%%s_ia64 + set DSTx86=OFED_%ID%_%%s_x86 + set DSTx64=OFED_%ID%_%%s_x64 + set DSTia64=OFED_%ID%_%%s_ia64 echo Building target !DSTx86! @@ -151,23 +152,23 @@ FOR %%s IN ( !OSF! ) DO ( echo Copying installers for %%s - copy /B /Y %MSI%\WOF_%%s_x86.msi !DSTx86!\WinOF_%ID%_%%s_x86.msi + copy /B /Y %MSI%\OFED_%%s_x86.msi !DSTx86!\OFED_%ID%_%%s_x86.msi if ERRORLEVEL 1 ( - echo Err - unable to copy %MSI%\WOF_%%s_x86.msi + echo Err - unable to copy %MSI%\OFED_%%s_x86.msi exit /B 1 ) if not "%%s" == "wxp" ( - copy /B /Y %MSI%\WOF_%%s_x64.msi !DSTx64!\WinOF_%ID%_%%s_x64.msi + copy /B /Y %MSI%\OFED_%%s_x64.msi !DSTx64!\OFED_%ID%_%%s_x64.msi if ERRORLEVEL 1 ( - echo Err - unable to copy %MSI%\WOF_%%s_x64.msi + echo Err - unable to copy %MSI%\OFED_%%s_x64.msi exit /B 1 ) - copy /B /Y %MSI%\WOF_%%s_ia64.msi !DSTia64!\WinOF_%ID%_%%s_ia64.msi + copy /B /Y %MSI%\OFED_%%s_ia64.msi !DSTia64!\OFED_%ID%_%%s_ia64.msi if ERRORLEVEL 1 ( - echo Err - unable to copy %MSI%\WOF_%%s_ia64.msi + echo Err - unable to copy %MSI%\OFED_%%s_ia64.msi exit /B 1 ) ) @@ -216,7 +217,7 @@ FOR %%s IN ( !OSF! ) DO ( rem create a ZIP file of the entire distribution -echo WinOF v%ID% distribution @ %ZIP% +echo OFED v%ID% distribution @ %ZIP% pushd %MSI% @@ -238,7 +239,7 @@ popd echo ----- echo ----- -echo WinOF v%ID% distribution @ %MSI%\%ZIP% +echo OFED v%ID% distribution @ %MSI%\%ZIP% echo ----- endlocal diff --git a/trunk/OFED/WIX/build-all-MSI.bat b/trunk/OFED/WIX/build-all-MSI.bat index e20293fe..135d211f 100644 --- a/trunk/OFED/WIX/build-all-MSI.bat +++ b/trunk/OFED/WIX/build-all-MSI.bat @@ -1,23 +1,24 @@ @echo off setlocal -rem Build WIX installers (.msi) for 'all' architectures & Operating environments +rem Build WIX installers (.msi) rem rem usage: -rem %0 cmd Cross-CertFileName SPCSubjectName {msi-dest-path} -rem cmd - if 'msi' then assume drivers already signed, only sign .msi +rem %0 cmd CrossCert SW_PUB msi-dest {OS ARCH} +rem cmd - if 'msi' then assume drivers already signed, only sign .msi rem otherwise sign all drivers and installers (.msi files) - -rem Cross-CertFilename is a filename only, must prefix '...\WIX' before -rem passing it down. -rem SW_PUB - Software Publisher name in 'MY' Cert Store, see signtool /n switch +rem CrossCert - a Cross Certificate filename only +rem SW_PUB - Software Publisher name in 'MY' Cert Store, see signtool /n switch +rem msi-dest - full path to folder where .msi files are written. +rem OS - target Windows OS: all,wxp, wlh, win7, wnet +rem ARCH - target architecture: all,x86,x64,ia64 rem *** REQUIRES nmake, common invocation from Visual C or WDK command window rem *** Assumes current folder is WIX\ -set USE=usage %0 all/msi Certificate-FileName SW_Publisher[see signtool /n] {msi-dest-path} +set USE=usage build-all-msi all/msi CrossCert-Fname SW_Publisher[see signtool /n] msi-path {target-OS[all,wxp,wnet,wlh,win7] target-arch[all,x86,x64,ia64]} if "%1" == "" ( - echo %0: %USE% + echo %USE% exit /B 1 ) @@ -48,11 +49,55 @@ if %3 == "" ( exit /B 1 ) -if "%4" == "" ( - set DST=%windir%\temp -) else ( - set DST=%4 +if "%4" == "" (set DST=%windir%\temp) else (set DST=%4) + +if "%5" == "" ( +:all_os + rem Type-Of-OperatingSystem + set TOS=win7 wlh wnet wxp + rem Selection + set OSarg=all + goto OK_OS +) +if "%5" == "all" goto all_os + +if "%5" == "win7" goto os_valid +if "%5" == "wlh" goto os_valid +if "%5" == "wnet" goto os_valid +if "%5" == "wxp" goto os_valid +echo %0 - Bad OS '%5'?, abort. +exit /B 1 + +:os_valid + +set TOS=%5 +set OSarg=%5 + +:OK_OS + +if "%6" == "" ( +:all_arch + set TARCH=x86 x64 ia64 + set ARCHarg=all + goto OK_arch ) +if "%6" == "all" goto all_arch + +if "%6" == "x86" goto OK_valid +if "%6" == "x64" goto OK_valid +if "%6" == "ia64" goto OK_valid +echo %0 - BAD arch '%6'? +exit /B 1 + +:OK_valid + +set TARCH=%6 +set ARCHarg=%6 + +:OK_arch + +echo. +echo Building installers for %TOS% %TARCH% if NOT EXIST %DST% ( echo %0: Installer output path %DST% not found? @@ -68,9 +113,9 @@ del /Q /F %DST%\jnk.txt if "%1" == "msi" goto mk_msi -rem Sign drivers for all OSes & arches. Convert CertFilename to full path. +rem Sign drivers for specified OSes & arches. Convert CertFilename to full path. -call sign-all-drivers %CD%\%2 %3 +call sign-all-drivers %CD%\%2 %3 %OSarg% %ARCHarg% if ERRORLEVEL 1 ( echo %0: Error signing drivers? @@ -90,13 +135,15 @@ rem Vista/Server 2008 rem Server 2003/XP64 rem Windows XP (32-bit) version: x86 only -for %%o in ( win7 wlh wnet wxp ) do ( +echo %0 - Building .msi files + +for %%o in ( %TOS% ) do ( if Not exist %%o\bin\HCA ( echo Missing %%o files? exit /B 1 ) pushd %%o - call build-MSI %DST% + call build-MSI %DST% %ARCHarg% if ERRORLEVEL 1 exit /B 1 popd ) @@ -105,19 +152,18 @@ rem Digitally Sign the installer .msi files set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll echo %0 - Signing Installer .msi files -for %%o in ( win7 wlh wnet wxp ) do ( - for %%a in ( x86 x64 ia64 ) do ( - if exist %DST%\WOF_%%o_%%a.msi ( - - echo Signing installer %DST%\WOF_%%o_%%a.msi - signtool sign /ac %CD%\%2 /n %3 %TS% %DST%\WOF_%%o_%%a.msi +for %%o in ( %TOS% ) do ( + for %%a in ( %TARCH% ) do ( + if exist %DST%\OFED_%%o_%%a.msi ( + echo Signing installer %DST%\OFED_%%o_%%a.msi + signtool sign /ac %CD%\%2 /n %3 %TS% %DST%\OFED_%%o_%%a.msi if ERRORLEVEL 1 ( - echo %0 signtool sign %DST%\WOF_%%o_%%a.msi failed? + echo %0 signtool sign %DST%\OFED_%%o_%%a.msi failed? exit /B 1 ) - signtool verify /pa %DST%\WOF_%%o_%%a.msi + signtool verify /pa %DST%\OFED_%%o_%%a.msi if ERRORLEVEL 1 ( - echo %0 signtool verify %DST%\WOF_%%o_%%a.msi failed? + echo %0 signtool verify %DST%\OFED_%%o_%%a.msi failed? exit /B 1 ) ) diff --git a/trunk/OFED/WIX/common/Config.inc b/trunk/OFED/WIX/common/Config.inc index d71aad09..1b7db20f 100644 --- a/trunk/OFED/WIX/common/Config.inc +++ b/trunk/OFED/WIX/common/Config.inc @@ -1,11 +1,15 @@ - + - + + + + + diff --git a/trunk/OFED/WIX/common/Makefile.inc b/trunk/OFED/WIX/common/Makefile.inc index 8a35b0b1..ad38413d 100644 --- a/trunk/OFED/WIX/common/Makefile.inc +++ b/trunk/OFED/WIX/common/Makefile.inc @@ -5,7 +5,7 @@ # # S == WIX src & obj filename: .wxs & .wixobj # A == arch {x86,ia64,x64} -# P == Installer (.msi) filename +# P == Installer (.msi) 'complete' filename # optional: DFXP == Path to DifxApp files setup in makebin.bat !ifndef DFXP diff --git a/trunk/OFED/WIX/common/Package.inc b/trunk/OFED/WIX/common/Package.inc new file mode 100644 index 00000000..d6ce88fe --- /dev/null +++ b/trunk/OFED/WIX/common/Package.inc @@ -0,0 +1,14 @@ + + + + + + + diff --git a/trunk/OFED/WIX/common/arp.inc b/trunk/OFED/WIX/common/arp.inc index 761bbf65..e2284ce0 100644 --- a/trunk/OFED/WIX/common/arp.inc +++ b/trunk/OFED/WIX/common/arp.inc @@ -6,7 +6,7 @@ 1 1 --> - OpenFabrics Windows InfiniBand + $(var.PRODUCT) Openfabrics Alliance www.OpenFabrics.org https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ diff --git a/trunk/OFED/WIX/dat.conf b/trunk/OFED/WIX/dat.conf index 90ef9009..b1598783 100644 --- a/trunk/OFED/WIX/dat.conf +++ b/trunk/OFED/WIX/dat.conf @@ -15,18 +15,18 @@ ibnic1v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca1 1" "" IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" "" # # DAT 2.0 (debug) -ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" "" +ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2d.dll" ri.2.0 "IbalHca0 1" "" # # DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket # connection; supports DAT Windows <==> Linux over IB connections. ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" "" # # Socket-CM (debug) -ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" "" +ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" "" # # DAT 2.0 RDMA-CM # connection; supports DAT Windows <==> Linux over IB connections. ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" "" # # DAT 2.0 RDMA-CM (debug) -ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" "" +ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" "" diff --git a/trunk/OFED/WIX/win7/build-MSI.bat b/trunk/OFED/WIX/win7/build-MSI.bat index 90e4f033..d339002f 100644 --- a/trunk/OFED/WIX/win7/build-MSI.bat +++ b/trunk/OFED/WIX/win7/build-MSI.bat @@ -1,8 +1,8 @@ @echo off setlocal -rem Build Windows 7 WIX installer (.msi) for all architectures +rem Build WIX installer (.msi) for specified architecture(s) rem -rem usage: %0 {dest-path-for-msi-files} +rem usage: %0 {dest-path-for-msi-files Arch} rem *** REQUIRES nmake, common invocation from Visual C or DDK command window @@ -13,51 +13,45 @@ if "%1" == "" ( ) else ( set DST=%1 ) +if "%2" == "" ( +:all_arch + set ARCH=ia64 x64 x86 + goto OK_arch +) +if "%2" == "all" goto all_arch +set ARCH=%2 + +:OK_arch + if NOT EXIST %DST% ( echo %0: Installer output path %DST% not found? - exit /B + exit /B 1 ) nmake /NOLOGO /? > %DST%\jnk.txt if ERRORLEVEL 1 ( echo %0 missing nmake.exe in PATH? - exit /B + exit /B 1 ) del /Q /F %DST%\jnk.txt -if NOT EXIST %CD%\bin\HCA\amd64 ( - echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat - exit /B +for %%a in ( %ARCH% ) do ( + if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a) + if NOT EXIST %CD%\bin\HCA\!HWN! ( + echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort. + exit /B 1 + ) + if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi + pushd %%a + nmake /NOLOGO full + if ERRORLEVEL 1 ( + echo %0 - Error building OFED_%OS%_%%a.msi ? + exit /B 1 + ) + echo move /Y OFED_%OS%_%%a.msi %DST% + move /Y OFED_%OS%_%%a.msi %DST% + popd ) -if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi -if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi -if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi - -if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi -if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi -if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi - -pushd ia64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_ia64.msi %DST% -move /Y WOF_%OS%_ia64.msi %DST% -popd - -pushd x64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x64.msi %DST% -move /Y WOF_%OS%_x64.msi %DST% -popd - -pushd x86 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x86.msi %DST% -move /Y WOF_%OS%_x86.msi %DST% -popd - rem if run from top-level %1 will not be null, otherwise assume run from rem cmd line. if "%1" == "" dir %DST%\*.msi diff --git a/trunk/OFED/WIX/win7/ia64/Makefile b/trunk/OFED/WIX/win7/ia64/Makefile index 9ac46508..22e32575 100644 --- a/trunk/OFED/WIX/win7/ia64/Makefile +++ b/trunk/OFED/WIX/win7/ia64/Makefile @@ -1,7 +1,7 @@ ################### # IA64/IPF Itanium makefile targets # -S=WOF +S=OFED A=ia64 P=$(S)_win7_$(A) diff --git a/trunk/OFED/WIX/win7/ia64/ofed.wxs b/trunk/OFED/WIX/win7/ia64/ofed.wxs index d0a293e1..53770eba 100644 --- a/trunk/OFED/WIX/win7/ia64/ofed.wxs +++ b/trunk/OFED/WIX/win7/ia64/ofed.wxs @@ -1,34 +1,27 @@ - + + Manufacturer="OpenFabrics Alliance"> - + - Privileged + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/win7/x64/Makefile b/trunk/OFED/WIX/win7/x64/Makefile index 7492739b..0d3dab9a 100644 --- a/trunk/OFED/WIX/win7/x64/Makefile +++ b/trunk/OFED/WIX/win7/x64/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x64 P=$(S)_win7_$(A) diff --git a/trunk/OFED/WIX/win7/x64/ofed.wxs b/trunk/OFED/WIX/win7/x64/ofed.wxs index 86a24c74..5190ceb4 100644 --- a/trunk/OFED/WIX/win7/x64/ofed.wxs +++ b/trunk/OFED/WIX/win7/x64/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/win7/x86/Makefile b/trunk/OFED/WIX/win7/x86/Makefile index aa4a02bf..305d23ae 100644 --- a/trunk/OFED/WIX/win7/x86/Makefile +++ b/trunk/OFED/WIX/win7/x86/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x86 P=$(S)_win7_$(A) diff --git a/trunk/OFED/WIX/win7/x86/ofed.wxs b/trunk/OFED/WIX/win7/x86/ofed.wxs index 5f66c7c0..87880ee3 100644 --- a/trunk/OFED/WIX/win7/x86/ofed.wxs +++ b/trunk/OFED/WIX/win7/x86/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -47,7 +40,7 @@ - + diff --git a/trunk/OFED/WIX/wlh/build-MSI.bat b/trunk/OFED/WIX/wlh/build-MSI.bat index d197c55b..5074593c 100644 --- a/trunk/OFED/WIX/wlh/build-MSI.bat +++ b/trunk/OFED/WIX/wlh/build-MSI.bat @@ -1,8 +1,8 @@ @echo off setlocal -rem Build WNET WIX installer (.msi) for all architectures +rem Build WIX installer (.msi) for specified architecture(s) rem -rem usage: %0 {dest-path-for-msi-files} +rem usage: %0 {dest-path-for-msi-files Proc-Arch} rem *** REQUIRES nmake, common invocation from Visual C or DDK command window @@ -13,51 +13,45 @@ if "%1" == "" ( ) else ( set DST=%1 ) +if "%2" == "" ( +:all_arch + set ARCH=ia64 x64 x86 + goto OK_arch +) +if "%2" == "all" goto all_arch +set ARCH=%2 + +:OK_arch + if NOT EXIST %DST% ( echo %0: Installer output path %DST% not found? - exit /B + exit /B 1 ) nmake /NOLOGO /? > %DST%\jnk.txt if ERRORLEVEL 1 ( echo %0 missing nmake.exe in PATH? - exit /B + exit /B 1 ) del /Q /F %DST%\jnk.txt -if NOT EXIST %CD%\bin\HCA\amd64 ( - echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat - exit /B +for %%a in ( %ARCH% ) do ( + if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a) + if NOT EXIST %CD%\bin\HCA\!HWN! ( + echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort. + exit /B 1 + ) + if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi + pushd %%a + nmake /NOLOGO full + if ERRORLEVEL 1 ( + echo %0 - Error building OFED_%OS%_%%a.msi ? + exit /B 1 + ) + echo move /Y OFED_%OS%_%%a.msi %DST% + move /Y OFED_%OS%_%%a.msi %DST% + popd ) -if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi -if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi -if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi - -if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi -if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi -if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi - -pushd ia64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_ia64.msi %DST% -move /Y WOF_%OS%_ia64.msi %DST% -popd - -pushd x64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x64.msi %DST% -move /Y WOF_%OS%_x64.msi %DST% -popd - -pushd x86 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x86.msi %DST% -move /Y WOF_%OS%_x86.msi %DST% -popd - rem if run from top-level %1 will not be null, otherwise assume run from rem cmd line. if "%1" == "" dir %DST%\*.msi diff --git a/trunk/OFED/WIX/wlh/ia64/Makefile b/trunk/OFED/WIX/wlh/ia64/Makefile index 5a6abd45..e3e7f49e 100644 --- a/trunk/OFED/WIX/wlh/ia64/Makefile +++ b/trunk/OFED/WIX/wlh/ia64/Makefile @@ -1,7 +1,7 @@ ################### # IA64/IPF Itanium makefile targets # -S=WOF +S=OFED A=ia64 P=$(S)_wlh_$(A) diff --git a/trunk/OFED/WIX/wlh/ia64/ofed.wxs b/trunk/OFED/WIX/wlh/ia64/ofed.wxs index bd779bfa..a4b5e9fa 100644 --- a/trunk/OFED/WIX/wlh/ia64/ofed.wxs +++ b/trunk/OFED/WIX/wlh/ia64/ofed.wxs @@ -1,34 +1,27 @@ - + + Manufacturer="OpenFabrics Alliance"> - + - Privileged + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/wlh/x64/Makefile b/trunk/OFED/WIX/wlh/x64/Makefile index ccf5df3d..b5cd0119 100644 --- a/trunk/OFED/WIX/wlh/x64/Makefile +++ b/trunk/OFED/WIX/wlh/x64/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x64 P=$(S)_wlh_$(A) diff --git a/trunk/OFED/WIX/wlh/x64/ofed.wxs b/trunk/OFED/WIX/wlh/x64/ofed.wxs index 9c6a86f9..c8a1e55a 100644 --- a/trunk/OFED/WIX/wlh/x64/ofed.wxs +++ b/trunk/OFED/WIX/wlh/x64/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/wlh/x86/Makefile b/trunk/OFED/WIX/wlh/x86/Makefile index 3eaaa897..cf361195 100644 --- a/trunk/OFED/WIX/wlh/x86/Makefile +++ b/trunk/OFED/WIX/wlh/x86/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x86 P=$(S)_wlh_$(A) diff --git a/trunk/OFED/WIX/wlh/x86/ofed.wxs b/trunk/OFED/WIX/wlh/x86/ofed.wxs index 7df1aca4..f9cd2a52 100644 --- a/trunk/OFED/WIX/wlh/x86/ofed.wxs +++ b/trunk/OFED/WIX/wlh/x86/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -47,7 +40,7 @@ - + diff --git a/trunk/OFED/WIX/wnet/build-MSI.bat b/trunk/OFED/WIX/wnet/build-MSI.bat index 8025c2ca..b675662c 100644 --- a/trunk/OFED/WIX/wnet/build-MSI.bat +++ b/trunk/OFED/WIX/wnet/build-MSI.bat @@ -1,8 +1,8 @@ @echo off setlocal -rem Build WNET WIX installer (.msi) for all architectures +rem Build WIX installer (.msi) for specified architecture(s) rem -rem usage: %0 {dest-path-for-msi-files} +rem usage: %0 {dest-path-for-msi-files Proc-Arch} rem *** REQUIRES nmake, common invocation from Visual C or DDK command window @@ -13,51 +13,48 @@ if "%1" == "" ( ) else ( set DST=%1 ) +if "%2" == "" ( +:all_arch + set ARCH=ia64 x64 x86 + goto OK_arch +) +if "%2" == "all" goto all_arch +set ARCH=%2 + +:OK_arch + if NOT EXIST %DST% ( echo %0: Installer output path %DST% not found? - exit /B + exit /B 1 ) nmake /NOLOGO /? > %DST%\jnk.txt if ERRORLEVEL 1 ( echo %0 missing nmake.exe in PATH? - exit /B + exit /B 1 ) del /Q /F %DST%\jnk.txt -if NOT EXIST %CD%\bin\HCA\amd64 ( - echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat - exit /B +for %%a in ( %ARCH% ) do ( + if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a) + if NOT EXIST %CD%\bin\HCA\!HWN! ( + echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort. + exit /B 1 + ) + if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi + pushd %%a + nmake /NOLOGO full + if ERRORLEVEL 1 ( + echo %0 - Error building OFED_%OS%_%%a.msi ? + exit /B 1 + ) + echo move /Y OFED_%OS%_%%a.msi %DST% + move /Y OFED_%OS%_%%a.msi %DST% + popd ) - -if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi -if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi -if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi - -if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi -if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi -if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi - -pushd ia64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_ia64.msi %DST% -move /Y WOF_%OS%_ia64.msi %DST% -popd -pushd x64 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x64.msi %DST% -move /Y WOF_%OS%_x64.msi %DST% -popd -pushd x86 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x86.msi %DST% -move /Y WOF_%OS%_x86.msi %DST% -popd - -if "%1" == "" dir %DST%\*.msi +rem if run from top-level %1 will not be null, otherwise assume run from +rem cmd line. +if "%1" == "" dir %DST%\*.msi echo ---- echo Done - %OS% WIX installers in %DST% diff --git a/trunk/OFED/WIX/wnet/ia64/Makefile b/trunk/OFED/WIX/wnet/ia64/Makefile index d62d6964..c364c793 100644 --- a/trunk/OFED/WIX/wnet/ia64/Makefile +++ b/trunk/OFED/WIX/wnet/ia64/Makefile @@ -1,7 +1,7 @@ ################### # IA64/IPF Itanium makefile targets # -S=WOF +S=OFED A=ia64 P=$(S)_wnet_$(A) diff --git a/trunk/OFED/WIX/wnet/ia64/ofed.wxs b/trunk/OFED/WIX/wnet/ia64/ofed.wxs index 083a163a..7df5f13c 100644 --- a/trunk/OFED/WIX/wnet/ia64/ofed.wxs +++ b/trunk/OFED/WIX/wnet/ia64/ofed.wxs @@ -1,34 +1,27 @@ - + + Manufacturer="OpenFabrics Alliance"> - + - Privileged + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/wnet/x64/Makefile b/trunk/OFED/WIX/wnet/x64/Makefile index a8537c70..a7c28192 100644 --- a/trunk/OFED/WIX/wnet/x64/Makefile +++ b/trunk/OFED/WIX/wnet/x64/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x64 P=$(S)_wnet_$(A) diff --git a/trunk/OFED/WIX/wnet/x64/ofed.wxs b/trunk/OFED/WIX/wnet/x64/ofed.wxs index 7c322c66..c0de7c8c 100644 --- a/trunk/OFED/WIX/wnet/x64/ofed.wxs +++ b/trunk/OFED/WIX/wnet/x64/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -51,7 +44,7 @@ - + diff --git a/trunk/OFED/WIX/wnet/x86/Makefile b/trunk/OFED/WIX/wnet/x86/Makefile index 4048411b..aa206da7 100644 --- a/trunk/OFED/WIX/wnet/x86/Makefile +++ b/trunk/OFED/WIX/wnet/x86/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x86 P=$(S)_wnet_$(A) diff --git a/trunk/OFED/WIX/wnet/x86/ofed.wxs b/trunk/OFED/WIX/wnet/x86/ofed.wxs index f0234731..81b5069d 100644 --- a/trunk/OFED/WIX/wnet/x86/ofed.wxs +++ b/trunk/OFED/WIX/wnet/x86/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -47,7 +40,7 @@ - + diff --git a/trunk/OFED/WIX/wxp/build-MSI.bat b/trunk/OFED/WIX/wxp/build-MSI.bat index 04096c06..81f026a9 100644 --- a/trunk/OFED/WIX/wxp/build-MSI.bat +++ b/trunk/OFED/WIX/wxp/build-MSI.bat @@ -1,8 +1,8 @@ @echo off setlocal -rem Build WNET WIX installer (.msi) for all architectures +rem Build WIX installer (.msi) for specified architecture(s) rem -rem usage: %0 {dest-path-for-msi-files} +rem usage: %0 {dest-path-for-msi-files Proc-Arch} rem *** REQUIRES nmake, common invocation from Visual C or DDK command window @@ -13,52 +13,51 @@ if "%1" == "" ( ) else ( set DST=%1 ) +if "%2" == "" ( + set ARCH=x86 + goto OK_arch +) +if "%2" == "all" ( + set ARCH=x86 +) else ( + if not "%2" == "x86" ( + echo %0 - x86 only! + exit /B 1 + ) + set ARCH=%2 +) +:OK_arch + if NOT EXIST %DST% ( echo %0: Installer output path %DST% not found? - exit /B + exit /B 1 ) nmake /NOLOGO /? > %DST%\jnk.txt if ERRORLEVEL 1 ( echo %0 missing nmake.exe in PATH? - exit /B + exit /B 1 ) del /Q /F %DST%\jnk.txt -if NOT EXIST %CD%\bin\HCA\x86 ( - echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat - exit /B +for %%a in ( %ARCH% ) do ( + if NOT EXIST %CD%\bin\HCA\%%a ( + echo %0 - %CD%\bin\HCA\%%a not populated correctly?, abort. + exit /B 1 + ) + if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi + pushd %%a + nmake /NOLOGO full + if ERRORLEVEL 1 ( + echo %0 - Error building OFED_%OS%_%%a.msi ? + exit /B 1 + ) + echo move /Y OFED_%OS%_%%a.msi %DST% + move /Y OFED_%OS%_%%a.msi %DST% + popd ) - -rem if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi -rem if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi -if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi - -rem if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi -rem if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi -if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi - -rem pushd ia64 -rem nmake /NOLOGO full -rem if ERRORLEVEL 1 exit /B -rem echo move /Y WOF_%OS%_ia64.msi %DST% -rem move /Y WOF_%OS%_ia64.msi %DST% -rem popd - -rem pushd x64 -rem nmake /NOLOGO full -rem if ERRORLEVEL 1 exit /B -rem echo move /Y WOF_%OS%_x64.msi %DST% -rem move /Y WOF_%OS%_x64.msi %DST% -rem popd - -pushd x86 -nmake /NOLOGO full -if ERRORLEVEL 1 exit /B -echo move /Y WOF_%OS%_x86.msi %DST% -move /Y WOF_%OS%_x86.msi %DST% -popd - +rem if run from top-level %1 will not be null, otherwise assume run from +rem cmd line. if "%1" == "" dir %DST%\*.msi echo ---- diff --git a/trunk/OFED/WIX/wxp/x86/Makefile b/trunk/OFED/WIX/wxp/x86/Makefile index 5230e6ca..b23e7cde 100644 --- a/trunk/OFED/WIX/wxp/x86/Makefile +++ b/trunk/OFED/WIX/wxp/x86/Makefile @@ -1,7 +1,7 @@ ################### # makefile targets # -S=WOF +S=OFED A=x86 P=$(S)_wxp_$(A) diff --git a/trunk/OFED/WIX/wxp/x86/ofed.wxs b/trunk/OFED/WIX/wxp/x86/ofed.wxs index 0f653418..ccd9d0ff 100644 --- a/trunk/OFED/WIX/wxp/x86/ofed.wxs +++ b/trunk/OFED/WIX/wxp/x86/ofed.wxs @@ -1,31 +1,24 @@ - + + Manufacturer="OpenFabrics Alliance"> - + Privileged @@ -47,7 +40,7 @@ - + diff --git a/trunk/OFED/WIX/zip-OFA-dist.bat b/trunk/OFED/WIX/zip-OFA-dist.bat index 4096b26b..ad5862a0 100644 --- a/trunk/OFED/WIX/zip-OFA-dist.bat +++ b/trunk/OFED/WIX/zip-OFA-dist.bat @@ -3,11 +3,11 @@ setlocal rem rem ****WARNING - this script is 'generally' invoked by 'build-OFA-dist.bat' rem -rem Construct & populate an OFA-WinOF distribution tree to be used at -rem the OFA-WinOF download site. -rem http://www.openfabrics.org/downloads/WinOF/ +rem Construct & populate an OFA-OFED distribution tree to be used at +rem the OFA-OFED download site. +rem http://www.openfabrics.org/downloads/OFED/ rem -rem ASSUMES %CD% gen1\branches\WinOF\Wix +rem ASSUMES %CD% gen1\branches\OFED\Wix rem rem zip-OFA-dist release_ID OSname {target_path} rem @@ -31,11 +31,11 @@ if not "%3" == "" ( rem where gen1\trunk\buildRelease.bat created the .msi installer files. set MSI=%SystemRoot%\temp -rem MUST execute from gen1\branches\WinOF\WIX +rem MUST execute from gen1\branches\OFED\WIX set RBIN=%CD%\%2\bin if NOT EXIST %RBIN%\bin ( - echo Must execute from gen1\branches\WinOF\WIX -- and -- + echo Must execute from gen1\branches\OFED\WIX -- and -- echo .\bin\ must be populated - run gen1\trunk\buildRelease.bat exit /B 1 ) @@ -54,22 +54,22 @@ rem constructed. set WIXLAND=%CD% -if not EXIST WinOF_%RID%_%2_x86.zip ( - echo %0 - missing WinOF arch package: WinOF_%RID%_%2_x86.zip +if not EXIST OFED_%RID%_%2_x86.zip ( + echo %0 - missing OFED arch package: OFED_%RID%_%2_x86.zip exit /B 1 ) if not "%2" = "wxp" ( - if not EXIST WinOF_%RID%_%2_x64.zip ( - echo %0 - missing WinOF zip package: WinOF_%RID%_%2_x64.zip + if not EXIST OFED_%RID%_%2_x64.zip ( + echo %0 - missing WinOF zip package: OFED_%RID%_%2_x64.zip exit /B 1 ) - if not EXIST WinOF_%RID%_%2_ia64.zip ( - echo %0 - missing WinOF arch package: WinOF_%RID%_%2_ia64.zip + if not EXIST OFED_%RID%_%2_ia64.zip ( + echo %0 - missing OFED arch package: OFED_%RID%_%2_ia64.zip exit /B 1 ) ) -echo "Creating WinOF downloadable distribution in" +echo "Creating OFED downloadable distribution in" echo " %DST%" echo " from binaries in" echo " %RBIN%" @@ -93,7 +93,7 @@ mkdir %DST%\Installers echo Generating Symbol store -%PGM% add /r /f %RBIN% /s %SS% /t "WinOF" /v "version %RID%" +%PGM% add /r /f %RBIN% /s %SS% /t "OFED" /v "version %RID%" if ERRORLEVEL 1 ( echo symstore.exe failure rc %ERRORLEVEL% exit /B 1 @@ -101,10 +101,10 @@ if ERRORLEVEL 1 ( echo Generating arch releases -copy WinOF_%RID%_%2_x86.zip %DST%\Installers +copy OFED_%RID%_%2_x86.zip %DST%\Installers if not "%2" = "wxp" ( - copy WinOF_%RID%_%2_x64.zip %DST%\Installers - copy WinOF_%RID%_%2_ia64.zip %DST%\Installers + copy OFED_%RID%_%2_x64.zip %DST%\Installers + copy OFED_%RID%_%2_ia64.zip %DST%\Installers ) echo "%0 - Results in %DST%" diff --git a/trunk/etc/clean-build.bat b/trunk/etc/clean-build.bat index 608daa10..b9a8454d 100644 --- a/trunk/etc/clean-build.bat +++ b/trunk/etc/clean-build.bat @@ -1,10 +1,66 @@ @echo off setlocal -rem usage: clean-build {scan-only} -rem no args - remove build specific folders & files: +rem usage: clean-build {Target-OS} {target-Arch} {scan-only} +rem no args - remove build specific folders and files: rem *_win7_* *_wxp_* *_wnet_* *_wlh_* -rem arg1 != "" - then report matched folders & files - no delete. +rem arg1 == Target OS name: win7 | wxp | wnet | wlh | all +rem arg2 == Target Arch: x86 | x64 | ia64 | all +rem arg3 != "" - then report matched folders & files - no delete. + +set ALLOS=_win7_ _wlh_ _wnet_ _wxp_ +set ALLARCH=x86 amd64 ia64 + +if "%1" == "/?" ( +:usage + echo usage: + echo clean-build {OS:win7,wlh,wnet,wxp,all} {arch:x86,x64,ia64,all} {scan-only} + echo no args - remove all OS build specific folders and files: *_OS_* + echo otherwise 'win7 x86' only removes files * folders matching '*_win7_x86' + echo arg3 != "" - then report matched folders and files - no delete. + exit /B 0 +) + +if "%1" == "" ( + set TOS=%ALLOS% + goto OK_OS +) +if "%1" == "all" ( + set TOS=%ALLOS% +) else ( + if "%1" == "win7" goto set_OS + if "%1" == "wlh" goto set_OS + if "%1" == "wnet" goto set_OS + if "%1" == "wxp" goto set_OS + echo %0 - BAD OS specification '%1'? + goto usage +rem set Target OS +:set_OS + set TOS=_%1_ +) +:OK_OS + +if "%2" == "" ( +:all_arch + set TARCH= + goto OK_ARCH +) +if "%2" == "all" goto all_arch + +if "%2" == "x64" ( + set TARCH=amd64 + goto OK_ARCH +) +if "%2" == "x86" goto set_ARCH +if "%2" == "ia64" goto set_ARCH +echo %0 - BAD Arch specification '%2'? +goto usage + +rem set Target OS +:set_ARCH + set TARCH=%2 + +:OK_ARCH set T=%TEMP%\flist.txt @@ -18,15 +74,15 @@ rem in for loop file read return 'c:\svn\trunk\ulp\ipoib', bad juju. rem check/remove directories -for %%d in ( _win7_ _wlh_ _wnet_ _wxp_ ) do ( - echo Folder Scan for *%%d* - dir /B /S /A:D *%%d* > %T% 2>&1 +for %%d in ( %TOS% ) do ( + echo Folder Scan for *%%d%TARCH%* + dir /B /S /A:D *%%d%TARCH%* > %T% 2>&1 if ERRORLEVEL 1 ( del /Q/F %T% ) else ( for /f "delims=," %%f in ( %T% ) do ( if EXIST "%%f" ( - if "%1" == "" ( + if "%3" == "" ( rmdir /S /Q "%%f" 1>nul ) else ( echo found "%%f" @@ -39,15 +95,15 @@ for %%d in ( _win7_ _wlh_ _wnet_ _wxp_ ) do ( rem check/remove files -for %%d in ( _win7_ _wlh_ _wxp_ _wnet_ ) do ( - echo File Scan for *%%d* - dir /B /S *%%d* > %T% 2>&1 +for %%d in ( %TOS% ) do ( + echo File Scan for *%%d%TARCH%* + dir /B /S *%%d%TARCH%* > %T% 2>&1 if ERRORLEVEL 1 ( del /Q/F %T% ) else ( for /f "delims=," %%f in ( %T% ) do ( if EXIST "%%f" ( - if "%1" == "" ( + if "%3" == "" ( del /F /Q "%%f" 1>nul ) else ( echo found %%f diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat index eaefcff4..4cb57027 100644 --- a/trunk/etc/makebin.bat +++ b/trunk/etc/makebin.bat @@ -14,7 +14,7 @@ rem WdfCoInstall_ver - 5 digit WdfCoInstallerVersion # (blank == 01007} rem makebin is designed to take an openIB build tree path and produce a folder rem tree of binaries suitable for input to a WIX builder which procduces rem an OS .msi installer. -rem Building a WinOF release is done is 3 phases, makebin is the 2nd phase. +rem Building a OFED release is done is 3 phases, makebin is the 2nd phase. rem makebin is commonly run from trunk\buildrelease.bat although it can be rem run standalone. diff --git a/trunk/ulp/dapl2/test/dapltest/scripts/dt-cli.bat b/trunk/ulp/dapl2/test/dapltest/scripts/dt-cli.bat index f1eb23b8..00369506 100644 --- a/trunk/ulp/dapl2/test/dapltest/scripts/dt-cli.bat +++ b/trunk/ulp/dapl2/test/dapltest/scripts/dt-cli.bat @@ -17,7 +17,7 @@ if not "!F!" == "off" ( rem set DAT_OVERRIDE=D:\dapl2\dat.conf rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe) -set PF="%ProgramFiles%\WinOF" +set PF="%ProgramFiles%\OFED" if NOT EXIST %PF%\dapl2test.exe ( echo Missing file %PF%\dapl2test.exe ? diff --git a/trunk/ulp/dapl2/test/dapltest/scripts/dt-svr.bat b/trunk/ulp/dapl2/test/dapltest/scripts/dt-svr.bat index abd17fb0..9c188829 100644 --- a/trunk/ulp/dapl2/test/dapltest/scripts/dt-svr.bat +++ b/trunk/ulp/dapl2/test/dapltest/scripts/dt-svr.bat @@ -6,7 +6,7 @@ SETLOCAL rem set DAT_OVERRIDE=C:\DAT\dat.conf -set PF="%ProgramFiles%\WinOF" +set PF="%ProgramFiles%\OFED" if NOT EXIST %PF%\dapl2test.exe ( echo Missing file %PF%\dapl2test.exe ? -- 2.46.0