From: stansmith Date: Mon, 28 Apr 2008 19:20:57 +0000 (+0000) Subject: [WInOF] 1-1 inf file match svn & WIX X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=698105f11c2977e5df3b756d1211b34c93a4d81e;p=~shefty%2Frdma-win.git [WInOF] 1-1 inf file match svn & WIX git-svn-id: svn://openib.tc.cornell.edu/gen1@1083 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/branches/WOF1-1/buildWDK.bat b/branches/WOF1-1/buildWDK.bat index 0062eac5..656d95f8 100644 --- a/branches/WOF1-1/buildWDK.bat +++ b/branches/WOF1-1/buildWDK.bat @@ -51,7 +51,7 @@ rem rem set IDIR=D:\temp set IDIR=C:\Windows\Temp -echo Building for OPENIB_REV %SVN%, WDK ConnectX files in tree. +echo Building OPENIB_REV %SVN%, WDK ConnectX in %BSE%. timeout /T 5 if NOT EXIST "%IDIR%" ( @@ -76,6 +76,8 @@ if NOT EXIST etc\makebin.bat ( set OPS=-wgcM 3 +rem exit /B 1 + echo Building Checked x64 %COMSPEC% /C "call %_DDK%\IB_CHK_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\core\complib & build %OPS%" if ERRORLEVEL 1 exit /B 1 @@ -84,7 +86,7 @@ if ERRORLEVEL 1 exit /B 1 %COMSPEC% /C "call %_DDK%\IB_CHK_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%" if ERRORLEVEL 1 exit /B 1 echo Checked x64 done -timeout /T 8 +timeout /T 6 echo Building Free x64 %COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\core\complib & build %OPS%" @@ -94,7 +96,7 @@ if ERRORLEVEL 1 exit /B 1 %COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%" if ERRORLEVEL 1 exit /B 1 echo Free x64 done -timeout /T 8 +timeout /T 6 rem %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_x86.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%" rem if ERRORLEVEL 1 exit /B 1 @@ -107,13 +109,22 @@ if ERRORLEVEL 1 exit /B 1 %COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x86.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%" if ERRORLEVEL 1 exit /B 1 echo Free x86 done -timeout /T 8 +timeout /T 6 rem x86 check ConnectX build fails in core\ + rem %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_IA64.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%" rem if ERRORLEVEL 1 exit /B 1 rem %COMSPEC% /C "call %BSE%\etc\IB_FRE_BLD_IA64.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%" rem if ERRORLEVEL 1 exit /B 1 + +del /F/Q bin\user\objfre_wnet_amd64\amd64\complib.pdb +del /F/Q bin\user\objfre_wnet_amd64\amd64\ibal.pdb +del /F/Q bin\user\objchk_wnet_amd64\amd64\complibd.pdb +del /F/Q bin\user\objchk_wnet_amd64\amd64\ibald.pdb + +del /F/Q bin\user\objfre_wnet_x86\i386\complib.pdb +del /F/Q bin\user\objfre_wnet_x86\i386\ibal.pdb echo + echo WDK build for ConnectX done! diff --git a/branches/WOF1-1/core/bus/kernel/ib_bus.inf b/branches/WOF1-1/core/bus/kernel/ib_bus.inf index d6be21a2..978e0865 100644 --- a/branches/WOF1-1/core/bus/kernel/ib_bus.inf +++ b/branches/WOF1-1/core/bus/kernel/ib_bus.inf @@ -7,7 +7,7 @@ Signature="$Windows NT$" Class=System ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318} Provider=%OPENIB% -DriverVer=04/29/2008,1.0.0000.1059 +DriverVer=04/29/2008,1.0.0000.1089 CatalogFile=ib_bus.cat ; ================= Device Install section ===================== diff --git a/branches/WOF1-1/hw/mthca/kernel/mthca.inf b/branches/WOF1-1/hw/mthca/kernel/mthca.inf index e71bca98..1fe72f22 100644 --- a/branches/WOF1-1/hw/mthca/kernel/mthca.inf +++ b/branches/WOF1-1/hw/mthca/kernel/mthca.inf @@ -7,7 +7,7 @@ Class=InfiniBandHca ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491} Provider=%OPENIB% ; must be synchronized with MTHCA_DEV.H -DriverVer=04/29/2008,1.0.0000.1059 +DriverVer=04/29/2008,1.0.0000.1089 CatalogFile=mthca.cat ; ================= Destination directory section ===================== diff --git a/branches/WOF1-1/ulp/ipoib/kernel/netipoib.inf b/branches/WOF1-1/ulp/ipoib/kernel/netipoib.inf index b8a6e31d..b32cd916 100644 --- a/branches/WOF1-1/ulp/ipoib/kernel/netipoib.inf +++ b/branches/WOF1-1/ulp/ipoib/kernel/netipoib.inf @@ -7,7 +7,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} Provider = %OPENIB% -DriverVer=04/29/2008,1.0.0000.1059 +DriverVer=04/29/2008,1.0.0000.1089 CatalogFile=ipoib.cat [Manufacturer] diff --git a/branches/WOF1-1/ulp/qlgcvnic/kernel/netvnic.inf b/branches/WOF1-1/ulp/qlgcvnic/kernel/netvnic.inf index d5f90089..c31d4830 100644 --- a/branches/WOF1-1/ulp/qlgcvnic/kernel/netvnic.inf +++ b/branches/WOF1-1/ulp/qlgcvnic/kernel/netvnic.inf @@ -6,7 +6,7 @@ Signature="$Windows NT$" Class=Net ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318} Provider=%Inf_Provider% -DriverVer=04/29/2008,1.0.0000.1059 +DriverVer=04/29/2008,1.0.0000.1089 [ControlFlags] ExcludeFromSelect = IBA\V00066aP00000030 diff --git a/branches/WOF1-1/ulp/srp/kernel/ib_srp.inf b/branches/WOF1-1/ulp/srp/kernel/ib_srp.inf index ebd63689..74f9139d 100644 --- a/branches/WOF1-1/ulp/srp/kernel/ib_srp.inf +++ b/branches/WOF1-1/ulp/srp/kernel/ib_srp.inf @@ -6,7 +6,7 @@ Signature="$Windows NT$" Class=SCSIAdapter ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318} Provider=%OPENIB% -DriverVer=04/29/2008,1.0.0000.1059 +DriverVer=04/29/2008,1.0.0000.1089 ; ================= Device Install section ===================== diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs index 6b832690..b5ce36c4 100644 --- a/branches/WinOF/WIX/CustomActions.vbs +++ b/branches/WinOF/WIX/CustomActions.vbs @@ -32,10 +32,12 @@ Function Architecture() End Function -' Since a CustomAction (CA) that runs before SetupFinalize as a defered action + +' A CustomAction (CA) that runs before SetupFinalize as a defered action CA, ' can only see the properties through 'CustomActionData' Sub WinOF_setup + ' ' Driver Install Properties: ' 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder @@ -47,8 +49,6 @@ Sub WinOF_setup End Sub -''''''''''' Remove Driver Files '''''''''''' - 'Waiting to delete a file until it's free Function FileDeleteUntilFree(filename) @@ -78,7 +78,7 @@ Function FileDelete(filename) If fso.FileExists(filename) Then On Error Resume Next fso.DeleteFile(filename),True - If (Err AND Err.Number <> 70) Then ' tolerate protection errors + If (Err And Err.Number <> 70) Then ' tolerate protection errors ErrMsg ("Could not delete: " & filename) End If End If @@ -108,7 +108,7 @@ Function FileMove(filename,destination) On Error Resume Next If fso.FileExists(filename) Then fso.MoveFile filename,destination - If (Err AND Err.Number <> 70) then ' tolerate protection errors. + If (Err And Err.Number <> 70) then ' tolerate protection errors. ErrMsg ("Could not move: " & filename & " to " & destination) End if End If @@ -120,50 +120,50 @@ End Function ' What rmdir does from the cmd line but will not do from vbs? Sub RemoveFolder(objStartFolder) - -Set objFSO = CreateObject("Scripting.FileSystemObject") - -If Not objFSO.FolderExists(objStartFolder) Then - Exit Sub -End if - -Set objFolder = objFSO.GetFolder(objStartFolder) -'Wscript.Echo objFolder.Path -Set colFiles = objFolder.Files - -' del files in top-level folder -For Each objFile in colFiles - objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name) + + Set objFSO = CreateObject("Scripting.FileSystemObject") + + If Not objFSO.FolderExists(objStartFolder) Then + Exit Sub + End if + + Set objFolder = objFSO.GetFolder(objStartFolder) + 'Wscript.Echo objFolder.Path + Set colFiles = objFolder.Files + + ' del files in top-level folder + For Each objFile in colFiles + objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name) + If Err Then + ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name) + End if + Next + + ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO + + On Error Resume Next + objFSO.DeleteFolder(objStartFolder) If Err Then - ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name) + ErrMsg("DelFolder err on " & objStartFolder) End if -Next - -ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO - -On Error Resume Next -objFSO.DeleteFolder(objStartFolder) -If Err Then - ErrMsg("DelFolder err on " & objStartFolder) -End if - + End Sub Sub ShowSubFolders(Folder,FSO) On Error Resume Next For Each Subfolder in Folder.SubFolders -' Wscript.Echo Subfolder.Path + ' Wscript.Echo Subfolder.Path Set objFolder = FSO.GetFolder(Subfolder.Path) Set colFiles = objFolder.Files For Each objFile in colFiles -' Wscript.Echo Subfolder.Path & "\" & objFile.Name + ' Wscript.Echo Subfolder.Path & "\" & objFile.Name FSO.DeleteFile(Subfolder.Path & "\" & objFile.Name) If Err Then ErrMsg("DelFile err on " & Subfolder.Path & "\" & objFile.Name) End if Next -' Wscript.Echo + ' Wscript.Echo ShowSubFolders Subfolder, FSO FSO.DeleteFolder(Subfolder.Path) If Err Then @@ -175,6 +175,8 @@ End Sub +''''''''''' Remove Driver Files '''''''''''' + ' Attempt to clean out driver installed files which fail to be uninstalled ' when the driver is uninstalled. Win2K3/x64 files persist, XP & Win2K3/x86 ' the driver files are correctly remove? @@ -207,7 +209,11 @@ Function RemoveDriverFiles() sDRIVERS = sDRIVERS & "drivers\" FileDelete(sDRIVERS & "ibbus.sys") + FileDelete(sDRIVERS & "ibiou.sys") FileDelete(sDRIVERS & "mthca.sys") + FileDelete(sDRIVERS & "mlx4_bus.sys") + FileDelete(sDRIVERS & "mlx4_hca.sys") + FileDelete(sDRIVERS & "ipoib.sys") FileDelete(sDRIVERS & "ibsrp.sys") FileDelete(sDRIVERS & "vnic.sys") @@ -224,6 +230,8 @@ Function RemoveDriverFiles() FileDelete(dllCache & "complibd.dll") FileDelete(dllCache & "mthcau.dll") FileDelete(dllCache & "mthcaud.dll") + FileDelete(dllCache & "mlx4u.dll") + FileDelete(dllCache & "mlx4ud.dll") FileDelete(dllCache & "IbInstaller.dll") FileDelete(dllCache & "ibwsd.dll") FileDelete(dllCache & "ibsrp.dll") @@ -235,6 +243,8 @@ Function RemoveDriverFiles() FileDelete(sSystem64Folder & "complibd.dll") FileDelete(sSystem64Folder & "mthcau.dll") FileDelete(sSystem64Folder & "mthcaud.dll") + FileDelete(sSystem64Folder & "mlx4u.dll") + FileDelete(sSystem64Folder & "mlx4ud.dll") FileDelete(sSystem64Folder & "IbInstaller.dll") FileDelete(sSystem64Folder & "ibwsd.dll") FileDelete(sSystem64Folder & "ibsrp.dll") @@ -250,6 +260,8 @@ Function RemoveDriverFiles() FileDelete(sSystemFolder & "complibd.dll") FileDelete(sSystemFolder & "mthcau.dll") FileDelete(sSystemFolder & "mthcaud.dll") + FileDelete(sSystemFolder & "mlx4u.dll") + FileDelete(sSystemFolder & "mlx4ud.dll") FileDelete(sSystemFolder & "ibsrp.dll") FileDelete(sSystemFolder & "ibsrpd.dll") FileDelete(sSystemFolder & "IbInstaller.dll") @@ -558,13 +570,20 @@ End Function ''''''''''' Driver Install '''''''''''' +' For installer error codes see +' http://msdn2.microsoft.com/en-us/library/aa368542(VS.85).aspx Function DriverInstall() + const ERROR_INSTALL_SOURCE_ABSENT = 1612 ' missing files to install, + ' invalid feature selection. + const ERROR_INSTALL_FAILURE = 1603 ' fatal error during installation + const ERROR_FUNCTION_FAILED = 1627 ' function failed during execution + MTARCH = Architecture Dim PropArray, devID, devman, devmanEXE, devmanNET, devmanQL - Dim rc, CheckMode, sInstalldir, fso + Dim rc, cmd, CheckMode, sInstalldir, fso, DrvInstalled ' Get the value of INSTALLDIR CheckMode = Session.Property("CustomActionData") @@ -585,6 +604,7 @@ Function DriverInstall() devmanEXE = sInstalldir & "IBcore\devman.exe " devmanEXE1 = "..\IBcore\devman.exe " devman = "cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe " + devmanCX = "cmd.exe /c cd " & sInstalldir & "ConnectX & " & devmanEXE1 devmanNET = "cmd.exe /c cd " & sInstalldir & "net & " & devmanEXE1 devmanQL = "cmd.exe /c cd " & sInstalldir & "qlgcvnic & " & devmanEXE1 devmanSRP = "cmd.exe /c cd " & sInstalldir & "SRP & " & devmanEXE1 @@ -612,19 +632,68 @@ Function DriverInstall() Exit Function End if - ' Install HCA Driver - Return = WshShell.Run (devman & "update mthca.inf PCI\VEN_15B3", 0, true) - ' Display error number and description if applicable - If Err Then ShowError - If Return <> 0 Then - msgbox "Driver Install HCA - update mthca.inf PCI\VEN_15b3 Ret=" _ - & Return & " Err=" & Err - DriverInstall=Return - ' cleanup device database. - Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true) - Exit Function + ' Install an HCA (Host Channel Adapter) Driver + + DrvInstalled = false + + ' XXX temp until Mx support for mthca & mlx4_hca co-loading works + ' [4-16-08] stan + + If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") And _ + fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then + msgbox "HCA Driver - Error: loading InfiniHost and ConnectX " _ + & "Not Supported." + DriverInstall=ERROR_INSTALL_FAILURE + Exit Function + End If + + ' InfiniHost HCA? + If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then + Return = WshShell.Run (devman & "update mthca.inf PCI\VEN_15B3",0,true) + ' Display error number and description if applicable + If Err Then ShowError + If Return <> 0 Then + msgbox "HCA Install - update mthca.inf PCI\VEN_15b3 Ret=" _ + & Return & " Err=" & Err + DriverInstall=ERROR_INSTALL_FAILURE + ' cleanup device database. + Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true) + Exit Function + End if + DrvInstalled = true End if + ' ConnectX HCA? + If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then + ' WORKAROUND - force load ibbus driver + cmd = devman & "install ib_bus.inf {94f41ced-78eb-407c-b5df-958040af0fd8}" + Return = WshShell.Run (cmd,0,true) + ' END-WORKAROUND + cmd = devman & "update mlx4_bus.inf PCI\VEN_15B3" + Return = WshShell.Run (cmd,0,true) + cmd = devman & "update mlx4_hca.inf MLX4\CONNECTX_HCA" + Return = WshShell.Run (cmd,0,true) + ' Display error number and description if applicable + If Err Then ShowError + If Return <> 0 Then + msgbox "HCA Install - update mlx4_hca.inf MLX4\CONNECTX_HCA Ret=" _ + & Return & " Err=" & Err + DriverInstall=ERROR_INSTALL_FAILURE + ' cleanup device database. + Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true) + Exit Function + End if + DrvInstalled = true + End if + + if DrvInstalled = false Then + msgbox "Driver Install - No HCA Driver Selected to Install?" & _ + " Aborting Installation." + ' Force installer cleanup (real magic). + DriverInstall=ERROR_INSTALL_SOURCE_ABSENT + Exit Function + End if + ' Check/install IPoIB driver If fso.FileExists(sInstalldir & "net\netipoib.inf") Then rc = WshShell.Run (devmanNET & "update netipoib.inf IBA\IPoIB",0,true) diff --git a/branches/WinOF/WIX/README.txt b/branches/WinOF/WIX/README.txt index 38ace4e0..4a60b68a 100644 --- a/branches/WinOF/WIX/README.txt +++ b/branches/WinOF/WIX/README.txt @@ -1,4 +1,4 @@ -[2-11-08] +[4-11-08] How to generate a Windows OpenFabrics Release (WinOF) using the WIX 2.0 open source installer tool set ( http://sourceforge.net/projects/wix/ ). diff --git a/branches/WinOF/WIX/README_release.txt b/branches/WinOF/WIX/README_release.txt index d0078cb5..8e4438ad 100644 --- a/branches/WinOF/WIX/README_release.txt +++ b/branches/WinOF/WIX/README_release.txt @@ -1,45 +1,36 @@ -[03-11-08] WinOF 1.1 release +[04-28-08] WinOF 1.1 release -Summary Changes since WinOF [1.0.1] (svn.864) ------------------------ +WinOF 1.1 Summary Changes +------------------------- -0) WinOF 1.1 based on openib-windows src revision XXX. +1) WinOF 1.1 release based on openib-windows svn source revision (braanches\WOF1-1 1089). + WinOF 1.0.1 release based on svn 864. -1) WinOF 1.1 installer based on open source WIX 2.0 (Windows Installer XML) technology. - - Complete WIX installer source in openib-windows subversion src tree (branches). - InstallShield is no longer required; WIX is free open source. +2) Stability enhancements in : + IB Core + IPoIB + WSD + QLogic VNIC & SRP + DAT/DAPL -2) manual.htm updates on - - IB SDK (Software Development Kit) - - Qlogic VNic +3) New Functionality -3) Release_notes_1-1.htm updates - - ? + Host CHannel Adapter device driver selection: -4) DAT/DAPL 2.0 runtime libraries released with InfiniBand extended operations for - - RDMA write with Immediate data - - Atomic Compare and Swap - - Atomic Fetch and Add + Mellanox InfiniHost HCA products + + Mellanox ConnectX (MT25408) SDR Channel Adapter -5) DAT/DAPL Application Build environments. - - documented in manual.htm - - Optional Header files in %SystemDrive%\DAT\v{1/2}\DAT + DAT/DAPL + 2.0 source is the same as OFED 1.3 + DAPL v2 Socket CM available for Windows to Linux Dat interoperability. -6) WSD patches - - ? - -7) SRP patches - - ? - -8) IB Core - - NDI Microsoft NDI support? - -9) WinOF integrated into OpenFabrics Alliance download page. +3) WinOF integrated into OpenFabrics Alliance download page. - http://www.openfabrics.org/downloads/WinOF/v1.1 -10) WinOF symbol store available. +4) WinOF symbol store available. Point windbg at http://www.openfabrics.org/downloads/WinOF/v1.1/SymStor @@ -47,7 +38,7 @@ Summary Changes since WinOF [1.0.1] (svn.864) **** WARNING **** -After the WinOF.msi file has started execution, an errant +After the WinOF.msi file has started installation execution, an errant "Welcome to the Found New Hardware Wizard" window 'may' popup. Just 'cancel' the errant FNHW popup window in order to proceed with the installation. @@ -59,7 +50,8 @@ If the install appears to hang, look around for popup windows requesting input which are covered. -Please read the Release_notes_1-1.htm file and make sure your HCA firmware is recent. - +Please: + read the Release_notes.htm file! + make 'sure' your HCA firmware is recent; vstat.exe will display HCA firmware version. thank you. diff --git a/branches/WinOF/WIX/Release_notes.htm b/branches/WinOF/WIX/Release_notes.htm index 6e974176..213c4d6c 100644 --- a/branches/WinOF/WIX/Release_notes.htm +++ b/branches/WinOF/WIX/Release_notes.htm @@ -89,7 +89,7 @@ src=openfabrics.gif>

1.1 Release Notes

-02/08/2008

+04/28/2008
@@ -107,7 +107,7 @@ InfiniBand fabric.

 Binary files generated from the openib-windows developers subversion (svn) source tree 'svn://openib.tc.cornell.edu' -(svn revision 864) +(branches\WOF1-1 svn revision 1089) are packaged into a WIX 2.0 (Windows Installer Xml) single file install package referred to as the Windows OpenFabrics (WinOF) release 1.1.
@@ -119,15 +119,22 @@ to numerous components:

-

Mellanox QA cycle -words?

-

 

The Windows OpenFabrics (WinOF) release package contains the following:
@@ -135,17 +142,19 @@ words?

OpenFabrics InfiniBand core drivers and Upper Level Protocols (ULPs):

@@ -209,7 +218,7 @@ supported devices below

Supported HCAs (Host Channel Adapters)

-

Mellanox (mthca.inf)

+

Mellanox

Both SDR and DDR mode of the InfiniHost III family are supported.

For official Firmware (FW) versions and update tools please see:
-http://www.mellanox.com/support/firmware_table.php

+http://www.mellanox.com/support/firmware_table.php
+Current HCA firmware version can be viewed from the 'vstat' command.

Supported Switches

@@ -245,6 +260,11 @@ tab-stops:list .5in'>

  • Flextronics

    • +
  • +

    Due to lack of hardware + accessibility, + other vendor switches have not been tested.

    +

    •  

    @@ -376,7 +396,8 @@ built from driver source which has been WHQL'ed.

     

    DAT & uDAPL Configuration

    @@ -757,17 +780,7 @@ Once completed, the "New Hardware Found" Wizard pops up again.

  • The latest round of MS patches to Window Server 2003 (R2) SP2 contain the WSD hotfix which addresses observed WSD problems in pre SP2 - Windows Server 2003. Most users will not need to apply this hotfix.
    -
    - The Windows - OpenFabrics release includes a WSD provider library that has been - extensively tested with Microsoft Windows Server 2003 (pre SP2).
    - During testing, bugs where found in the WSD switch that could lead to hangs, - crashes, data corruption, and other unwanted behavior. Microsoft released a - hotfix to address these issues which should be installed if using WSD.
    - The Microsoft Windows Server 2003 hotfix for WSD can be located - here.
    -
     
     

    • + Windows Server 2003. Most users will not need to apply this hotfix.
     
     


     

    diff --git a/branches/WinOF/WIX/build-MSI.bat b/branches/WinOF/WIX/build-MSI.bat index 39baabdb..d869b5fb 100644 --- a/branches/WinOF/WIX/build-MSI.bat +++ b/branches/WinOF/WIX/build-MSI.bat @@ -27,6 +27,19 @@ if NOT EXIST %CD%\bin\HCA\amd64 ( exit /B ) +REM ************ +rem include WDK built ConnectX files +echo Staging ConnectX files +if EXIST %CD%\bin\ConnectX ( + del /F/S/Q %CD%\bin\ConnectX > %TEMP%\jnk.txt + del %TEMP%\jnk.txt + rmdir /S/Q %CD%\bin\ConnectX +) +call StageConnectX +echo Done - Staging ConnectX files +rem ************ + + if EXIST ia64\WOF_ia64.msi del /Q /F ia64\WOF_ia64.msi if EXIST x64\WOF_x64.msi del /Q /F x64\WOF_x64.msi if EXIST x86\WOF_x86.msi del /Q /F x86\WOF_x86.msi diff --git a/branches/WinOF/WIX/build-OFA-dist.bat b/branches/WinOF/WIX/build-OFA-dist.bat index a3275c4b..50b9f2d4 100644 --- a/branches/WinOF/WIX/build-OFA-dist.bat +++ b/branches/WinOF/WIX/build-OFA-dist.bat @@ -1,34 +1,42 @@ @echo off setlocal 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 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. + +rem Assumes .\WinOF_Release-ID_arch (3 total) folders exist. These arch specific +rem folders are populated by hand! + +rem Assume 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\branches\WinOF\Wix rem -rem mkDist release_ID {target_path} +rem build-OFA-dist release_ID {target_path} rem -rem example mkDist 1.1 C:\tmp +rem example build-OFA-dist 1.1 C:\tmp rem # if target_path is null then default %SystemRoot%\temp\v%1 rem # otherwise %2\v%1 if "%1" == "" ( - echo "Missing release ID, example %0 1.1" + echo "Missing release ID, example %0 1-1" echo "usage: %0 release_ID {target_path, default: %SystemRoot%\temp} exit /B 1 ) set ID=%1 -if not "%2" == "" ( - set DST=%2\v%ID% -) else ( - set DST=%SystemRoot%\temp\v%ID% -) +rem set DSTx86=%CD%\WinOF_%ID%_x86 +set DSTx86=WinOF_%ID%_x86 +set DSTx64=WinOF_%ID%_x64 +set DSTia64=WinOF_%ID%_ia64 rem where gen1\trunk\buildRelease.bat stored .msi installer files. set MSI=%SystemRoot%\temp +set WZ="C:\Program Files (x86)\WinZip\WZZIP.EXE" +set ZIP=%MSI%\WinOF_dist_v%ID%.zip + rem MUST execute from gen1\branches\WinOF\WIX set RBIN=%CD%\bin @@ -38,66 +46,85 @@ if NOT EXIST %RBIN%\bin ( exit /B 1 ) -set PGM="C:\Program Files\Debugging Tools for Windows 64-bit"\symstore.exe -set SS=%DST%\SymStor - -if NOT EXIST %PGM% ( - echo Missing installation of MS Debug tools @ - echo %PGM% - exit /B 1 -) - -rem Assumption is the arch specific installer zip packages have been previously -rem constructed. - -set WIXLAND=%CD% -if not EXIST WinOF_%ID%_x64.zip ( - echo missing WinOF zip package: WinOF_%ID%_x64.zip +echo Building target %DSTx86% +rmdir /S /Q %DSTx86% +mkdir %DSTx86% +if NOT EXIST %DSTx86% ( + echo Unable to create %DSTx86% ? exit /B 1 ) -if not EXIST WinOF_%ID%_x86.zip ( - echo missing WinOF arch package: WinOF_%ID%_x86.zip - exit /B 1 -) -if not EXIST WinOF_%ID%_ia64.zip ( - echo missing WinOF arch package: WinOF_%ID%_ia64.zip +copy README_release.txt %DSTX86%\README.txt +if ERRORLEVEL 1 ( + echo Err - missing file README_release.txt ? exit /B 1 ) +copy /B openfabrics.gif %DSTX86%\openfabrics.gif +copy release_notes.htm %DSTX86%\release_notes.htm -echo "Creating WinOF downloadable distribution in" -echo " %DST%" -echo " from binaries in" -echo " %RBIN%" -if EXIST "%DST%" ( - echo rmdir %DST% - rmdir /S /Q %DST% -) -if EXIST "%DST%" ( - echo Failed to remove %DST% +echo Building target %DSTx64% +rmdir /S /Q %DSTx64% +mkdir %DSTx64% +if NOT EXIST %DSTx64% ( + echo Unable to create %DSTx64% ? exit /B 1 ) -mkdir %DST% -if ERRORLEVEL 1 ( - echo "mkdir %DST% error %ERRORLEVEL% ?" +copy README_release.txt %DSTX64%\README.txt +copy /B openfabrics.gif %DSTX64%\openfabrics.gif +copy release_notes.htm %DSTX64%\release_notes.htm + + +echo Building target %DSTia64% +rmdir /S /Q %DSTia64% +mkdir %DSTia64% +if NOT EXIST %DSTia64% ( + echo Unable to create %DSTia64% ? exit /B 1 ) +copy README_release.txt %DSTia64%\README.txt +copy /B openfabrics.gif %DSTia64%\openfabrics.gif +copy release_notes.htm %DSTia64%\release_notes.htm -mkdir %SS% -mkdir %DST%\Installers -echo Generating Symbol store +copy /B /Y %MSI%\WOF_x86.msi %DSTx86%\WinOF_%ID%_x86.msi +copy /B /Y %MSI%\WOF_x64.msi %DSTx64%\WinOF_%ID%_x64.msi +copy /B /Y %MSI%\WOF_ia64.msi %DSTia64%\WinOF_%ID%_ia64.msi -%PGM% add /r /f %RBIN% /s %SS% /t "WinOF" /v "version %ID%" -echo Generating arch releases +echo Generate compressed arch folders -copy WinOF_%ID%_x64.zip %DST%\Installers -copy WinOF_%ID%_x86.zip %DST%\Installers -copy WinOF_%ID%_ia64.zip %DST%\Installers +if EXIST %DSTx86%.zip del /F /Q %DSTx86%.zip +if EXIST %DSTx64%.zip del /F /Q %DSTx64%.zip +if EXIST %DSTia64%.zip del /F /Q %DSTia64%.zip -echo "Results in %DST%" +if NOT EXIST %WZ% ( + echo Missing WinZip pro [cmd-line interface] + echo Please manually create the following archives: + echo %DSTx86%.zip + echo %DSTx64%.zip + echo %DSTia64%.zip + echo . +) else ( + %WZ% -P -r %DSTx86%.zip %DSTx86% + %WZ% -P -r %DSTx64%.zip %DSTx64% + %WZ% -P -r %DSTia64%.zip %DSTia64% + + if NOT EXIST zip-OFA-dist.bat ( + echo .\zip-OFA-dist.bat script missing? + exit /B 1 + ) + echo Generating %MSI%\v%ID% + call zip-OFA-dist %ID% + pushd %MSI% + echo Generating %ZIP% + if EXIST %ZIP% ( + rmdir /Q /S %ZIP% + ) + %WZ% -P -r %ZIP% v%ID% + popd + echo WinOF v%ID% distribution @ %ZIP% +) endlocal exit /B 0 diff --git a/branches/WinOF/WIX/ia64/devman.exe b/branches/WinOF/WIX/ia64/devman.exe index 5ac5b7c4..e55b0f72 100644 Binary files a/branches/WinOF/WIX/ia64/devman.exe and b/branches/WinOF/WIX/ia64/devman.exe differ diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs index 96976b70..60232846 100644 --- a/branches/WinOF/WIX/ia64/wof.wxs +++ b/branches/WinOF/WIX/ia64/wof.wxs @@ -1,9 +1,9 @@ - + + Value="1" + @@ -210,7 +216,7 @@ - + + + @@ -289,6 +299,63 @@ LongName="mthcaud.dll" Name="MTHCAUD.DLL" Source="..\bin\HCA\ia64\mthcaud.dll" /> + + + @@ -970,13 +1037,36 @@ + + + + + + + + + + + - diff --git a/branches/WinOF/WIX/x64/devman.exe b/branches/WinOF/WIX/x64/devman.exe index 3da88705..805c64ad 100644 Binary files a/branches/WinOF/WIX/x64/devman.exe and b/branches/WinOF/WIX/x64/devman.exe differ diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs index 7df6b6ec..226d6a4f 100644 --- a/branches/WinOF/WIX/x64/wof.wxs +++ b/branches/WinOF/WIX/x64/wof.wxs @@ -3,7 +3,7 @@ WinOF 1.0.1 for x64 Win2K3 or XP --> - + + Value="1" + @@ -112,8 +118,8 @@ LongName="Release_notes.htm" Name="RELEASE_.HTM" Source="..\Release_notes.htm" /> - @@ -128,10 +134,10 @@ IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" /> @@ -209,8 +215,8 @@ Remove='uninstall' /> - - + + + + @@ -290,6 +300,60 @@ LongName="mthcaud.dll" Name="MTHCAUD.DLL" Source="..\bin\HCA\amd64\mthcaud.dll" /> + + + + + + + + + + + + + + + + + + + + + @@ -978,13 +1042,34 @@ + + + + + + + + + + + + + - diff --git a/branches/WinOF/WIX/x86/devman.exe b/branches/WinOF/WIX/x86/devman.exe index 28e9b45e..79c11059 100644 Binary files a/branches/WinOF/WIX/x86/devman.exe and b/branches/WinOF/WIX/x86/devman.exe differ diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs index 0b0e6e98..6ca442b2 100644 --- a/branches/WinOF/WIX/x86/wof.wxs +++ b/branches/WinOF/WIX/x86/wof.wxs @@ -4,7 +4,7 @@ --> - Privileged - + - - + + + + + + Value="1" + + @@ -202,8 +213,8 @@ Remove='uninstall' /> - - + + + + @@ -252,6 +267,47 @@ LongName="mthcaud.dll" Name="MTHCAUD.DLL" Source="..\bin\HCA\x86\mthcaud.dll" /> + + + + + + + + + + + + + + + @@ -883,13 +939,34 @@ + + + + + + + + + + + + + -