[ofw] svn trunk commit svn.2694
Smith, Stan
stan.smith at intel.com
Mon Feb 1 10:58:49 PST 2010
New OFA/Windows package name 'OpenFabrics Enterprise Distribution'.
In those situations where the OS environment context is ambiguous
'OpenFabrics Enterprise Distribution for Windows'
Revision: 2694
Author: stansmith
Date: 10:13:47 AM, Monday, February 01, 2010
Message:
[OFED] switch references of WinOF -- > OFED.
rename wof.wxs --> ofed.wxs
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\ .
----
Modified : /gen1/trunk/OFED/BuildRelease.bat
Modified : /gen1/trunk/OFED/WIX/build-OFA-dist.bat
Modified : /gen1/trunk/OFED/WIX/build-all-MSI.bat
Modified : /gen1/trunk/OFED/WIX/common/Config.inc
Modified : /gen1/trunk/OFED/WIX/common/Makefile.inc
Added : /gen1/trunk/OFED/WIX/common/Package.inc
Modified : /gen1/trunk/OFED/WIX/common/arp.inc
Modified : /gen1/trunk/OFED/WIX/dat.conf
Modified : /gen1/trunk/OFED/WIX/win7/build-MSI.bat
Modified : /gen1/trunk/OFED/WIX/win7/ia64/Makefile
Modified : /gen1/trunk/OFED/WIX/win7/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/win7/x64/Makefile
Modified : /gen1/trunk/OFED/WIX/win7/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/win7/x86/Makefile
Modified : /gen1/trunk/OFED/WIX/win7/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/build-MSI.bat
Modified : /gen1/trunk/OFED/WIX/wlh/ia64/Makefile
Modified : /gen1/trunk/OFED/WIX/wlh/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/x64/Makefile
Modified : /gen1/trunk/OFED/WIX/wlh/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/x86/Makefile
Modified : /gen1/trunk/OFED/WIX/wlh/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/build-MSI.bat
Modified : /gen1/trunk/OFED/WIX/wnet/ia64/Makefile
Modified : /gen1/trunk/OFED/WIX/wnet/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/x64/Makefile
Modified : /gen1/trunk/OFED/WIX/wnet/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/x86/Makefile
Modified : /gen1/trunk/OFED/WIX/wnet/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wxp/build-MSI.bat
Modified : /gen1/trunk/OFED/WIX/wxp/x86/Makefile
Modified : /gen1/trunk/OFED/WIX/wxp/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/zip-OFA-dist.bat
Modified : /gen1/trunk/etc/clean-build.bat
Modified : /gen1/trunk/etc/makebin.bat
Modified : /gen1/trunk/ulp/dapl2/test/dapltest/scripts/dt-cli.bat
Modified : /gen1/trunk/ulp/dapl2/test/dapltest/scripts/dt-svr.bat
--- C:/Documents and Settings/scsmith/Local Settings/Temp/Makefile-revBASE.svn000.tmp Mon Feb 01 10:11:25 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/WIX/wlh/ia64/Makefile Thu Jan 28 11:49:33 2010
@@ -1,7 +1,7 @@
###################
# IA64/IPF Itanium makefile targets
#
-S=WOF
+S=OFED
A=ia64
P=$(S)_wlh_$(A)
--- C:/Documents and Settings/scsmith/Local Settings/Temp/ofed.wxs-revBASE.svn000.tmp.wxs Mon Feb 01 10:11:50 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/WIX/wlh/ia64/ofed.wxs Fri Jan 15 13:36:33 2010
@@ -1,34 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- WinOF (Windows OpenFabrics) IA64/IPF Itanium Windows Server 2008
+ OpenFabrics Enterprise Distribution for IA64/IPF Itanium Windows Server 2008
-->
<?define ARCH=ia64 ?>
<?define ARCHP=ia64 ?>
<?define OS=wlh ?>
-<?include ..\..\common\WinOF_cfg.inc ?>
+<?include ..\..\common\Config.inc ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >
<Product
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"
Version="$(var.WOFRELNUM)"
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
Language="1033" Codepage="1252"
- Manufacturer="Open Fabrics Alliance Windows">
+ Manufacturer="OpenFabrics Alliance">
- <Package Id="*"
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"
- InstallPrivileges='elevated'
- Description="WinOF Installer"
- Comments="Windows OpenFabrics Alliance InfiniBand stack"
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
- Platform="$(var.ARCHP)" Languages="1033"
- Compressed="yes" SummaryCodepage="1252" />
+ <?include ..\..\common\Package.inc ?>
<Condition Message="Administrator required to install [ProductName].">
- Privileged
+ Privileged
</Condition>
<Condition Message="This package can be installed on IA64 systems only">
@@ -51,7 +44,7 @@
<?include ..\..\common\PgmMenuShortcuts.inc ?>
<Directory Id="ProgramFiles64Folder" Name="PFiles">
- <Directory Id="INSTALLDIR" Name="WinOF">
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">
<?include ..\..\common\Docs.inc ?>
<?include ..\..\common\Tools.inc ?>
--- C:/Documents and Settings/scsmith/Local Settings/Temp/clean-build.b-revBASE.svn002.tmp.bat Mon Feb 01 10:01:57 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/etc/clean-build.bat Mon Feb 01 10:01:48 2010
@@ -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 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 @@
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
--- C:/Documents and Settings/scsmith/Local Settings/Temp/BuildRelease.bat-revBASE.svn000.tmp.bat Mon Feb 01 09:47:21 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/BuildRelease.bat Mon Feb 01 09:35:15 2010
@@ -5,7 +5,7 @@
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 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 <whatever>\gen1\trunk folder with
-rem <whatever>\gen1\trunk\WinOF\Wix\* present.
+rem <whatever>\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 @@
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 @@
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 @@
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 @@
: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_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%"
--- C:/Documents and Settings/scsmith/Local Settings/Temp/build-all-MSI.bat-revBASE.svn000.tmp.bat Mon Feb 01 09:49:36 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/WIX/build-all-MSI.bat Fri Jan 29 09:35:49 2010
@@ -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 @@
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 @@
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 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 @@
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
)
)
--- C:/Documents and Settings/scsmith/Local Settings/Temp/build-MSI.bat-revBASE.svn000.tmp.bat Mon Feb 01 09:53:17 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/WIX/win7/build-MSI.bat Fri Jan 29 09:37:48 2010
@@ -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,50 +13,44 @@
) 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.
More information about the ofw
mailing list