[WInOF]

  buildall.bat - us %systemroot%\temp as the default store for .msi files
  CustomActions.vbs - support Qlogic VNIC & SRP install/uninstall - SRP untested at this juncture
  [ia64,x86,x64]/\wof.wxs - IB SDK feature moved to end of feature listing.
  mk-OFA-dist.bat - script to generate a .zip file for OFA download distribution
  mkarchfiles.bat - script to create separate .zip files for each architecture.

git-svn-id: svn://openib.tc.cornell.edu/gen1@946 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs
index 52f355c5f07cc375d76889f0abc944be0b0f29fa..f4eaacf2373acb0ffec62fde998a3a39f86506b4 100644 (file)
--- a/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WinOF/WIX/CustomActions.vbs
@@ -92,11 +92,11 @@ Function FileMDelete(filename)
        On Error Resume Next \r
     Err.clear\r
     If fso.FileExists(filename) Then\r
-      Set WshShell = CreateObject("WScript.Shell")\r
-      Return = WshShell.Run ("cmd.exe /c del /Q /F " & filename, 0, true)\r
-      If Err Then\r
-               ErrMsg ("Could not delete: " & filename)\r
-      End If \r
+       Set WshShell = CreateObject("WScript.Shell")\r
+       Return = WshShell.Run ("cmd.exe /c del /Q /F " & filename, 0, true)\r
+       If Err Then\r
+          ErrMsg ("Could not delete: " & filename)\r
+       End If \r
     End If\r
 End Function\r
 \r
@@ -178,34 +178,29 @@ End Sub
 ' the driver files are correctly remove?\r
  \r
 Function RemoveDriverFiles()\r
-       Dim Win\r
-       Dim sDRIVERS\r
-    Dim sSystem64Folder    \r
-       Dim sInstalldir\r
-       Dim sSystemFolder\r
+    Dim Win, sDRIVERS, sSystem64Folder, sInstalldir\r
+    Dim sSystemFolder, CheckMode, PropArray\r
        \r
-       ' Function can be called from the Driver{Install/Uninstall} rtns.\r
-       ' (properties are different).\r
-       dim CheckMode\r
-       CheckMode = Session.Property("CustomActionData")\r
-       If Not CheckMode = "" Then\r
-               Dim PropArray\r
-               PropArray = Split(Session.Property("CustomActionData"), ";") \r
-               Win = PropArray(3)\r
+    ' Function can be called from the Driver{Install/Uninstall} rtns.\r
+    ' (properties are different).\r
+    CheckMode = Session.Property("CustomActionData")\r
+    If Not CheckMode = "" Then\r
+       PropArray = Split(Session.Property("CustomActionData"), ";") \r
+       Win = PropArray(3)\r
        sSystem64Folder = PropArray(2)\r
-               sSystemFolder = PropArray(1)\r
-               sInstalldir = PropArray(0)\r
-       Else\r
-               Win = Session.Property("WindowsFolder")\r
+       sSystemFolder = PropArray(1)\r
+       sInstalldir = PropArray(0)\r
+    Else\r
+       Win = Session.Property("WindowsFolder")\r
        sSystem64Folder = Session.Property("System64Folder") \r
-               sInstalldir = Session.Property("INSTALLDIR") \r
-               sSystemFolder = Session.Property("SystemFolder") \r
-       End if\r
+       sInstalldir = Session.Property("INSTALLDIR") \r
+       sSystemFolder = Session.Property("SystemFolder") \r
+    End if\r
            \r
     MTARCH = Architecture \r
     sDRIVERS = sSystem64Folder \r
     If (MTARCH="x86") Then\r
-      sDRIVERS = sSystemFolder  ' holds Session.Property("SystemFolder")\r
+        sDRIVERS = sSystemFolder  ' holds Session.Property("SystemFolder")\r
     End If\r
     sDRIVERS = sDRIVERS & "drivers\"\r
 \r
@@ -217,49 +212,49 @@ Function RemoveDriverFiles()
     FileDelete(sDRIVERS & "qlgcvnic.sys")\r
     \r
     If (MTARCH="amd64") Then\r
-       ' System64Folder = System32, SystemFolder = SysWOW64\r
-               ' check/remove from .dll cache prior to removal from system32\\r
-               Dim dllCache\r
+        ' System64Folder = System32, SystemFolder = SysWOW64\r
+        ' check/remove from .dll cache prior to removal from system32\\r
+        Dim dllCache\r
         dllCache = sSystem64Folder & "dllcache\"\r
-       FileDelete(dllCache & "ibal.dll")\r
-               FileDelete(dllCache & "ibald.dll")\r
-               FileDelete(dllCache & "complib.dll")\r
-               FileDelete(dllCache & "complibd.dll")\r
-               FileDelete(dllCache & "mthcau.dll")\r
-               FileDelete(dllCache & "mthcaud.dll")\r
-               FileDelete(dllCache & "IbInstaller.dll")\r
-               FileDelete(dllCache & "ibwsd.dll")\r
-               FileDelete(dllCache & "ibsrp.dll")\r
-               FileDelete(dllCache & "ibsrpd.dll")\r
+        FileDelete(dllCache & "ibal.dll")\r
+        FileDelete(dllCache & "ibald.dll")\r
+        FileDelete(dllCache & "complib.dll")\r
+        FileDelete(dllCache & "complibd.dll")\r
+        FileDelete(dllCache & "mthcau.dll")\r
+        FileDelete(dllCache & "mthcaud.dll")\r
+        FileDelete(dllCache & "IbInstaller.dll")\r
+        FileDelete(dllCache & "ibwsd.dll")\r
+        FileDelete(dllCache & "ibsrp.dll")\r
+        FileDelete(dllCache & "ibsrpd.dll")\r
                \r
-               FileDelete(sSystem64Folder & "ibal.dll")\r
-               FileDelete(sSystem64Folder & "ibald.dll")\r
-               FileDelete(sSystem64Folder & "complib.dll")\r
-               FileDelete(sSystem64Folder & "complibd.dll")\r
-               FileDelete(sSystem64Folder & "mthcau.dll")\r
-               FileDelete(sSystem64Folder & "mthcaud.dll")\r
-               FileDelete(sSystem64Folder & "IbInstaller.dll")\r
-               FileDelete(sSystem64Folder & "ibwsd.dll")\r
-               FileDelete(sSystem64Folder & "ibsrp.dll")\r
-               FileDelete(sSystem64Folder & "ibsrpd.dll")\r
+        FileDelete(sSystem64Folder & "ibal.dll")\r
+        FileDelete(sSystem64Folder & "ibald.dll")\r
+        FileDelete(sSystem64Folder & "complib.dll")\r
+        FileDelete(sSystem64Folder & "complibd.dll")\r
+        FileDelete(sSystem64Folder & "mthcau.dll")\r
+        FileDelete(sSystem64Folder & "mthcaud.dll")\r
+        FileDelete(sSystem64Folder & "IbInstaller.dll")\r
+        FileDelete(sSystem64Folder & "ibwsd.dll")\r
+        FileDelete(sSystem64Folder & "ibsrp.dll")\r
+        FileDelete(sSystem64Folder & "ibsrpd.dll")\r
     End If         \r
     \r
     ' MTARCH=x86 SystemFolder = System32\r
     ' MTARCH=amd64 SystemFolder = Syswow64\r
 \r
-       FileDelete(sSystemFolder & "ibal.dll")\r
-       FileDelete(sSystemFolder & "ibald.dll")\r
-       FileDelete(sSystemFolder & "complib.dll")\r
-       FileDelete(sSystemFolder & "complibd.dll")\r
-       FileDelete(sSystemFolder & "mthcau.dll")\r
-       FileDelete(sSystemFolder & "mthcaud.dll")\r
-       FileDelete(sSystemFolder & "ibsrp.dll")\r
-       FileDelete(sSystemFolder & "ibsrpd.dll")\r
-       FileDelete(sSystemFolder & "IbInstaller.dll")\r
-       FileDelete(sSystemFolder & "ibwsd.dll")\r
-       \r
-       FileDelete(Win & "lastgood\system32\ibwsd.dll")\r
-       FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll")\r
+    FileDelete(sSystemFolder & "ibal.dll")\r
+    FileDelete(sSystemFolder & "ibald.dll")\r
+    FileDelete(sSystemFolder & "complib.dll")\r
+    FileDelete(sSystemFolder & "complibd.dll")\r
+    FileDelete(sSystemFolder & "mthcau.dll")\r
+    FileDelete(sSystemFolder & "mthcaud.dll")\r
+    FileDelete(sSystemFolder & "ibsrp.dll")\r
+    FileDelete(sSystemFolder & "ibsrpd.dll")\r
+    FileDelete(sSystemFolder & "IbInstaller.dll")\r
+    FileDelete(sSystemFolder & "ibwsd.dll")\r
+\r
+    FileDelete(Win & "lastgood\system32\ibwsd.dll")\r
+    FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll")\r
     \r
     ' delete opensm files\r
     Dim fso\r
@@ -286,19 +281,20 @@ Function RemoveDriverFiles()
     PFILES = Split(PnfFiles,vbCrLf)\r
     \r
     For Each file in IFILES\r
-       If (file <> "") Then\r
-               FileDelete(file)\r
-       End IF\r
+        If (file <> "") Then\r
+            FileDelete(file)\r
+        End IF\r
     Next\r
     \r
     For Each file in PFILES\r
        If (file <> "") Then\r
-               FileDelete(file)\r
+            FileDelete(file)\r
        End IF\r
     Next\r
     \r
 End Function\r
 \r
+\r
 ''''''''''' Delete registry key ''''''''''''\r
 \r
 Function DeleteRegKey(KeyPath)\r
@@ -589,6 +585,7 @@ Function DriverInstall()
     devman =    "cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe "\r
     devmanNET = "cmd.exe /c cd " & sInstalldir & "net & " & devmanEXE1\r
     devmanQL =  "cmd.exe /c cd " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
+    devmanSRP =  "cmd.exe /c cd " & sInstalldir & "SRP & " & devmanEXE1\r
 \r
     Uninstall_IB_Devices(sInstalldir) \r
 \r
@@ -605,7 +602,7 @@ Function DriverInstall()
 \r
     ' rescan system buses\r
     Return = WshShell.Run (devman & "rescan", 0, true)\r
-       ' Display error number and description if applicable\r
+    ' Display error number and description if applicable\r
     If Err Then ShowError\r
     If Return <> 0 Then\r
         msgbox "Driver Install - HCA Ret " & Return & " Err " & Err\r
@@ -615,9 +612,8 @@ Function DriverInstall()
                \r
     ' Install HCA Driver\r
     Return = WshShell.Run (devman & "update mthca.inf PCI\VEN_15B3", 0, true)\r
-       ' Display error number and description if applicable\r
+    ' Display error number and description if applicable\r
     If Err Then ShowError\r
-\r
     If Return <> 0 Then\r
         msgbox "Driver Install - HCA Ret " & Return & " Err " & Err\r
         DriverInstall=Return\r
@@ -630,45 +626,9 @@ Function DriverInstall()
        If Err Then ShowError\r
     End If\r
     \r
-   ' Copy 32 bit dlls on 64-bit architectures\r
-   ' PropArray() 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder 3-WindowsFolder\r
-\r
-    If (MTARCH="amd64") Then\r
-               Dim SYSWOW\r
-       SYSWOW = PropArray(1)  \r
-\r
-' following file copies relocated to .wxs file so they can be uninstalled \r
-' correctly, otherwise, using this approach the files reamin when uninstalled.\r
-\r
-if False then\r
-    msgbox "DriverInstall PA(1) " & SYSWOW & " PA(2) " & PropArray(2)\r
-    if fso.FileExists(sInstalldir & "IBcore\cl32.dll") then\r
-        fso.CopyFile sInstalldir & "IBcore\cl32.dll", SYSWOW & "complib.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "IBcore\cl32d.dll") then\r
-       fso.CopyFile sInstalldir & "IBcore\cl32d.dll", SYSWOW & "complibd.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "IBcore\ibal32.dll") then\r
-       fso.CopyFile sInstalldir & "IBcore\ibal32.dll", SYSWOW & "ibal.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "IBcore\ibal32d.dll") then\r
-       fso.CopyFile sInstalldir & "IBcore\ibal32d.dll", SYSWOW & "ibald.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "IBcore\mtuvpd32.dll") then\r
-       fso.CopyFile sInstalldir & "IBcore\mtuvpd32.dll", SYSWOW & "mthcau.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "IBcore\mtuvpd32d.dll") then\r
-       fso.CopyFile sInstalldir & "IBcore\mtuvpd32d.dll",SYSWOW & "mthcaud.dll"\r
-    end if\r
-    if fso.FileExists(sInstalldir & "net\ibwsd32.dll") then\r
-       fso.CopyFile sInstalldir & "net\ibwsd32.dll", SYSWOW & "ibwsd.dll"\r
-    end if\r
-end if  ' XXX\r
-    End If ' MTARCH\r
-\r
     ' Install Qlogic VNIC Driver\r
-    if fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") Then\r
-        devID = "IBA\V00066aP00000030"\r
+    If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") Then\r
+        devID = "IBA\V00066AP00000030"\r
         Err.clear\r
         Return = WshShell.Run (devmanQL & "disable " & devID, 0, true)\r
 \r
@@ -676,8 +636,22 @@ end if  ' XXX
 \r
        ' Display error number and description if applicable\r
         If Err Then ShowErr2("qlgcvnic\qlgcvnic.sys")\r
+\r
+        Return = WshShell.Run (devmanQL & "enable " & devID, 0, true)\r
     End if\r
        \r
+    ' Install SRP (SCSI RDMA Protocol) Driver\r
+    If fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then\r
+        Err.clear\r
+        ' QLogic Virtual FC I/O controller or\r
+        'InfiniBand SRP Miniport: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+        ' one driver handles all three.\r
+        devID = "IBA\V00066AP00000038"\r
+        Return = WshShell.Run (devmanSRP & "update ib_srp.inf " & devID,0,true)\r
+        ' Display error number and description if applicable\r
+        If Err Then ShowErr2("SRP\ib_srp.inf")\r
+    End if\r
+\r
     ' append [INSTALLDIR] to system search path\r
     ' WIX <Environment> now does this \r
     ' SysPathAdd(sInstalldir)\r
@@ -791,42 +765,44 @@ Function Uninstall_IB_Devices(sInstalldir)
       devices = FindDevices\r
       \r
       ' Remove IPoIB Adapter instances\r
-         for each deviceCan in devices\r
-               if (Instr(deviceCan,"IBA\IPOIB")) Then\r
-                       device = split(deviceCan, " ")\r
-                       ' Removing\r
-                'msgbox "RmDev " & device(0) ' XXX\r
-               Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-               End if\r
-         Next\r
+      For each deviceCan in devices\r
+          If (Instr(deviceCan,"IBA\IPOIB")) Then\r
+              device = split(deviceCan, " ")\r
+              ' Remove IPoIB instance\r
+             Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
+          End if\r
+      Next\r
 \r
-         ' Removing SRP - Search for I/O UNIT and then remove it.\r
-         for each deviceCan in devices\r
-               if (Instr(deviceCan,"InfiniBand I/O Unit")) Then\r
-                    device = split(deviceCan, " ")\r
-                    ' Removing I/O Unit of the SRP\r
-                    Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-               End if\r
-         Next\r
+      ' Remove SRP device - QLogic Virtual FC I/O controller instance?\r
+      For each deviceCan in devices\r
+          If (Instr(deviceCan,"IBA\V00066AP00000038")) Then\r
+              device = split(deviceCan, " ")\r
+              ' Removing I/O Unit of the SRP\r
+              Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
+          End if\r
+      Next\r
 \r
-         ' Remove VNIC instances\r
-         for each deviceCan in devices\r
-               if (Instr(deviceCan,"IBA\QLCGVNIC")) Then\r
-                    device = split(deviceCan, " ")\r
-                    ' Removing I/O Unit of the SRP\r
-                    Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-               End if\r
-         Next\r
-         \r
-         ' Removing SRP - Searching for SRP devices.\r
-         for each deviceCan in devices\r
-               if (Instr(deviceCan,"SRP")) Then\r
-                    device = split(deviceCan, " ")\r
-                    ' Removing SRP\r
-                    Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-               End if\r
-         Next\r
+      ' Removing SRP miniport devices.\r
+      ' Either: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+      For each devTarget in devices\r
+          If (Instr(devTarget,"00C609EP0108")) Then\r
+              device = split(devTarget, " ")\r
+              ' Removing SRP\r
+              Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
+          End if\r
+      Next\r
 \r
+      ' Remove QLogic VNIC instances\r
+      For each devTarget in devices\r
+          If (Instr(devTarget,"IBA\V00066AP00000030")) Then\r
+              device = split(devTarget, ":")\r
+              dt = rtrim(device(0))\r
+              ' Removing the Qlogic Vnic I/O Unit\r
+msgbox "RmDev '" & dt & "'"\r
+              Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
+          End if\r
+      Next\r
+         \r
       Set objWshScriptExec = wshShell.Exec(devman & " FindAll * | FIND ""IPOIB""")\r
       If Err Then ShowError\r
       Set objStdOut = objWshScriptExec.StdOut\r

diff --git a/branches/WinOF/WIX/README_release_1-1.txt b/branches/WinOF/WIX/README_release_1-1.txt
deleted file mode 100644 (file)
index d0078cb..0000000
--- a/branches/WinOF/WIX/README_release_1-1.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-\r
-[03-11-08] WinOF 1.1 release\r
-\r
-\r
-Summary Changes since WinOF [1.0.1] (svn.864)\r
------------------------\r
-\r
-0) WinOF 1.1 based on openib-windows src revision XXX.\r
-\r
-1) WinOF 1.1 installer based on open source WIX 2.0 (Windows Installer XML) technology.\r
-   - Complete WIX installer source in openib-windows subversion src tree (branches).\r
-     InstallShield is no longer required; WIX is free open source.\r
-\r
-2) manual.htm updates on\r
-   - IB SDK (Software Development Kit)\r
-   - Qlogic VNic\r
-\r
-3) Release_notes_1-1.htm updates\r
-   - ?\r
-\r
-4) DAT/DAPL 2.0 runtime libraries released with InfiniBand extended operations for\r
-   - RDMA write with Immediate data\r
-   - Atomic Compare and Swap\r
-   - Atomic Fetch and Add\r
-\r
-5) DAT/DAPL Application Build environments.\r
-   - documented in manual.htm\r
-   - Optional Header files in %SystemDrive%\DAT\v{1/2}\DAT\r
-\r
-6) WSD patches\r
-   - ?\r
-\r
-7) SRP patches\r
-   - ?\r
-\r
-8) IB Core\r
-   - NDI Microsoft NDI support?\r
-\r
-9)  WinOF integrated into OpenFabrics Alliance download page.\r
-   - http://www.openfabrics.org/downloads/WinOF/v1.1\r
-\r
-10) WinOF symbol store available.\r
-    Point windbg at http://www.openfabrics.org/downloads/WinOF/v1.1/SymStor\r
-\r
-\r
-\r
-\r
-**** WARNING ****\r
-\r
-After the WinOF.msi file has started execution, an errant\r
-"Welcome to the Found New Hardware Wizard" window 'may' popup.\r
-\r
-Just 'cancel' the errant FNHW popup window in order to proceed with the installation.\r
-\r
-You do need to answer 'Yes' or 'Continue' to those popup windows which refere to\r
-non-signed drivers.\r
-\r
-If the install appears to hang, look around for popup windows requesting input\r
-which are covered.\r
-\r
-\r
-Please read the Release_notes_1-1.htm file and make sure your HCA firmware is recent.\r
-\r
-\r
-thank you.\r

diff --git a/branches/WinOF/WIX/buildall.bat b/branches/WinOF/WIX/buildall.bat
index 9644fa8011afe6fe3a0f699be2c7cf6a5e35a68d..79a2e240dde64cb3897b498dbe427583fbcaa6e2 100644 (file)
--- a/branches/WinOF/WIX/buildall.bat
+++ b/branches/WinOF/WIX/buildall.bat
@@ -7,7 +7,7 @@ rem usage: buildall {dest-path-for-msi-files}
 rem *** REQUIRES nmake, common invocation from Visual C or DDK command window\r
 \r
 if "%1" == "" (\r
-    set DST=D:\temp\r
+    set DST=%SystemRoot%\temp\r
 ) else (\r
     set DST=%1\r
 )\r

diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs
index 015c7108359313e6c2c2483a99a45d27258cbf1a..fbef1d37873e7f28eb0362f92c15d594fc4ff303 100644 (file)
--- a/branches/WinOF/WIX/ia64/wof.wxs
+++ b/branches/WinOF/WIX/ia64/wof.wxs
@@ -485,20 +485,17 @@
 \r
           <!-- RDMA SCSI over IB (aka SRP) -->\r
           <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="SRP_inf" Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
+            <Component Id="cSRP_driver"\r
+                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_srp.inf" Name="IB_SRP.INF"\r
                      Source="..\bin\storage\ib_srp.inf" />\r
-            </Component>\r
-            <Directory Id="ia64Dir" Name="ia64">\r
-              <Component Id="SRP_driver"\r
-                         Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">\r
-                <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
+              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\ia64\ibsrp.sys" />\r
-              </Component>\r
-            </Directory>\r
+             </Component>\r
           </Directory>\r
+\r
           <Component Id="OpenSM_Service_enabled"\r
                      Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
           </Component>\r
@@ -1058,8 +1055,8 @@
       </Feature>\r
     </Feature>\r
 \r
-    <Feature Id="fVNIC" Title="QL-VNIC"\r
-         Description="Qlogic - Virtual NIC over InfiniBand"\r
+    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
+         Description="QLogic - Virtual NIC over InfiniBand"\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cQLVNIC" />\r
@@ -1068,8 +1065,7 @@
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="SRP_inf" />\r
-      <ComponentRef Id="SRP_driver" />\r
+      <ComponentRef Id="cSRP_driver" />\r
     </Feature>\r
 \r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r

diff --git a/branches/WinOF/WIX/mk-OFA-dist.bat b/branches/WinOF/WIX/mk-OFA-dist.bat
new file mode 100644 (file)
index 0000000..a3275c4
--- /dev/null
+++ b/branches/WinOF/WIX/mk-OFA-dist.bat
@@ -0,0 +1,103 @@
+@echo off\r
+setlocal\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\r
+rem  ASSUMES %CD% gen1\branches\WinOF\Wix\r
+rem\r
+rem mkDist release_ID {target_path}\r
+rem\r
+rem  example mkDist 1.1 C:\tmp\r
+rem    # if target_path is null then default %SystemRoot%\temp\v%1\r
+rem     # otherwise %2\v%1\r
+\r
+if "%1" == "" (\r
+  echo "Missing release ID, example %0 1.1"\r
+  echo "usage: %0 release_ID {target_path, default: %SystemRoot%\temp}\r
+  exit /B 1\r
+)\r
+\r
+set ID=%1\r
+if not "%2" == "" (\r
+  set DST=%2\v%ID%\r
+) else (\r
+  set DST=%SystemRoot%\temp\v%ID%\r
+)\r
+\r
+rem where gen1\trunk\buildRelease.bat stored .msi installer files.\r
+set MSI=%SystemRoot%\temp\r
+\r
+rem MUST execute from gen1\branches\WinOF\WIX\r
+set RBIN=%CD%\bin\r
+\r
+if NOT EXIST %RBIN%\bin (\r
+    echo Must execute from gen1\branches\WinOF\WIX -- and --\r
+    echo .\bin\ must be populated - run gen1\trunk\buildRelease.bat\r
+    exit /B 1\r
+)\r
+\r
+set PGM="C:\Program Files\Debugging Tools for Windows 64-bit"\symstore.exe\r
+set SS=%DST%\SymStor\r
+\r
+if NOT EXIST %PGM% (\r
+    echo Missing installation of MS Debug tools @\r
+    echo   %PGM%\r
+    exit /B 1\r
+)\r
+\r
+rem Assumption is the arch specific installer zip packages have been previously\r
+rem constructed.\r
+\r
+set WIXLAND=%CD%\r
+\r
+if not EXIST WinOF_%ID%_x64.zip (\r
+    echo missing WinOF zip package: WinOF_%ID%_x64.zip  \r
+    exit /B 1\r
+)\r
+if not EXIST WinOF_%ID%_x86.zip (\r
+    echo missing WinOF arch package: WinOF_%ID%_x86.zip  \r
+    exit /B 1\r
+)\r
+if not EXIST WinOF_%ID%_ia64.zip (\r
+    echo missing WinOF arch package: WinOF_%ID%_ia64.zip  \r
+    exit /B 1\r
+)\r
+\r
+echo "Creating WinOF downloadable distribution in"\r
+echo "   %DST%"\r
+echo " from binaries in"\r
+echo "   %RBIN%"\r
+\r
+if EXIST "%DST%" (\r
+    echo rmdir %DST%\r
+    rmdir /S /Q %DST%\r
+)\r
+if EXIST "%DST%" (\r
+    echo Failed to remove %DST%\r
+    exit /B 1\r
+)\r
+mkdir %DST%\r
+if ERRORLEVEL 1 (\r
+    echo "mkdir %DST% error %ERRORLEVEL% ?"\r
+    exit /B 1\r
+)\r
+\r
+mkdir %SS%\r
+mkdir %DST%\Installers\r
+\r
+echo Generating Symbol store\r
+\r
+%PGM% add /r /f %RBIN% /s %SS%  /t "WinOF" /v "version %ID%"\r
+\r
+echo Generating arch releases\r
+\r
+copy WinOF_%ID%_x64.zip %DST%\Installers\r
+copy WinOF_%ID%_x86.zip %DST%\Installers\r
+copy WinOF_%ID%_ia64.zip %DST%\Installers\r
+\r
+echo "Results in %DST%"\r
+\r
+endlocal\r
+exit /B 0\r

diff --git a/branches/WinOF/WIX/mkarchfiles.bat b/branches/WinOF/WIX/mkarchfiles.bat
new file mode 100644 (file)
index 0000000..1098b0e
--- /dev/null
+++ b/branches/WinOF/WIX/mkarchfiles.bat
@@ -0,0 +1,79 @@
+@echo off\r
+setlocal\r
+\r
+if "%1" == "" (\r
+  echo "Missing release ID, example %0 1.1"\r
+  echo "usage: %0 release_ID\r
+  exit /B 1\r
+)\r
+\r
+set ID=%1\r
+set DSTx86=%CD%\WinOF_%ID%_x86\r
+set DSTx64=%CD%\WinOF_%ID%_x64\r
+set DSTia64=%CD%\WinOF_%ID%_ia64\r
+\r
+rem where gen1\trunk\buildRelease.bat stored .msi installer files.\r
+set MSI=%SystemRoot%\temp\r
+\r
+set WZ="C:\Program Files (x86)\WinZip\wzzip.exe"\r
+set ZIP=%MSI%\WinOF_dist_v%ID%.zip\r
+\r
+rem MUST execute from gen1\branches\WinOF\WIX\r
+set RBIN=%CD%\bin\r
+\r
+if NOT EXIST %RBIN%\bin (\r
+    echo Must execute from gen1\branches\WinOF\WIX -- and --\r
+    echo .\bin\ must be populated - run gen1\trunk\buildRelease.bat\r
+    exit /B 1\r
+)\r
+\r
+if NOT EXIST %DSTx86% (\r
+    echo x86 target %DSTx86% missing?\r
+    exit /B 1\r
+)\r
+\r
+if NOT EXIST %DSTx64% (\r
+    echo x86 target %DSTx64% missing?\r
+    exit /B 1\r
+)\r
+\r
+if NOT EXIST %DSTia64% (\r
+    echo x86 target %DSTia64% missing?\r
+    exit /B 1\r
+)\r
+\r
+copy /B /Y %MSI%\WOF_x86.msi %DSTx86%\WinOF_%ID%_x86.msi\r
+copy /B /Y %MSI%\WOF_x64.msi %DSTx64%\WinOF_%ID%_x64.msi\r
+copy /B /Y %MSI%\WOF_ia64.msi %DSTia64%\WinOF_%ID%_ia64.msi\r
+\r
+echo Generate compressed arch folders\r
+\r
+if EXIST %DSTx86%.zip  del /F /Q %DSTx86%.zip\r
+if EXIST %DSTx64%.zip  del /F /Q %DSTx64%.zip\r
+if EXIST %DSTia64%.zip  del /F /Q %DSTia64%.zip\r
+\r
+if NOT EXIST %WZ% (\r
+    echo Missing WinZip pro (cmd-line interface)\r
+    echo Please manually create the following archives:\r
+    echo    %DSTx86%.zip\r
+    echo    %DSTx64%.zip\r
+    echo    %DSTia64%.zip\r
+    echo .   \r
+) else (\r
+     %WZ% -P -r %DSTx86%.zip %DSTx86%\r
+     %WZ% -P -r %DSTx64%.zip %DSTx64%\r
+     %WZ% -P -r %DSTia64%.zip %DSTia64%\r
+\r
+     echo Generating %MSI%\v%ID%\r
+     call mk-OFA-dist %ID% \r
+     pushd %MSI%\r
+     echo Generating %ZIP%\r
+     if EXIST %ZIP% (\r
+        rmdir /Q /S %ZIP%\r
+     )\r
+     %WZ% -P -r %ZIP% v%ID%\r
+     popd\r
+     echo WinOF v%ID% distribution @ %ZIP%\r
+)\r
+endlocal\r
+\r

diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 1a1ab8fe7015dc4688ef1fb4ff4e65b19eee1c04..31f663f391df5b19b24d97bf838caaab032df4dc 100644 (file)
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -471,12 +471,12 @@
                     Source="..\bin\DAPL2\amd64\dat2d.pdb" />\r
           </Component>\r
 \r
-          <Directory Id="qlvnicDir" Name="ql_vnic">\r
+          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
             <Component Id="cQLVNIC" Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
               <CreateFolder />\r
-              <File Id="qlc_vnic.sys" Compressed="yes" DiskId="1"\r
-                     LongName="qlc_vnic.sys" Name="QLVNIC.SYS"\r
-                     Source="..\bin\net\amd64\qlc_vnic.sys" />\r
+              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
+                     LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
+                     Source="..\bin\net\amd64\qlgcvnic.sys" />\r
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                      LongName="netvnic.inf" Name="NETVNIC.INF"\r
                      Source="..\bin\net\amd64\netvnic.inf" />\r
@@ -484,19 +484,15 @@
           </Directory>\r
 \r
           <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="SRP_inf" Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
+            <Component Id="cSRP_driver"\r
+                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
               <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_srp.inf" Name="IB_SRP.INF"\r
                      Source="..\bin\storage\ib_srp.inf" />\r
-            </Component>\r
-            <Directory Id="amd64Dir" Name="amd64">\r
-              <Component Id="SRP_driver"\r
-                         Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">\r
-                <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
+              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\amd64\ibsrp.sys" />\r
-              </Component>\r
-            </Directory>\r
+            </Component>\r
           </Directory>\r
 \r
           <Component Id="OpenSM_Service_enabled"\r
@@ -1067,8 +1063,8 @@
       </Feature>\r
     </Feature>\r
 \r
-    <Feature Id="fVNIC" Title="QL-VNIC"\r
-         Description="Qlogic - Virtual NIC over InfiniBand"\r
+    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
+         Description="QLogic - Virtual NIC over InfiniBand"\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cQLVNIC" />\r
@@ -1077,8 +1073,7 @@
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="SRP_inf" />\r
-      <ComponentRef Id="SRP_driver" />\r
+      <ComponentRef Id="cSRP_driver" />\r
     </Feature>\r
 \r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index c0efb924fe0b6d413de3653457dbc2cd08c6f86a..7f9b7becdcd7aa5571798a5855857aca874582b6 100644 (file)
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -414,20 +414,15 @@
                 </Directory>\r
 \r
                 <Directory Id="srpDir" Name="SRP">\r
-                    <Component Id="SRP_inf"\r
+                    <Component Id="cSRP_driver"\r
                                Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
                         <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
                               LongName="ib_srp.inf" Name="IB_SRP.INF"\r
                               Source="..\bin\storage\ib_srp.inf" />\r
+                        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
+                              LongName="ibsrp.sys" Name="IBSRP.SYS"\r
+                              Source="..\bin\storage\x86\ibsrp.sys" />\r
                     </Component>\r
-                    <Directory Id="x86Dir" Name="x86">\r
-                        <Component Id="SRP_driver"\r
-                                   Guid="1E14526C-9C7F-450A-B73F-E8D9966BAF43">\r
-                            <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                                  LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                                  Source="..\bin\storage\x86\ibsrp.sys" />\r
-                        </Component>\r
-                    </Directory>\r
                 </Directory>\r
 \r
                 <Component Id="OpenSM_Service_enabled"\r
@@ -961,8 +956,8 @@
       </Feature>\r
     </Feature>\r
 \r
-    <Feature Id="fQL_VNIC" Title="QL-VNIC"\r
-        Description="Qlogic - Virtual NIC over InfiniBand"\r
+    <Feature Id="fQL_VNIC" Title="QLogic-VNIC"\r
+        Description="QLogic - Virtual NIC over InfiniBand"\r
         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="cQLVNIC" />\r
@@ -971,8 +966,7 @@
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
         Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="SRP_inf" />\r
-        <ComponentRef Id="SRP_driver" />\r
+        <ComponentRef Id="cSRP_driver" />\r
     </Feature>\r
 \r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r