rem version: 2.1.0\r
\r
rem EXAMPLE - Build entire openIB-windows release & WIX installers (.msi) files.\r
-rem Binary release is constructed in WinOF\Wix\OS\bin.\r
+rem Binary release is constructed in OFED\Wix\OS\bin.\r
rem Processor architecture specific WIX installers are constructed\r
rem in %IDIR%\r
rem\r
rem msi-label | msi-del | msi-dir {OPENIB_REV}\r
\r
rem This script is an 'example' of a one-command entire IB stack build to\r
-rem single-file installer; used to build a WinOF releases.\r
+rem single-file installer; used to build a OFED releases.\r
rem Script is designed to be invoked from the <whatever>\gen1\trunk folder with\r
-rem <whatever>\gen1\trunk\WinOF\Wix\* present.\r
+rem <whatever>\gen1\trunk\OFED\Wix\* present.\r
rem\r
rem Verify the following env vars are suitible for your system configuration.\r
-rem _DDK, _PSDK, SVN, IDIR\r
+rem _DDK, _PSDK, SVN, IDIR, CERTFILE, SW_PUBLISHER\r
\r
rem 'nf path' command variants are required due to a bug in the WDK build env.\r
rem ipoib\ & ipoib_ndis6_cm\ both build ipoib.sys just for different OS\r
rem versions. The problem arises when a compile is forced on one folder or the\r
rem other, all instances of ipoib.sys are deleted\r
\r
+rem WIX Installer files (.msi) destination folder - set for local environment.\r
+set IDIR=%SystemRoot%\temp\r
\r
if "%1" == "" goto usage\r
if "%1" == "/?" goto usage\r
\r
rem assumes %CD% == '<...>\gen1\trunk'\r
set BSE=%CD%\r
-set WIX=%CD%\WinOF\WIX\r
+set WIX=%CD%\OFED\WIX\r
\r
rem Setup Wix 3.0 items\r
\r
exit /B 1\r
)\r
\r
-rem WIX Installer files (.msi) destination folder - set for local environment.\r
-set IDIR=%SystemRoot%\temp\r
-\r
if "%1" == "msi-label" (\r
pushd %IDIR%\r
if exist WOF_wxp_x86.msi (\r
\r
rem Verify WIX toolset is available - if not, download from\r
rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109\r
-rem <...>\WinOF\WIX\WIX_tools\\r
+rem <...>\OFED\WIX\WIX_tools\\r
rem\r
if NOT EXIST %WIX%\WIX_tools\%WIX_BIN% (\r
echo %0 - Missing WIX tools @ %WIX%\WIX_tools\%WIX_BIN% \r
\r
:InstallBin\r
\r
-echo Create binary release tree - suitible for WinOF-WIX installer build.\r
+echo Create binary release tree - suitible for OFED-WIX installer build.\r
\r
if EXIST "%RBIN_W7%" (rmdir /S /Q %RBIN_W7% & echo %0 - removed %RBIN_W7%)\r
if EXIST "%RBIN_WLH%" (rmdir /S /Q %RBIN_WLH% & echo %0 - removed %RBIN_WLH%)\r
echo %RBIN_WNET%\r
echo %RBIN_WXP%\r
\r
-rem build WIX installers --> see WinOF\WIX\r
+rem build WIX installers --> see OFED\WIX\r
\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
\r
rem TabStop=4\r
\r
-rem Mfg. a ZIP file of a WinOF distribution, such that the zip file can be\r
-rem pushed to the OFA WinOF download site and unzipped for distribution.\r
+rem Create a ZIP file of an OFED distribution, such that the zip file can be\r
+rem pushed to the OFA OFED for windows download site and unzipped for\r
+rem distribution.\r
\r
-rem populate arch specific distribution folders, zip'em, populate symbols \r
+rem Populate arch specific distribution folders, zip'em, populate symbols \r
rem folder and zip the entire package for transmission to OFA download website.\r
rem calls .\zip-OFA-dist.bat script.\r
\r
rem 1) current arch specific installers are in %systemroot%\temp\*.msi\r
rem resultant from trunk\buildrelease.bat execution.\r
rem\r
-rem ASSUMES %CD% == gen1\branches\WinOF\Wix\r
+rem ASSUMES %CD% == gen1\trunk\OFED\Wix\r
rem\r
rem build-OFA-dist release_ID {target_path}\r
rem\r
set ID=%1\r
\r
rem Final zip archive name\r
-set ZIP=WinOF_dist_v%ID%.zip\r
+set ZIP=OFED_dist_v%ID%.zip\r
\r
rem where gen1\trunk\buildRelease.bat created the .msi installer files.\r
set MSI=%SystemRoot%\temp\r
echo "Missing components?"\r
echo "Must execute from gen1\trunk\WinOF\WIX -- and --"\r
echo " .\win7,wnet,wxp,wlh\bin\ must be populated."\r
- echo " run gen1\trunk\WinOF\BuildRelease.bat -or- gen1\trunk\etc\makebin"\r
+ echo " run gen1\trunk\OFED\BuildRelease.bat -or- gen1\trunk\etc\makebin"\r
exit /B 1\r
)\r
\r
exit /B 1\r
)\r
\r
- set DSTx86=WinOF_%ID%_%%s_x86\r
- set DSTx64=WinOF_%ID%_%%s_x64\r
- set DSTia64=WinOF_%ID%_%%s_ia64\r
+ set DSTx86=OFED_%ID%_%%s_x86\r
+ set DSTx64=OFED_%ID%_%%s_x64\r
+ set DSTia64=OFED_%ID%_%%s_ia64\r
\r
echo Building target !DSTx86!\r
\r
\r
echo Copying installers for %%s\r
\r
- copy /B /Y %MSI%\WOF_%%s_x86.msi !DSTx86!\WinOF_%ID%_%%s_x86.msi\r
+ copy /B /Y %MSI%\OFED_%%s_x86.msi !DSTx86!\OFED_%ID%_%%s_x86.msi\r
if ERRORLEVEL 1 (\r
- echo Err - unable to copy %MSI%\WOF_%%s_x86.msi\r
+ echo Err - unable to copy %MSI%\OFED_%%s_x86.msi\r
exit /B 1\r
)\r
\r
if not "%%s" == "wxp" (\r
\r
- copy /B /Y %MSI%\WOF_%%s_x64.msi !DSTx64!\WinOF_%ID%_%%s_x64.msi\r
+ copy /B /Y %MSI%\OFED_%%s_x64.msi !DSTx64!\OFED_%ID%_%%s_x64.msi\r
if ERRORLEVEL 1 (\r
- echo Err - unable to copy %MSI%\WOF_%%s_x64.msi\r
+ echo Err - unable to copy %MSI%\OFED_%%s_x64.msi\r
exit /B 1\r
)\r
\r
- copy /B /Y %MSI%\WOF_%%s_ia64.msi !DSTia64!\WinOF_%ID%_%%s_ia64.msi\r
+ copy /B /Y %MSI%\OFED_%%s_ia64.msi !DSTia64!\OFED_%ID%_%%s_ia64.msi\r
if ERRORLEVEL 1 (\r
- echo Err - unable to copy %MSI%\WOF_%%s_ia64.msi\r
+ echo Err - unable to copy %MSI%\OFED_%%s_ia64.msi\r
exit /B 1\r
)\r
)\r
\r
rem create a ZIP file of the entire distribution\r
\r
-echo WinOF v%ID% distribution @ %ZIP%\r
+echo OFED v%ID% distribution @ %ZIP%\r
\r
pushd %MSI%\r
\r
\r
echo -----\r
echo -----\r
-echo WinOF v%ID% distribution @ %MSI%\%ZIP%\r
+echo OFED v%ID% distribution @ %MSI%\%ZIP%\r
echo -----\r
\r
endlocal\r
@echo off\r
setlocal\r
-rem Build WIX installers (.msi) for 'all' architectures & Operating environments\r
+rem Build WIX installers (.msi)\r
rem\r
rem usage:\r
-rem %0 cmd Cross-CertFileName SPCSubjectName {msi-dest-path}\r
-rem cmd - if 'msi' then assume drivers already signed, only sign .msi\r
+rem %0 cmd CrossCert SW_PUB msi-dest {OS ARCH}\r
+rem cmd - if 'msi' then assume drivers already signed, only sign .msi\r
rem otherwise sign all drivers and installers (.msi files)\r
-\r
-rem Cross-CertFilename is a filename only, must prefix '...\WIX' before\r
-rem passing it down.\r
-rem SW_PUB - Software Publisher name in 'MY' Cert Store, see signtool /n switch\r
+rem CrossCert - a Cross Certificate filename only\r
+rem SW_PUB - Software Publisher name in 'MY' Cert Store, see signtool /n switch\r
+rem msi-dest - full path to folder where .msi files are written.\r
+rem OS - target Windows OS: all,wxp, wlh, win7, wnet\r
+rem ARCH - target architecture: all,x86,x64,ia64\r
\r
rem *** REQUIRES nmake, common invocation from Visual C or WDK command window\r
rem *** Assumes current folder is WIX\\r
\r
-set USE=usage %0 all/msi Certificate-FileName SW_Publisher[see signtool /n] {msi-dest-path}\r
+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]}\r
\r
if "%1" == "" (\r
- echo %0: %USE%\r
+ echo %USE%\r
exit /B 1\r
)\r
\r
exit /B 1\r
)\r
\r
-if "%4" == "" (\r
- set DST=%windir%\temp\r
-) else (\r
- set DST=%4\r
+if "%4" == "" (set DST=%windir%\temp) else (set DST=%4)\r
+\r
+if "%5" == "" (\r
+:all_os\r
+ rem Type-Of-OperatingSystem\r
+ set TOS=win7 wlh wnet wxp\r
+ rem Selection\r
+ set OSarg=all\r
+ goto OK_OS\r
+)\r
+if "%5" == "all" goto all_os\r
+\r
+if "%5" == "win7" goto os_valid\r
+if "%5" == "wlh" goto os_valid\r
+if "%5" == "wnet" goto os_valid\r
+if "%5" == "wxp" goto os_valid\r
+echo %0 - Bad OS '%5'?, abort.\r
+exit /B 1\r
+\r
+:os_valid\r
+\r
+set TOS=%5\r
+set OSarg=%5\r
+\r
+:OK_OS\r
+\r
+if "%6" == "" (\r
+:all_arch\r
+ set TARCH=x86 x64 ia64\r
+ set ARCHarg=all\r
+ goto OK_arch\r
)\r
+if "%6" == "all" goto all_arch\r
+\r
+if "%6" == "x86" goto OK_valid\r
+if "%6" == "x64" goto OK_valid\r
+if "%6" == "ia64" goto OK_valid\r
+echo %0 - BAD arch '%6'?\r
+exit /B 1\r
+\r
+:OK_valid\r
+\r
+set TARCH=%6\r
+set ARCHarg=%6\r
+\r
+:OK_arch\r
+\r
+echo.\r
+echo Building installers for %TOS% %TARCH%\r
\r
if NOT EXIST %DST% (\r
echo %0: Installer output path %DST% not found?\r
\r
if "%1" == "msi" goto mk_msi\r
\r
-rem Sign drivers for all OSes & arches. Convert CertFilename to full path.\r
+rem Sign drivers for specified OSes & arches. Convert CertFilename to full path.\r
\r
-call sign-all-drivers %CD%\%2 %3\r
+call sign-all-drivers %CD%\%2 %3 %OSarg% %ARCHarg%\r
\r
if ERRORLEVEL 1 (\r
echo %0: Error signing drivers?\r
rem Server 2003/XP64\r
rem Windows XP (32-bit) version: x86 only\r
\r
-for %%o in ( win7 wlh wnet wxp ) do (\r
+echo %0 - Building .msi files\r
+\r
+for %%o in ( %TOS% ) do (\r
if Not exist %%o\bin\HCA (\r
echo Missing %%o files?\r
exit /B 1\r
)\r
pushd %%o\r
- call build-MSI %DST%\r
+ call build-MSI %DST% %ARCHarg%\r
if ERRORLEVEL 1 exit /B 1\r
popd\r
)\r
\r
set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll\r
echo %0 - Signing Installer .msi files\r
-for %%o in ( win7 wlh wnet wxp ) do (\r
- for %%a in ( x86 x64 ia64 ) do (\r
- if exist %DST%\WOF_%%o_%%a.msi (\r
- \r
- echo Signing installer %DST%\WOF_%%o_%%a.msi\r
- signtool sign /ac %CD%\%2 /n %3 %TS% %DST%\WOF_%%o_%%a.msi\r
+for %%o in ( %TOS% ) do (\r
+ for %%a in ( %TARCH% ) do (\r
+ if exist %DST%\OFED_%%o_%%a.msi (\r
+ echo Signing installer %DST%\OFED_%%o_%%a.msi\r
+ signtool sign /ac %CD%\%2 /n %3 %TS% %DST%\OFED_%%o_%%a.msi\r
if ERRORLEVEL 1 (\r
- echo %0 signtool sign %DST%\WOF_%%o_%%a.msi failed?\r
+ echo %0 signtool sign %DST%\OFED_%%o_%%a.msi failed?\r
exit /B 1\r
)\r
- signtool verify /pa %DST%\WOF_%%o_%%a.msi\r
+ signtool verify /pa %DST%\OFED_%%o_%%a.msi\r
if ERRORLEVEL 1 (\r
- echo %0 signtool verify %DST%\WOF_%%o_%%a.msi failed?\r
+ echo %0 signtool verify %DST%\OFED_%%o_%%a.msi failed?\r
exit /B 1\r
)\r
)\r
\r
<Include>\r
\r
- <?define WOFREL="v2.2 (pre-RC0)" ?>\r
+ <?define WOFREL="v2.3 (pre)" ?>\r
\r
- <?define WOFRELNUM=2.2 ?>\r
+ <?define WOFRELNUM=2.3 ?>\r
\r
<?define WDFVER=01009 ?>\r
\r
+ <?define PRODUCT="OpenFabrics Enterprise Distribution" ?>\r
+\r
+ <?define PID="OFED" ?>\r
+\r
</Include>\r
\r
#\r
# S == WIX src & obj filename: .wxs & .wixobj\r
# A == arch {x86,ia64,x64}\r
-# P == Installer (.msi) filename\r
+# P == Installer (.msi) 'complete' filename\r
# optional: DFXP == Path to DifxApp files setup in makebin.bat\r
\r
!ifndef DFXP\r
--- /dev/null
+\r
+<Include>\r
+\r
+ <Package Id="*"\r
+ Keywords="Installer, InfiniBand, $(var.PID), WinOF, OpenFabrics"\r
+ InstallPrivileges='elevated'\r
+ Description="$(var.PID) Installer"\r
+ Comments="$(var.PRODUCT) for Windows"\r
+ Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
+ Platform="$(var.ARCHP)" Languages="1033"\r
+ Compressed="yes" SummaryCodepage="1252" />\r
+\r
+</Include>\r
+\r
<Property Id='ARPNOMODIFY'>1</Property>\r
<Property Id='ARPNOREPAIR'>1</Property>\r
-->\r
- <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
+ <Property Id='ARPCOMMENTS'>$(var.PRODUCT)</Property>\r
<Property Id='ARPCONTACT'>Openfabrics Alliance www.OpenFabrics.org</Property>\r
<Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
<Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
#\r
# DAT 2.0 (debug)\r
-ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
+ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
#\r
# DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket\r
# connection; supports DAT Windows <==> Linux over IB connections.\r
ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" ""\r
#\r
# Socket-CM (debug)\r
-ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" ""\r
+ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" ""\r
#\r
# DAT 2.0 RDMA-CM\r
# connection; supports DAT Windows <==> Linux over IB connections.\r
ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" ""\r
#\r
# DAT 2.0 RDMA-CM (debug)\r
-ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" ""\r
+ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" ""\r
@echo off\r
setlocal\r
-rem Build Windows 7 WIX installer (.msi) for all architectures\r
+rem Build WIX installer (.msi) for specified architecture(s)\r
rem\r
-rem usage: %0 {dest-path-for-msi-files}\r
+rem usage: %0 {dest-path-for-msi-files Arch}\r
\r
rem *** REQUIRES nmake, common invocation from Visual C or DDK command window\r
\r
) else (\r
set DST=%1\r
)\r
+if "%2" == "" (\r
+:all_arch\r
+ set ARCH=ia64 x64 x86\r
+ goto OK_arch\r
+)\r
+if "%2" == "all" goto all_arch\r
+set ARCH=%2\r
+\r
+:OK_arch\r
+\r
if NOT EXIST %DST% (\r
echo %0: Installer output path %DST% not found?\r
- exit /B\r
+ exit /B 1\r
)\r
nmake /NOLOGO /? > %DST%\jnk.txt\r
if ERRORLEVEL 1 (\r
echo %0 missing nmake.exe in PATH?\r
- exit /B\r
+ exit /B 1\r
)\r
del /Q /F %DST%\jnk.txt\r
\r
-if NOT EXIST %CD%\bin\HCA\amd64 (\r
- echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat\r
- exit /B\r
+for %%a in ( %ARCH% ) do (\r
+ if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a)\r
+ if NOT EXIST %CD%\bin\HCA\!HWN! (\r
+ echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort.\r
+ exit /B 1\r
+ )\r
+ if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi\r
+ pushd %%a\r
+ nmake /NOLOGO full\r
+ if ERRORLEVEL 1 (\r
+ echo %0 - Error building OFED_%OS%_%%a.msi ?\r
+ exit /B 1\r
+ )\r
+ echo move /Y OFED_%OS%_%%a.msi %DST%\r
+ move /Y OFED_%OS%_%%a.msi %DST%\r
+ popd\r
)\r
\r
-if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi\r
-if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi\r
-if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi\r
-\r
-if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi\r
-if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi\r
-if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi\r
-\r
-pushd ia64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_ia64.msi %DST%\r
-move /Y WOF_%OS%_ia64.msi %DST%\r
-popd\r
-\r
-pushd x64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x64.msi %DST%\r
-move /Y WOF_%OS%_x64.msi %DST%\r
-popd\r
-\r
-pushd x86\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x86.msi %DST%\r
-move /Y WOF_%OS%_x86.msi %DST%\r
-popd\r
-\r
rem if run from top-level %1 will not be null, otherwise assume run from\r
rem cmd line.\r
if "%1" == "" dir %DST%\*.msi\r
###################\r
# IA64/IPF Itanium makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=ia64\r
P=$(S)_win7_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows 7\r
+ OpenFabrics Enterprise Distribution) for IA64/IPF Itanium on Windows 7\r
-->\r
\r
<?define ARCH=ia64 ?>\r
<?define ARCHP=ia64 ?>\r
<?define OS=win7 ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
- Privileged\r
+ Privileged\r
</Condition>\r
\r
<Condition Message="This package can be installed on IA64 systems only">\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x64\r
P=$(S)_win7_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics) for x64 Windows 7 or Server 2008 R2\r
+ OpenFabrics Enterprise Distribution for x64 Windows 7 or Server 2008 R2\r
-->\r
\r
<?define ARCH=amd64 ?>\r
<?define ARCHP=x64 ?>\r
<?define OS=win7 ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x86\r
P=$(S)_win7_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2008 or Vista\r
+ OpenFabrics Enterprise Distribution for x86 Windows Server 2008 or Vista\r
-->\r
\r
<?define ARCH=x86 ?>\r
<?define ARCHP=x86 ?>\r
<?define OS=win7 ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFilesFolder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
@echo off\r
setlocal\r
-rem Build WNET WIX installer (.msi) for all architectures\r
+rem Build WIX installer (.msi) for specified architecture(s)\r
rem\r
-rem usage: %0 {dest-path-for-msi-files}\r
+rem usage: %0 {dest-path-for-msi-files Proc-Arch}\r
\r
rem *** REQUIRES nmake, common invocation from Visual C or DDK command window\r
\r
) else (\r
set DST=%1\r
)\r
+if "%2" == "" (\r
+:all_arch\r
+ set ARCH=ia64 x64 x86\r
+ goto OK_arch\r
+)\r
+if "%2" == "all" goto all_arch\r
+set ARCH=%2\r
+\r
+:OK_arch\r
+\r
if NOT EXIST %DST% (\r
echo %0: Installer output path %DST% not found?\r
- exit /B\r
+ exit /B 1\r
)\r
nmake /NOLOGO /? > %DST%\jnk.txt\r
if ERRORLEVEL 1 (\r
echo %0 missing nmake.exe in PATH?\r
- exit /B\r
+ exit /B 1\r
)\r
del /Q /F %DST%\jnk.txt\r
\r
-if NOT EXIST %CD%\bin\HCA\amd64 (\r
- echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat\r
- exit /B\r
+for %%a in ( %ARCH% ) do (\r
+ if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a)\r
+ if NOT EXIST %CD%\bin\HCA\!HWN! (\r
+ echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort.\r
+ exit /B 1\r
+ )\r
+ if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi\r
+ pushd %%a\r
+ nmake /NOLOGO full\r
+ if ERRORLEVEL 1 (\r
+ echo %0 - Error building OFED_%OS%_%%a.msi ?\r
+ exit /B 1\r
+ )\r
+ echo move /Y OFED_%OS%_%%a.msi %DST%\r
+ move /Y OFED_%OS%_%%a.msi %DST%\r
+ popd\r
)\r
\r
-if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi\r
-if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi\r
-if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi\r
-\r
-if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi\r
-if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi\r
-if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi\r
-\r
-pushd ia64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_ia64.msi %DST%\r
-move /Y WOF_%OS%_ia64.msi %DST%\r
-popd\r
-\r
-pushd x64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x64.msi %DST%\r
-move /Y WOF_%OS%_x64.msi %DST%\r
-popd\r
-\r
-pushd x86\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x86.msi %DST%\r
-move /Y WOF_%OS%_x86.msi %DST%\r
-popd\r
-\r
rem if run from top-level %1 will not be null, otherwise assume run from\r
rem cmd line.\r
if "%1" == "" dir %DST%\*.msi\r
###################\r
# IA64/IPF Itanium makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=ia64\r
P=$(S)_wlh_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics) IA64/IPF Itanium Windows Server 2008\r
+ OpenFabrics Enterprise Distribution for IA64/IPF Itanium Windows Server 2008\r
-->\r
\r
<?define ARCH=ia64 ?>\r
<?define ARCHP=ia64 ?>\r
<?define OS=wlh ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
- Privileged\r
+ Privileged\r
</Condition>\r
\r
<Condition Message="This package can be installed on IA64 systems only">\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x64\r
P=$(S)_wlh_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista\r
+ OpenFabrics Enterprise Distribution for x64 Windows Server 2008 or Vista\r
-->\r
\r
<?define ARCH=amd64 ?>\r
<?define ARCHP=x64 ?>\r
<?define OS=wlh ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x86\r
P=$(S)_wlh_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2008 or Vista\r
+ OpenFabrics Enterprise Distribution for x86 Windows Server 2008 or Vista\r
-->\r
\r
<?define ARCH=x86 ?>\r
<?define ARCHP=x86 ?>\r
<?define OS=wlh ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFilesFolder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
@echo off\r
setlocal\r
-rem Build WNET WIX installer (.msi) for all architectures\r
+rem Build WIX installer (.msi) for specified architecture(s)\r
rem\r
-rem usage: %0 {dest-path-for-msi-files}\r
+rem usage: %0 {dest-path-for-msi-files Proc-Arch}\r
\r
rem *** REQUIRES nmake, common invocation from Visual C or DDK command window\r
\r
) else (\r
set DST=%1\r
)\r
+if "%2" == "" (\r
+:all_arch\r
+ set ARCH=ia64 x64 x86\r
+ goto OK_arch\r
+)\r
+if "%2" == "all" goto all_arch\r
+set ARCH=%2\r
+\r
+:OK_arch\r
+\r
if NOT EXIST %DST% (\r
echo %0: Installer output path %DST% not found?\r
- exit /B\r
+ exit /B 1\r
)\r
nmake /NOLOGO /? > %DST%\jnk.txt\r
if ERRORLEVEL 1 (\r
echo %0 missing nmake.exe in PATH?\r
- exit /B\r
+ exit /B 1\r
)\r
del /Q /F %DST%\jnk.txt\r
\r
-if NOT EXIST %CD%\bin\HCA\amd64 (\r
- echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat\r
- exit /B\r
+for %%a in ( %ARCH% ) do (\r
+ if "%%a" == "x64" (set HWN=amd64) else (set HWN=%%a)\r
+ if NOT EXIST %CD%\bin\HCA\!HWN! (\r
+ echo %0 - %CD%\bin\HCA\!HWN! not populated correctly?, abort.\r
+ exit /B 1\r
+ )\r
+ if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi\r
+ pushd %%a\r
+ nmake /NOLOGO full\r
+ if ERRORLEVEL 1 (\r
+ echo %0 - Error building OFED_%OS%_%%a.msi ?\r
+ exit /B 1\r
+ )\r
+ echo move /Y OFED_%OS%_%%a.msi %DST%\r
+ move /Y OFED_%OS%_%%a.msi %DST%\r
+ popd\r
)\r
\r
-\r
-if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi\r
-if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi\r
-if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi\r
-\r
-if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi\r
-if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi\r
-if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi\r
-\r
-pushd ia64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_ia64.msi %DST%\r
-move /Y WOF_%OS%_ia64.msi %DST%\r
-popd\r
-pushd x64\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x64.msi %DST%\r
-move /Y WOF_%OS%_x64.msi %DST%\r
-popd\r
-pushd x86\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x86.msi %DST%\r
-move /Y WOF_%OS%_x86.msi %DST%\r
-popd\r
-\r
-if "%1" == "" dir %DST%\*.msi\r
+rem if run from top-level %1 will not be null, otherwise assume run from\r
+rem cmd line.\r
+if "%1" == "" dir %DST%\*.msi\r
\r
echo ----\r
echo Done - %OS% WIX installers in %DST%\r
###################\r
# IA64/IPF Itanium makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=ia64\r
P=$(S)_wnet_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics) IA64/IPF Itanium Windows Server 2003\r
+ OpenFabrics Enterprise Distribution for IA64/IPF Itanium Windows Server 2003\r
-->\r
\r
<?define ARCH=ia64 ?>\r
<?define ARCHP=ia64 ?>\r
<?define OS=wnet ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
- Privileged\r
+ Privileged\r
</Condition>\r
\r
<Condition Message="This package can be installed on IA64 systems only">\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x64\r
P=$(S)_wnet_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF for x64 Windows Server 2003 or XP64\r
+ OpenFabrics Enterprise Distribution for x64 Windows Server 2003 or XP64\r
-->\r
\r
<?define ARCH=amd64 ?>\r
<?define ARCHP=x64 ?>\r
<?define OS="wnet/xp64" ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFiles64Folder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x86\r
P=$(S)_wnet_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics InfiniBand) for x86 Windows Server 2003\r
+ OpenFabrics Enterprise Distribution for x86 Windows Server 2003\r
-->\r
\r
<?define ARCH=x86 ?>\r
<?define ARCHP=x86 ?>\r
<?define OS=wnet ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFilesFolder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
@echo off\r
setlocal\r
-rem Build WNET WIX installer (.msi) for all architectures\r
+rem Build WIX installer (.msi) for specified architecture(s)\r
rem\r
-rem usage: %0 {dest-path-for-msi-files}\r
+rem usage: %0 {dest-path-for-msi-files Proc-Arch}\r
\r
rem *** REQUIRES nmake, common invocation from Visual C or DDK command window\r
\r
) else (\r
set DST=%1\r
)\r
+if "%2" == "" (\r
+ set ARCH=x86\r
+ goto OK_arch\r
+)\r
+if "%2" == "all" (\r
+ set ARCH=x86\r
+) else (\r
+ if not "%2" == "x86" (\r
+ echo %0 - x86 only!\r
+ exit /B 1\r
+ )\r
+ set ARCH=%2\r
+)\r
+:OK_arch\r
+\r
if NOT EXIST %DST% (\r
echo %0: Installer output path %DST% not found?\r
- exit /B\r
+ exit /B 1\r
)\r
nmake /NOLOGO /? > %DST%\jnk.txt\r
if ERRORLEVEL 1 (\r
echo %0 missing nmake.exe in PATH?\r
- exit /B\r
+ exit /B 1\r
)\r
del /Q /F %DST%\jnk.txt\r
\r
-if NOT EXIST %CD%\bin\HCA\x86 (\r
- echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat\r
- exit /B\r
+for %%a in ( %ARCH% ) do (\r
+ if NOT EXIST %CD%\bin\HCA\%%a (\r
+ echo %0 - %CD%\bin\HCA\%%a not populated correctly?, abort.\r
+ exit /B 1\r
+ )\r
+ if EXIST %%a\OFED_%OS%_%%a.msi del /Q /F %%a\OFED_%OS%_%%a.msi\r
+ pushd %%a\r
+ nmake /NOLOGO full\r
+ if ERRORLEVEL 1 (\r
+ echo %0 - Error building OFED_%OS%_%%a.msi ?\r
+ exit /B 1\r
+ )\r
+ echo move /Y OFED_%OS%_%%a.msi %DST%\r
+ move /Y OFED_%OS%_%%a.msi %DST%\r
+ popd\r
)\r
\r
-\r
-rem if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi\r
-rem if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi\r
-if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi\r
-\r
-rem if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi\r
-rem if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi\r
-if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi\r
-\r
-rem pushd ia64\r
-rem nmake /NOLOGO full\r
-rem if ERRORLEVEL 1 exit /B\r
-rem echo move /Y WOF_%OS%_ia64.msi %DST%\r
-rem move /Y WOF_%OS%_ia64.msi %DST%\r
-rem popd\r
-\r
-rem pushd x64\r
-rem nmake /NOLOGO full\r
-rem if ERRORLEVEL 1 exit /B\r
-rem echo move /Y WOF_%OS%_x64.msi %DST%\r
-rem move /Y WOF_%OS%_x64.msi %DST%\r
-rem popd\r
-\r
-pushd x86\r
-nmake /NOLOGO full\r
-if ERRORLEVEL 1 exit /B\r
-echo move /Y WOF_%OS%_x86.msi %DST%\r
-move /Y WOF_%OS%_x86.msi %DST%\r
-popd\r
-\r
+rem if run from top-level %1 will not be null, otherwise assume run from\r
+rem cmd line.\r
if "%1" == "" dir %DST%\*.msi\r
\r
echo ----\r
###################\r
# makefile targets\r
#\r
-S=WOF\r
+S=OFED\r
A=x86\r
P=$(S)_wxp_$(A)\r
\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF (Windows OpenFabrics InfiniBand) for x86 XP only.\r
+ OpenFabrics Enterprise Distribution for x86 XP only.\r
-->\r
\r
<?define ARCH=x86 ?>\r
<?define ARCHP=x86 ?>\r
<?define OS=XP ?>\r
-<?include ..\..\common\WinOF_cfg.inc ?>\r
+<?include ..\..\common\Config.inc ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
<Product\r
- Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+ Name="$(var.PRODUCT) $(var.WOFREL) $(var.ARCHP)"\r
Version="$(var.WOFRELNUM)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Language="1033" Codepage="1252"\r
- Manufacturer="Open Fabrics Alliance Windows">\r
+ Manufacturer="OpenFabrics Alliance">\r
\r
- <Package Id="*"\r
- Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
- InstallPrivileges='elevated'\r
- Description="WinOF Installer"\r
- Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
- Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
- Platform="$(var.ARCHP)" Languages="1033"\r
- Compressed="yes" SummaryCodepage="1252" />\r
+ <?include ..\..\common\Package.inc ?>\r
\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
<?include ..\..\common\PgmMenuShortcuts.inc ?>\r
\r
<Directory Id="ProgramFilesFolder" Name="PFiles">\r
- <Directory Id="INSTALLDIR" Name="WinOF">\r
+ <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
\r
<?include ..\..\common\Docs.inc ?>\r
<?include ..\..\common\Tools.inc ?>\r
rem\r
rem ****WARNING - this script is 'generally' invoked by 'build-OFA-dist.bat'\r
rem\r
-rem Construct & populate an OFA-WinOF distribution tree to be used at\r
-rem the OFA-WinOF download site.\r
-rem http://www.openfabrics.org/downloads/WinOF/\r
+rem Construct & populate an OFA-OFED distribution tree to be used at\r
+rem the OFA-OFED download site.\r
+rem http://www.openfabrics.org/downloads/OFED/\r
rem\r
-rem ASSUMES %CD% gen1\branches\WinOF\Wix\r
+rem ASSUMES %CD% gen1\branches\OFED\Wix\r
rem\r
rem zip-OFA-dist release_ID OSname {target_path}\r
rem\r
rem where gen1\trunk\buildRelease.bat created the .msi installer files.\r
set MSI=%SystemRoot%\temp\r
\r
-rem MUST execute from gen1\branches\WinOF\WIX\r
+rem MUST execute from gen1\branches\OFED\WIX\r
set RBIN=%CD%\%2\bin\r
\r
if NOT EXIST %RBIN%\bin (\r
- echo Must execute from gen1\branches\WinOF\WIX -- and --\r
+ echo Must execute from gen1\branches\OFED\WIX -- and --\r
echo .\bin\ must be populated - run gen1\trunk\buildRelease.bat\r
exit /B 1\r
)\r
\r
set WIXLAND=%CD%\r
\r
-if not EXIST WinOF_%RID%_%2_x86.zip (\r
- echo %0 - missing WinOF arch package: WinOF_%RID%_%2_x86.zip \r
+if not EXIST OFED_%RID%_%2_x86.zip (\r
+ echo %0 - missing OFED arch package: OFED_%RID%_%2_x86.zip \r
exit /B 1\r
)\r
if not "%2" = "wxp" (\r
- if not EXIST WinOF_%RID%_%2_x64.zip (\r
- echo %0 - missing WinOF zip package: WinOF_%RID%_%2_x64.zip \r
+ if not EXIST OFED_%RID%_%2_x64.zip (\r
+ echo %0 - missing WinOF zip package: OFED_%RID%_%2_x64.zip \r
exit /B 1\r
)\r
- if not EXIST WinOF_%RID%_%2_ia64.zip (\r
- echo %0 - missing WinOF arch package: WinOF_%RID%_%2_ia64.zip \r
+ if not EXIST OFED_%RID%_%2_ia64.zip (\r
+ echo %0 - missing OFED arch package: OFED_%RID%_%2_ia64.zip \r
exit /B 1\r
)\r
)\r
\r
-echo "Creating WinOF downloadable distribution in"\r
+echo "Creating OFED downloadable distribution in"\r
echo " %DST%"\r
echo " from binaries in"\r
echo " %RBIN%"\r
\r
echo Generating Symbol store\r
\r
-%PGM% add /r /f %RBIN% /s %SS% /t "WinOF" /v "version %RID%"\r
+%PGM% add /r /f %RBIN% /s %SS% /t "OFED" /v "version %RID%"\r
if ERRORLEVEL 1 (\r
echo symstore.exe failure rc %ERRORLEVEL%\r
exit /B 1\r
\r
echo Generating arch releases\r
\r
-copy WinOF_%RID%_%2_x86.zip %DST%\Installers\r
+copy OFED_%RID%_%2_x86.zip %DST%\Installers\r
if not "%2" = "wxp" (\r
- copy WinOF_%RID%_%2_x64.zip %DST%\Installers\r
- copy WinOF_%RID%_%2_ia64.zip %DST%\Installers\r
+ copy OFED_%RID%_%2_x64.zip %DST%\Installers\r
+ copy OFED_%RID%_%2_ia64.zip %DST%\Installers\r
)\r
\r
echo "%0 - Results in %DST%"\r
@echo off\r
setlocal\r
\r
-rem usage: clean-build {scan-only}\r
-rem no args - remove build specific folders & files:\r
+rem usage: clean-build {Target-OS} {target-Arch} {scan-only}\r
+rem no args - remove build specific folders and files:\r
rem *_win7_* *_wxp_* *_wnet_* *_wlh_*\r
-rem arg1 != "" - then report matched folders & files - no delete.\r
+rem arg1 == Target OS name: win7 | wxp | wnet | wlh | all\r
+rem arg2 == Target Arch: x86 | x64 | ia64 | all\r
+rem arg3 != "" - then report matched folders & files - no delete.\r
+\r
+set ALLOS=_win7_ _wlh_ _wnet_ _wxp_\r
+set ALLARCH=x86 amd64 ia64\r
+\r
+if "%1" == "/?" (\r
+:usage\r
+ echo usage:\r
+ echo clean-build {OS:win7,wlh,wnet,wxp,all} {arch:x86,x64,ia64,all} {scan-only}\r
+ echo no args - remove all OS build specific folders and files: *_OS_*\r
+ echo otherwise 'win7 x86' only removes files * folders matching '*_win7_x86'\r
+ echo arg3 != "" - then report matched folders and files - no delete.\r
+ exit /B 0\r
+)\r
+\r
+if "%1" == "" (\r
+ set TOS=%ALLOS%\r
+ goto OK_OS\r
+)\r
+if "%1" == "all" (\r
+ set TOS=%ALLOS%\r
+) else (\r
+ if "%1" == "win7" goto set_OS\r
+ if "%1" == "wlh" goto set_OS\r
+ if "%1" == "wnet" goto set_OS\r
+ if "%1" == "wxp" goto set_OS\r
+ echo %0 - BAD OS specification '%1'?\r
+ goto usage\r
+rem set Target OS\r
+:set_OS\r
+ set TOS=_%1_\r
+)\r
+:OK_OS\r
+\r
+if "%2" == "" (\r
+:all_arch\r
+ set TARCH=\r
+ goto OK_ARCH\r
+)\r
+if "%2" == "all" goto all_arch\r
+\r
+if "%2" == "x64" (\r
+ set TARCH=amd64\r
+ goto OK_ARCH\r
+)\r
+if "%2" == "x86" goto set_ARCH\r
+if "%2" == "ia64" goto set_ARCH\r
+echo %0 - BAD Arch specification '%2'?\r
+goto usage\r
+\r
+rem set Target OS\r
+:set_ARCH\r
+ set TARCH=%2\r
+\r
+:OK_ARCH\r
\r
set T=%TEMP%\flist.txt\r
\r
\r
rem check/remove directories\r
\r
-for %%d in ( _win7_ _wlh_ _wnet_ _wxp_ ) do (\r
- echo Folder Scan for *%%d*\r
- dir /B /S /A:D *%%d* > %T% 2>&1\r
+for %%d in ( %TOS% ) do (\r
+ echo Folder Scan for *%%d%TARCH%*\r
+ dir /B /S /A:D *%%d%TARCH%* > %T% 2>&1\r
if ERRORLEVEL 1 (\r
del /Q/F %T%\r
) else (\r
for /f "delims=," %%f in ( %T% ) do (\r
if EXIST "%%f" (\r
- if "%1" == "" (\r
+ if "%3" == "" (\r
rmdir /S /Q "%%f" 1>nul\r
) else (\r
echo found "%%f"\r
\r
rem check/remove files\r
\r
-for %%d in ( _win7_ _wlh_ _wxp_ _wnet_ ) do (\r
- echo File Scan for *%%d*\r
- dir /B /S *%%d* > %T% 2>&1\r
+for %%d in ( %TOS% ) do (\r
+ echo File Scan for *%%d%TARCH%*\r
+ dir /B /S *%%d%TARCH%* > %T% 2>&1\r
if ERRORLEVEL 1 (\r
del /Q/F %T%\r
) else (\r
for /f "delims=," %%f in ( %T% ) do (\r
if EXIST "%%f" (\r
- if "%1" == "" (\r
+ if "%3" == "" (\r
del /F /Q "%%f" 1>nul\r
) else (\r
echo found %%f\r
rem makebin is designed to take an openIB build tree path and produce a folder\r
rem tree of binaries suitable for input to a WIX builder which procduces\r
rem an OS .msi installer.\r
-rem Building a WinOF release is done is 3 phases, makebin is the 2nd phase.\r
+rem Building a OFED release is done is 3 phases, makebin is the 2nd phase.\r
rem makebin is commonly run from trunk\buildrelease.bat although it can be\r
rem run standalone.\r
\r
rem set DAT_OVERRIDE=D:\dapl2\dat.conf\r
rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe)\r
\r
-set PF="%ProgramFiles%\WinOF"\r
+set PF="%ProgramFiles%\OFED"\r
\r
if NOT EXIST %PF%\dapl2test.exe (\r
echo Missing file %PF%\dapl2test.exe ?\r
\r
rem set DAT_OVERRIDE=C:\DAT\dat.conf\r
\r
-set PF="%ProgramFiles%\WinOF"\r
+set PF="%ProgramFiles%\OFED"\r
\r
if NOT EXIST %PF%\dapl2test.exe (\r
echo Missing file %PF%\dapl2test.exe ?\r
projects / ~shefty / rdma-win.git / commitdiff