]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
[WinOF] 2.0-rc0 learnings:
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 5 Sep 2008 16:53:47 +0000 (16:53 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 5 Sep 2008 16:53:47 +0000 (16:53 +0000)
  symbols provided for installed (free) drivers - etc\makebin.bat
  devcon install replaced with update; resolves phantom HCA devices being created.
  debug drivers are signed (.cat & .sys) - build-all-msi.bat
  README_checked.txt - Added checked drivers install thoughts.
  signing .cat files insufficient for WLH, sign .sys files also.
  Installer .msi files signed - build-all-msi.bat
  VER_LEGALCOPYRIGHT_STR updated to 2008 - inc/oib_ver.h
  VER_PROVIDER updated OpenIB --> OpenFabrics - inc/openib.def
  Fixed where ND fake binaries are placed: trunk\bin instead of ulp\bin - trunk\ulp\nd\user\sources

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

32 files changed:
branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
branches/WOF2-0/branches/WinOF/WIX/README_checked.txt [new file with mode: 0644]
branches/WOF2-0/branches/WinOF/WIX/README_release.txt
branches/WOF2-0/branches/WinOF/WIX/Release_notes.htm
branches/WOF2-0/branches/WinOF/WIX/build-all-MSI.bat
branches/WOF2-0/branches/WinOF/WIX/sign-all-drivers.bat
branches/WOF2-0/branches/WinOF/WIX/wlh/build-MSI.bat
branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/Makefile
branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wlh/signDrivers.bat
branches/WOF2-0/branches/WinOF/WIX/wlh/x64/Makefile
branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wlh/x86/Makefile
branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wnet/build-MSI.bat
branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/Makefile
branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wnet/signDrivers.bat
branches/WOF2-0/branches/WinOF/WIX/wnet/x64/Makefile
branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wnet/x86/Makefile
branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs
branches/WOF2-0/branches/WinOF/WIX/wxp/build-MSI.bat
branches/WOF2-0/branches/WinOF/WIX/wxp/signDrivers.bat
branches/WOF2-0/branches/WinOF/WIX/wxp/x86/Makefile
branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs
branches/WOF2-0/trunk/BuildRelease.bat
branches/WOF2-0/trunk/etc/makebin.bat
branches/WOF2-0/trunk/inc/oib_ver.h
branches/WOF2-0/trunk/inc/openib.def
branches/WOF2-0/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
branches/WOF2-0/trunk/ulp/nd/user/SOURCES

index 184baa4e079cd147fae8550c6c87fc770e106231..017c867ec4ec73cad2a68714f45b1e17970224a4 100644 (file)
@@ -597,10 +597,10 @@ End Function
 \r
 ' Find PCI devices using devcon findall.\r
 \r
-Function Find_PCI_devs(exe,tag)\r
+Function Find_PCI_devs(WshShell,exe,tag)\r
     Dim cmd\r
 \r
-       Set WshShell = CreateObject("WScript.Shell")\r
+       Set WshShell = CreateObject("WScript.Shell")\r
 \r
        cmd = exe & " findall * | find """ & tag & """"\r
        Set connExec = WshShell.Exec(cmd)\r
@@ -616,7 +616,8 @@ End Function
 \r
 Function IsInfiniHost(ID)\r
     Dim dID\r
-       HCAs = Array("5A44","5A45","6278","6279","6282","5E8C","5E8D","6274","6275")\r
+       HCAs = Array("5A44","5A45","5E8C","5E8D","6264","6274","6275","6278",_\r
+                               "6279","6282")\r
 \r
     For each dID in HCAs\r
         If dID = ID Then\r
@@ -726,7 +727,7 @@ Function DriverInstall()
                have_mthca = 1\r
        End If\r
 \r
-       dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
+       dev_list = Find_PCI_devs(WshShell,devman,"VEN_15B3")\r
 \r
     ' Install ConnectX (mlx4) HCA driver?\r
 \r
@@ -741,7 +742,7 @@ Function DriverInstall()
                                mlxdev = Left(Dev,(Instr(dev,"SUBSYS")-2))\r
                                devID = Right(mlxdev,4)\r
                                If IsInfiniHost( devID ) = 0 Then\r
-                                       cmd = devman & "install mlx4_bus.inf """ & mlxdev & """"\r
+                                       cmd = devman & "update mlx4_bus.inf """ & mlxdev & """"\r
                                        Return = WshShell.Run (cmd,0,true)\r
 ' msgbox "mlx4_bus(" & Return & ") " & cmd\r
                        If Return = 0 Then\r
@@ -758,7 +759,7 @@ Function DriverInstall()
             Exit Function\r
                End if\r
 \r
-        cmd = devman & "install mlx4_hca.inf MLX4\CONNECTX_HCA"\r
+        cmd = devman & "update mlx4_hca.inf MLX4\CONNECTX_HCA"\r
         Return = WshShell.Run (cmd,0,true)\r
 \r
         ' Display error number and description if applicable\r
@@ -819,7 +820,7 @@ Function DriverInstall()
 \r
     If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") OR _\r
        fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then\r
-       rc = WshShell.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)\r
+       rc = WshShell.Run (devman & "update ib_iou.inf IBA\IB_IOU",0,true)\r
        If Err Then ShowError\r
     end if\r
 \r
@@ -828,7 +829,7 @@ Function DriverInstall()
         devID = "IBA\V00066AP00000030"\r
         Err.clear\r
         Return = WshShell.Run (devmanQL & "disable " & devID, 0, true)\r
-        Return = WshShell.Run (devmanQL & "install netvnic.inf " & devID,0,true)\r
+        Return = WshShell.Run (devmanQL & "update netvnic.inf " & devID,0,true)\r
                ' Display error number and description if applicable\r
         If Err Then ShowErr2("qlgcvnic\qlgcvnic.sys")\r
         Return = WshShell.Run (devmanQL & "enable " & devID, 0, true)\r
@@ -841,7 +842,7 @@ Function DriverInstall()
         'InfiniBand SRP Miniport: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
         ' one driver handles all three.\r
         devID = "IBA\V00066AP00000038"\r
-        Return = WshShell.Run (devmanSRP & "install ib_srp.inf " & devID,0,true)\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
@@ -938,6 +939,28 @@ Function Find_IPOIB_LAC()
                Find_IPOIB_LAC=ibaDev\r
 End Function\r
 \r
+Function remove_INF_file(WshShell, exe, LookFor)\r
+    Dim cmd\r
+       cmd = "cmd.exe /c for /f %i in ('findstr /m " & LookFor & _\r
+                       " %WINDIR%\inf\oem*.inf') do @echo %i"\r
+\r
+    Set infFilesExec = WshShell.Exec ( cmd )\r
+\r
+    InfFiles = infFilesExec.StdOut.ReadAll\r
+    IFILES = Split(InfFiles,vbCrLf)\r
+' msgbox "remove_INF_File " & LookFor \r
+    For Each file in IFILES\r
+        If (file <> "") Then\r
+            cmd = exe & " -f dp_delete " & file\r
+' msgbox cmd \r
+            Return = WshShell.Run (cmd, 0, true)\r
+        End IF\r
+    Next\r
+\r
+       remove_INF_file = 0\r
+\r
+End Function\r
+\r
 \r
 ' Not used - run the specified command during next startup.\r
 \r
@@ -1044,7 +1067,7 @@ Function Uninstall_IB_Devices(sInstalldir)
 '      cmd = dpinstNET & "/U """ & sInstalldir & "net" & "\netipoib.inf"" /S /D"\r
 '      Return = WshShell.Run (cmd, 0, true)\r
 \r
-       ' Disable & Remove HCAs\r
+       ' Disable & Remove HCA device\r
 \r
 '      Return = WshShell.Run (devmanDAAT & "PCI\VEN_15B3", 0, true)\r
        Return = WshShell.Run (devmanRMAT & "PCI\VEN_15B3", 0, true)\r
@@ -1052,6 +1075,12 @@ Function Uninstall_IB_Devices(sInstalldir)
        ' ibbus GUID\r
        Return = WshShell.Run (devman & "remove {94F41CED-78EB-407C-B5DF-958040AF0FD8",0,true)\r
 \r
+    ' remove 3rd party .inf files (ipoib, mthca, Connectx)\r
+\r
+       remove_INF_file WshShell,devman,"ipoib"\r
+       remove_INF_file WshShell,devman,"mthca"\r
+       remove_INF_file WshShell,devman,"mlx4_"\r
+    \r
        Uninstall_IB_Devices = 0\r
 \r
 End Function\r
@@ -1068,7 +1097,7 @@ Sub DriverUninstall()
       Set WshShell = CreateObject("WScript.Shell")\r
       Set fso = CreateObject("Scripting.FileSystemObject")\r
 \r
-      ' WSD is not support on XP and should NOT have been installed.\r
+      ' WSD is not supported on XP and should NOT have been installed.\r
       ' otherwise, remove the service: ND (Network Direct) then WinSock Direct.\r
 \r
       If (Session.Property("VersionNT") <> 501) Then\r
diff --git a/branches/WOF2-0/branches/WinOF/WIX/README_checked.txt b/branches/WOF2-0/branches/WinOF/WIX/README_checked.txt
new file mode 100644 (file)
index 0000000..b00c80a
--- /dev/null
@@ -0,0 +1,18 @@
+\r
+Installing Checked drivers which are signed.\r
+\r
+For Server 2003 or XP, replace the installed .sys  file (%windir%\system32\drivers)\r
+with the checked version.\r
+\r
+\r
+For Server 2008 or Vista, you must install with the signed .inf & .cat checked files.\r
+\r
+1) Make a copy of the free driver .sys and it's .cat file from the correct install\r
+   folder in Winof\ {IBcore, net or storage}.\r
+\r
+2) Copy checked driver .sys and .cat file from the WinOF\Checked\kernel folder to\r
+   correct install folder; where free versions were located.\r
+\r
+3) Uninstall currently installed free driver; right-click uninstall. \r
+\r
+4) Install signed debug from it's inf file using the found new hardware wizard.
\ No newline at end of file
index a1b0c71cdecc3848be2f505dd05e1f40f333286b..c297e4fb4aced0e029c84a472ceb232eb13a4668 100644 (file)
@@ -8,14 +8,15 @@ WinOF 2.0 Summary Changes
 -------------------------\r
 \r
 1) WinOF 2.0 release based on openib-windows svn source revision\r
-   (branches\WOF2-0 svn.1516).\r
+   (branches\WOF2-0 svn.1535).\r
 \r
    Last WinOF release (1.1) based on svn 1177.\r
 \r
 2) Stability enhancements (TBA)\r
    IB Core\r
-        Nonexistant GUID in registry crash fixed.\r
-   IPoIB       \r
+        Nonexistent GUID in registry crash fixed.\r
+   IPoIB\r
+        HCA hardware checksum offload if HCA supports it.      \r
    WSD\r
    VNIC\r
    SRP\r
@@ -29,8 +30,9 @@ WinOF 2.0 Summary Changes
 \r
    Microsoft network Direct (ND) is supported for Windows Server 2008 / Vista\r
 \r
-   WDK (Windows Driver Kit) build environment used:\r
-       OS flavors:\r
+   WDK (Windows Driver Kit) build environment used to construct WinOF 2.0\r
+\r
+   OS flavors:\r
        WLH  - Windows LongHorn (aka Windows Server 2008 & Vista)\r
        WNET - Windows Server 2003 & XP(64bit)\r
        WXP  - Windows XP (32bit)\r
index c2f970c66a7498974c8ded9d1d2ab10150bcb029..1e335fd76c0b007c309a3e2aca129af36c3dc5ab 100644 (file)
@@ -145,7 +145,7 @@ InfiniBand fabric.</span></p>
 <p class=MsoPlainText><span style='font-size:12.0pt;font-family:"Times New Roman"'>&nbsp;Binary\r
 files generated from the OpenIB-windows developers subversion (svn) source tree </span>\r
 'svn://openib.tc.cornell.edu'<span style='font-size:12.0pt;font-family:"Times New Roman"'> \r
-(branches\WOF2-0 svn revision <font color="#FF0000">1516</font>)\r
+(branches\WOF2-0 svn revision <font color="#FF0000">1535</font>)\r
 are packaged into a <a href="http://www.dalun.com/wix/default.htm">WIX 2.0 \r
 (Windows Installer Xml)</a> single file install package referred to as the \r
 Windows OpenFabrics&nbsp;(WinOF) release 2.0.<br>\r
@@ -790,7 +790,7 @@ the file version; the 4th field is the svn revision number.</li>
        <li>WinOF 1.1 is based on openib-windows <b><u>\r
        (branches\WOF1-1) svn revision 1177.<br>\r
 &nbsp;</u></b></li>\r
-       <li>WinOF 2.0 is based on<b> (<u>svn.1516 branches\WOF2-0</u>)</b></li>\r
+       <li>WinOF 2.0 is based on<b> (<u>svn.1535 branches\WOF2-0</u>)</b></li>\r
 </ul>\r
 <p><a href="#1.1_Release_Notes"><font color="#000000">&lt;Return-to-Top&gt;</font></a></p>\r
 <p>&nbsp;</p>\r
index 451a6356ea46d24060b07723390c50b15c5e8729..651b6881ea3c665ca9bfe30d24bf0cdce327836e 100644 (file)
@@ -2,36 +2,51 @@
 setlocal\r
 rem Build WIX installers (.msi) for 'all' architectures & Operating environments\r
 rem\r
-rem usage: %0 Signing-Certificate-FileName CertPassword {dest-path-for-msi-files}\r
-rem            CertFilename is indeed a filename only, we prefix ...\WIX before passing it down.\r
-\r
-rem if %1 == 'nosign' then skip the signing stage.\r
+rem usage:\r
+rem   %0 cmd Signing-Certificate-FileName CertPassword {dest-path-for-msi-files}\r
+rem    cmd - if 'msi' then assume drivers already signed, only sign .msi\r
+rem            otherwise sign all drivers and installers (.msi files)\r
+rem    CertFilename is indeed a filename only, we prefix ...\WIX before\r
+rem    passing it down.\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 Certificate-FileName CertPassword {dest-path-for-msi-files}\r
+set USE=usage %0 all/msi Certificate-FileName CertPassword {dest-path-for-msi-files}\r
 \r
 if "%1" == "" (\r
     echo %0: %USE%\r
     exit /B 1\r
 )\r
 \r
-if NOT EXIST %1 (\r
+if "%1" == "all" (\r
+    goto ok\r
+)\r
+if "%1" == "msi" (\r
+    goto ok\r
+)\r
+echo %0 - Unknown command '%1' - 'all' or 'msi'\r
+echo %0: %USE%\r
+exit /B 1\r
+\r
+:ok\r
+\r
+if NOT EXIST %2 (\r
     echo %0: Certificate-Filename not found?\r
-    echo %0 -   %1\r
+    echo %0 -   %2\r
     exit /B 1\r
 )\r
 \r
-if "%2" == "" (\r
+rem need a password\r
+if "%3" == "" (\r
     echo %0: %USE%\r
     exit /B 1\r
 )\r
 \r
-if "%3" == "" (\r
+if "%4" == "" (\r
     set DST=%windir%\temp\r
 ) else (\r
-    set DST=%3\r
+    set DST=%4\r
 )\r
 \r
 if NOT EXIST %DST% (\r
@@ -39,16 +54,16 @@ if NOT EXIST %DST% (
     exit /B 1\r
 )\r
 \r
-nmake /? > %DST%\jnk.txt\r
+nmake /NOLOGO /? > %DST%\jnk.txt\r
 if ERRORLEVEL 1 (\r
     echo %0 missing nmake.exe in PATH?\r
     exit /B 1\r
 )\r
 del /Q /F %DST%\jnk.txt\r
 \r
-if not "%1" == "nosign" (\r
+if "%1" == "all" (\r
     rem Sign drivers for all OSes & arches. Convert CertFilename to full path.\r
-    call sign-all-drivers %CD%\%1 %2\r
+    call sign-all-drivers %CD%\%2 %3\r
 \r
     if ERRORLEVEL 1 (\r
         echo %0: Error signing drivers?\r
@@ -75,6 +90,29 @@ call build-MSI %DST%
 if ERRORLEVEL 1 exit /B\r
 popd\r
 \r
+rem Digitally Sign the installer .msi files\r
+\r
+set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll\r
+echo %0 - Signing Installer .msi files\r
+for %%o in ( 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 /a /f %CD%\%2 /p %3 %TS% %DST%\WOF_%%o_%%a.msi\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool sign %DST%\WOF_%%o_%%a.msi failed?\r
+                exit /B 1\r
+            )\r
+            signtool verify /pa %DST%\WOF_%%o_%%a.msi\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool verify %DST%\WOF_%%o_%%a.msi failed?\r
+                exit /B 1\r
+            )\r
+        )\r
+    )\r
+)\r
+\r
 dir %DST%\*.msi\r
 \r
 echo ''\r
index c3c34d5f8c651ad34639d668323898557b872e37..f6e1bd74cfe13c0ff632c280de3be10c3cdd3773 100644 (file)
@@ -33,24 +33,42 @@ for %%p in ( wlh wnet wxp ) do (
         echo %0 - Error Bad cd to %%p folder ?\r
         exit /B 1\r
     )\r
-    rem Sign HCA drivers\r
+    rem Sign free HCA drivers\r
     call signDrivers %1 %2 bin\HCA %TS%\r
     if ERRORLEVEL 1 (\r
         echo %0 - Error signing %%p\bin\HCA drivers?\r
         exit /B 1\r
     )\r
+    rem Sign checked HCA drivers\r
+    call signDrivers %1 %2 bin\Chk\HCA %TS%\r
+    if ERRORLEVEL 1 (\r
+        echo %0 - Error signing %%p\bin\Chk\HCA drivers?\r
+        exit /B 1\r
+    )\r
 \r
-    rem Sign IPoIB & VNIC drivers\r
+    rem Sign free: IPoIB & VNIC drivers\r
     call signDrivers %1 %2 bin\net %TS%\r
     if ERRORLEVEL 1 (\r
-        echo %0 - Error signing %%p\bin\HCA drivers?\r
+        echo %0 - Error signing %%p\bin\net drivers?\r
+        exit /B 1\r
+    )\r
+    rem Sign checked: IPoIB & VNIC drivers\r
+    call signDrivers %1 %2 bin\Chk\net %TS%\r
+    if ERRORLEVEL 1 (\r
+        echo %0 - Error signing %%p\bin\Chk\net drivers?\r
         exit /B 1\r
     )\r
 \r
-    rem Sign SRP drivers\r
+    rem Sign free SRP drivers\r
     call signDrivers %1 %2 bin\storage %TS%\r
     if ERRORLEVEL 1 (\r
-        echo %0 - Error signing %%p\bin\HCA drivers?\r
+        echo %0 - Error signing %%p\bin\storage drivers?\r
+        exit /B 1\r
+    )\r
+    rem Sign checked SRP drivers\r
+    call signDrivers %1 %2 bin\Chk\storage %TS%\r
+    if ERRORLEVEL 1 (\r
+        echo %0 - Error signing %%p\bin\Chk\storage drivers?\r
         exit /B 1\r
     )\r
 \r
index 8c9f7af74f88f776b6a089f2bf838815f7a83b73..19a0966f048869e453e0c7961e933a29b103a00c 100644 (file)
@@ -17,7 +17,7 @@ if NOT EXIST %DST% (
     echo %0: Installer output path %DST% not found?\r
     exit /B\r
 )\r
-nmake /? > %DST%\jnk.txt\r
+nmake /NOLOGO /? > %DST%\jnk.txt\r
 if ERRORLEVEL 1 (\r
     echo %0 missing nmake.exe in PATH?\r
     exit /B\r
@@ -39,21 +39,21 @@ if EXIST %DST%\WOF_%OS%_x64.msi  del /Q /F %DST%\WOF_%OS%_x64.msi
 if EXIST %DST%\WOF_%OS%_x86.msi  del /Q /F %DST%\WOF_%OS%_x86.msi\r
 \r
 pushd ia64\r
-nmake full\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 full\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 full\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
index eb0459a09983876ef7ef14e724980502882c2579..4a54647416c1145db8f60ec776d66b7af98ee893 100644 (file)
@@ -22,11 +22,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -38,5 +40,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index ec144d2b224e0218cbcff886930055717e219387..bf3ca17208ecf8e572a52f377256edc1307f0fff 100644 (file)
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\ia64\ibbus.sys" />\r
+              <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                     Source="..\bin\HCA\ia64\ibbus.pdb" />\r
+\r
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\ia64\ibiou.sys" />\r
               <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_iou.inf" Name="IB_IOU.inf"\r
                      Source="..\bin\HCA\ia64\ib_iou.inf" />\r
+              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.sys" />\r
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
               <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mthca.sys" Name="MTHCA.SYS"\r
                      Source="..\bin\HCA\ia64\mthca.sys" />\r
+              <File Id="mthca.pdb" Name="mthca.pdb" DiskId="1"\r
+                     Compressed="yes" Source="..\bin\HCA\ia64\mthca.pdb" />\r
               <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                      LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                      Source="..\bin\HCA\ia64\mthcau.dll" />\r
                      Source="..\bin\HCA\ia64\mthcaud.dll" />\r
             </Component>\r
 \r
-<!-- Remove until ConnectX works on ia64\r
+<!-- Remove when ConnectX works on ia64\r
             <Component Id="cConnectXDriver"\r
                        Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
               <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                      Source="..\bin\hca\ia64\mlx4_bus.sys" />\r
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
+                     Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
               <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
                      LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
@@ -363,18 +370,51 @@ End Remove -->
               <Component Id="cCHK_kernel"\r
                          Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                 <CreateFolder />\r
-                <File Id="file9" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\ibbus.sys" />\r
-                <File Id="file10" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\ibiou.sys" />\r
-                <File Id="file11" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\ibsrp.sys" />\r
-                <File Id="file12" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\ipoib.sys" />\r
-                <File Id="file13" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\mthca.sys" />\r
-                <File Id="file14" Name="qlgcvnic.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wlh_ia64\ia64\qlgcvnic.sys" />\r
+\r
+                <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                  Source="..\..\README_checked.txt" />\r
+                <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
+                <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
+                <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
+\r
+                <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
+                <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ib_bus.cat" />\r
+                <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
+\r
+                <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
+                <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
+                <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
+\r
+                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
+                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
+                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
+\r
+                <File Id="chk5" Name="qlgcvnic.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
+                <File Id="cat5" Name="netvnic.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
+                <File Id="sym5" Name="qlgcvnic.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
+\r
+                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
+                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
+                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
+\r
               </Component>\r
             </Directory>\r
       \r
@@ -538,6 +578,9 @@ End Remove -->
               <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                      LongName="ipoib.sys" Name="IPOIB.SYS"\r
                      Source="..\bin\net\ia64\ipoib.sys" />\r
+              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ipoib.pdb"\r
+                     Source="..\bin\net\ia64\ipoib.pdb" />\r
               <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
                      Source="..\bin\net\ia64\ibwsd32.dll" />\r
@@ -725,6 +768,9 @@ End Remove -->
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
                      LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
                      Source="..\bin\net\ia64\qlgcvnic.sys" />\r
+              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                     Name="qlgcvnic.pdb"\r
+                     Source="..\bin\net\ia64\qlgcvnic.pdb" />\r
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                      LongName="netvnic.inf" Name="NETVNIC.INF"\r
                      Source="..\bin\net\ia64\netvnic.inf" />\r
@@ -747,6 +793,9 @@ End Remove -->
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\ia64\ibsrp.sys" />\r
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibsrp.pdb"\r
+                     Source="..\bin\storage\ia64\ibsrp.pdb" />\r
              </Component>\r
           </Directory>\r
 \r
index 38dafe52c54448f9d3f7aca136ea15dae42762a5..43218c3177715f99064c49aae7126482d5719ab1 100644 (file)
@@ -17,6 +17,7 @@ if not "!F!" == "off" (
 )\r
 \r
 set OE=Server2008\r
+set DU=/du www.openfabrics.org\r
 \r
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
@@ -81,7 +82,7 @@ for %%d in (amd64 x86 ia64) do (
     if not exist %%d (\r
        echo %0 - skipping arch folder %%d\r
     ) else (\r
-        cd  %%d\r
+        pushd  %%d\r
         echo %0 - Delete existing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             if exist %%f del /F /Q %%f\r
@@ -90,8 +91,26 @@ for %%d in (amd64 x86 ia64) do (
         if "%%d" == "amd64" set OEA=%OE%_X64,Vista_X64\r
                if "%%d" == "x86"   set OEA=%OE%_X86,Vista_X86\r
        if "%%d" == "ia64"  set OEA=%OE%_IA64\r
-        echo %0 - Generating %%d .cat files for !OEA!\r
 \r
+        echo %0 - Signing %%d .sys driver files for !OEA!\r
+\r
+        for %%f in ( *.sys ) do (\r
+            echo %0 - Signing %%d\%%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool sign %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+            signtool verify /kp %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool verify %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+        )\r
+\r
+        echo %0 - Generating %%d .cat files for !OEA!\r
         inf2cat /driver:%CD%\%%d /os:!OEA!\r
         if ERRORLEVEL 1 (\r
             echo %CD% inf2cat failed\r
@@ -100,21 +119,21 @@ for %%d in (amd64 x86 ia64) do (
         echo %0 - Signing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             echo %0 - Signing %%d\%%f\r
-            signtool sign /a /f %1 %PWD% %TS% %%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            signtool verify /pa /v %%f > nul\r
+            signtool verify /kp %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool verify %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            echo %0 - Successfully Signed %%d\%%f\r
+rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
-        cd ..\r
+        popd\r
     )\r
 )\r
 \r
index 4b538cf66f225ae908fce0930fb653ca31a6cd9b..8a943d89e4d67ec1ead15d8e02835ad5070a0d5d 100644 (file)
@@ -22,11 +22,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -38,5 +40,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 8ee8fe39cf992d12dab83a84183744c0ca0e9471..ca3fba82274aac46329b20e6d3205fa6a411bd45 100644 (file)
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\amd64\ibbus.sys" />\r
+              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibbus.pdb"\r
+                     Source="..\bin\HCA\amd64\ibbus.pdb" />\r
               <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibal32.dll" Name="IBAL32.DLL"\r
                      Source="..\bin\HCA\amd64\ibal32.dll" />\r
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\amd64\ibiou.sys" />\r
+              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibiou.pdb"\r
+                     Source="..\bin\HCA\amd64\ibiou.pdb" />\r
               <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_iou.cat" Name="IB_IOU.cat"\r
                      Source="..\bin\HCA\amd64\ib_iou.cat" />\r
               <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mthca.sys" Name="MTHCA.SYS"\r
                      Source="..\bin\HCA\amd64\mthca.sys" />\r
+              <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mthca.pdb"\r
+                     Source="..\bin\HCA\amd64\mthca.pdb" />\r
               <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                      LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                      Source="..\bin\HCA\amd64\mthcau.dll" />\r
               <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                      Source="..\bin\hca\amd64\mlx4_bus.sys" />\r
+              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mlx4_bus.pdb"\r
+                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />\r
               <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
                      LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
                      Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                      Source="..\bin\hca\amd64\mlx4_hca.sys" />\r
+              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mlx4_hca.pdb"\r
+                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />\r
               <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                      LongName="mlx4u.dll" Name="mlx4u.dll"\r
                      Source="..\bin\hca\amd64\mlx4u.dll" />\r
                 <Component Id="cCHK_kernel"\r
                            Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                   <CreateFolder />\r
-                  <File Id="file1" Name="ibbus.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\ibbus.sys" />\r
-                  <File Id="file2" Name="ibiou.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\ibiou.sys" />\r
-                  <File Id="file3" Name="ibsrp.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\ibsrp.sys" />\r
-                  <File Id="file4" Name="ipoib.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\ipoib.sys" />\r
-                  <File Id="file5" Name="mlx4_bus.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\mlx4_bus.sys" />\r
-                  <File Id="file6" Name="mlx4_hca.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\mlx4_hca.sys" />\r
-                  <File Id="file7" Name="mthca.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\mthca.sys" />\r
-                  <File Id="file8" Name="qlgcvnic.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wlh_amd64\amd64\qlgcvnic.sys" />\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
+\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
+\r
                 </Component>\r
             </Directory>\r
       \r
               <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                      LongName="ipoib.sys" Name="IPOIB.SYS"\r
                      Source="..\bin\net\amd64\ipoib.sys" />\r
+              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ipoib.pdb"\r
+                     Source="..\bin\net\amd64\ipoib.pdb" />\r
               <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
                      Source="..\bin\net\amd64\ibwsd32.dll" />\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="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                     Name="qlgcvnic.pdb"\r
+                     Source="..\bin\net\amd64\qlgcvnic.pdb" />\r
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                      LongName="netvnic.inf" Name="NETVNIC.INF"\r
                      Source="..\bin\net\amd64\netvnic.inf" />\r
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\amd64\ibsrp.sys" />\r
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibsrp.pdb"\r
+                     Source="..\bin\storage\amd64\ibsrp.pdb" />\r
             </Component>\r
           </Directory>\r
 \r
index d0b9f86f46af52709b32d5c76c201f07953ad8af..4c072b7086f2bc94f84b2287002e664da0fddd8e 100644 (file)
@@ -18,11 +18,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -34,5 +36,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 97cdc2b576ce5dd5b7b282d348834b74ba7954ad..11ca170a3332d49b10197d1d2af1130a66f19ca5 100644 (file)
                         <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibbus.sys" Name="IBBUS.SYS"\r
                               Source="..\bin\HCA\x86\ibbus.sys" />\r
+                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibbus.pdb"\r
+                              Source="..\bin\HCA\x86\ibbus.sys" />\r
                         <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibal.dll" Name="IBAL.DLL"\r
                               Source="..\bin\HCA\x86\ibal.dll" />\r
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibiou.pdb"\r
+                              Source="..\bin\HCA\x86\ibiou.pdb" />\r
                         <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                               LongName="ib_iou.cat" Name="IB_iou.cat"\r
                               Source="..\bin\HCA\x86\ib_iou.cat" />\r
                         <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mthca.sys" Name="MTHCA.SYS"\r
                               Source="..\bin\HCA\x86\mthca.sys" />\r
+                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mthca.pdb"\r
+                              Source="..\bin\HCA\x86\mthca.pdb" />\r
                         <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                               LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                               Source="..\bin\HCA\x86\mthcau.dll" />\r
                         <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                               Source="..\bin\hca\x86\mlx4_bus.sys" />\r
+                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_bus.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
                         <File Id="WdfCoinstaller" Compressed="yes" DiskId="1"\r
-                              LongName="WdfCoInstaller01007.dll"\r
-                              Name="WCO.dll"\r
+                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
                               Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                         <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                               Source="..\bin\hca\x86\mlx4_hca.sys" />\r
+                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_hca.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_hca.pdb" />\r
                         <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                               LongName="mlx4u.dll" Name="mlx4u.dll"\r
                               Source="..\bin\hca\x86\mlx4u.dll" />\r
                     <Component Id="cCHK_kernel"\r
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
-                      <File Id="file15" Name="ibbus.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\ibbus.sys" />\r
-                      <File Id="file16" Name="ibiou.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\ibiou.sys" />\r
-                      <File Id="file17" Name="ibsrp.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\ibsrp.sys" />\r
-                      <File Id="file18" Name="ipoib.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\ipoib.sys" />\r
-                      <File Id="file19" Name="mthca.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\mthca.sys" />\r
-                      <File Id="file20" Name="qlgcvnic.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wlh_x86\i386\qlgcvnic.sys" />\r
+\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+\r
                     </Component>\r
                   </Directory>\r
             \r
                         <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                               LongName="ipoib.sys" Name="IPOIB.SYS"\r
                               Source="..\bin\net\x86\ipoib.sys" />\r
+                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ipoib.pdb"\r
+                              Source="..\bin\net\x86\ipoib.pdb" />\r
                         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                               Source="..\bin\net\x86\ibwsd.dll" />\r
                         <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
                               LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
                               Source="..\bin\net\x86\qlgcvnic.sys" />\r
+                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                              Name="qlgcvnic.pdb"\r
+                              Source="..\bin\net\x86\qlgcvnic.pdb" />\r
                         <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                               LongName="netvnic.inf" Name="NETVNIC.INF"\r
                               Source="..\bin\net\x86\netvnic.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
+                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibsrp.pdb"\r
+                              Source="..\bin\storage\x86\ibsrp.pdb" />\r
                     </Component>\r
                 </Directory>\r
 \r
index d75570fa259622dac361747239a3ab5c3b673437..8025c2cad0d6c6ac939f16a9a63df0143bb5797e 100644 (file)
@@ -17,7 +17,7 @@ if NOT EXIST %DST% (
     echo %0: Installer output path %DST% not found?\r
     exit /B\r
 )\r
-nmake /? > %DST%\jnk.txt\r
+nmake /NOLOGO /? > %DST%\jnk.txt\r
 if ERRORLEVEL 1 (\r
     echo %0 missing nmake.exe in PATH?\r
     exit /B\r
@@ -39,19 +39,19 @@ if EXIST %DST%\WOF_%OS%_x64.msi  del /Q /F %DST%\WOF_%OS%_x64.msi
 if EXIST %DST%\WOF_%OS%_x86.msi  del /Q /F %DST%\WOF_%OS%_x86.msi\r
 \r
 pushd ia64\r
-nmake full\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 full\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 full\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
index b7f7d7afce212e9b5599599c5c1a2e25f820bdb9..c69aba6b36e590d4117ac412f4c72ccb51f68733 100644 (file)
@@ -22,11 +22,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -38,5 +40,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 2e7d7e4f112f4f168c6a840fe7145c3b110b33b4..af19fa99d972cb9bb855fde7546c0090d5b69333 100644 (file)
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\ia64\ibbus.sys" />\r
+              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibbus.pdb" Source="..\bin\HCA\ia64\ibbus.pdb" />\r
               <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibal32.dll" Name="IBAL32.DLL"\r
                      Source="..\bin\HCA\ia64\ibal32.dll" />\r
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\ia64\ibiou.sys" />\r
+              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.pdb" />\r
               <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_iou.cat" Name="IB_iou.cat"\r
                      Source="..\bin\HCA\ia64\ib_iou.cat" />\r
               <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mthca.sys" Name="MTHCA.SYS"\r
                      Source="..\bin\HCA\ia64\mthca.sys" />\r
+              <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mthca.pdb" Source="..\bin\HCA\ia64\mthca.pdb" />\r
               <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                      LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                      Source="..\bin\HCA\ia64\mthcau.dll" />\r
               <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                      Source="..\bin\hca\ia64\mlx4_bus.sys" />\r
+              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="mlx4_bus.pdb"\r
+                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
                      LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                      Source="..\bin\hca\ia64\mlx4_hca.sys" />\r
               <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"\r
+                     Name="mlx4_hca.pdb"\r
                      Source="..\bin\hca\ia64\mlx4_hca.pdb" />\r
               <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                      LongName="mlx4u.dll" Name="mlx4u.dll"\r
@@ -367,18 +376,74 @@ End Remove -->
               <Component Id="cCHK_kernel"\r
                          Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                 <CreateFolder />\r
-                <File Id="file9" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\ibbus.sys" />\r
-                <File Id="file10" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\ibiou.sys" />\r
-                <File Id="file11" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\ibsrp.sys" />\r
-                <File Id="file12" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\ipoib.sys" />\r
-                <File Id="file13" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\mthca.sys" />\r
-                <File Id="file14" Name="qlgcvnic.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\kernel\objchk_wnet_ia64\ia64\qlgcvnic.sys" />\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
+<!-- when ConnectX works on ia64\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />\r
+End ConnectX remove -->\r
               </Component>\r
             </Directory>\r
       \r
@@ -542,6 +607,8 @@ End Remove -->
               <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                      LongName="ipoib.sys" Name="IPOIB.SYS"\r
                      Source="..\bin\net\ia64\ipoib.sys" />\r
+              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ipoib.pdb" Source="..\bin\net\ia64\ipoib.pdb" />\r
               <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
                      Source="..\bin\net\ia64\ibwsd32.dll" />\r
@@ -728,6 +795,9 @@ End Remove -->
               <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
                      LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
                      Source="..\bin\net\ia64\qlgcvnic.sys" />\r
+              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                     Name="qlgcvnic.pdb"\r
+                     Source="..\bin\net\ia64\qlgcvnic.pdb" />\r
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                      LongName="netvnic.inf" Name="NETVNIC.INF"\r
                      Source="..\bin\net\ia64\netvnic.inf" />\r
@@ -750,6 +820,8 @@ End Remove -->
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\ia64\ibsrp.sys" />\r
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibsrp.pdb" Source="..\bin\storage\ia64\ibsrp.pdb" />\r
              </Component>\r
           </Directory>\r
 \r
index e5f0b254fcada86de504ef32759a89d455296b8b..81a9d8e9aa00d5f152d6d39664844a7ea89f0ed5 100644 (file)
@@ -17,6 +17,7 @@ if not "!F!" == "off" (
 )\r
 \r
 set OE=Server2003\r
+set DU=/du www.openfabrics.org\r
 \r
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
@@ -81,7 +82,7 @@ for %%d in (amd64 x86 ia64) do (
     if not exist %%d (\r
        echo %0 - skipping arch folder %%d\r
     ) else (\r
-        cd  %%d\r
+        pushd  %%d\r
         echo %0 - Delete existing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             if exist %%f del /F /Q %%f\r
@@ -90,8 +91,26 @@ for %%d in (amd64 x86 ia64) do (
         if "%%d" == "amd64" set OEA=%OE%_X64,XP_X64\r
                if "%%d" == "x86"   set OEA=%OE%_X86\r
        if "%%d" == "ia64"  set OEA=%OE%_IA64\r
-        echo %0 - Generating %%d .cat files for !OEA!\r
 \r
+        echo %0 - Signing %%d .sys driver files for !OEA!\r
+\r
+        for %%f in ( *.sys ) do (\r
+            echo %0 - Signing %%d\%%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool sign %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+            signtool verify /kp %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool verify %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+        )\r
+\r
+        echo %0 - Generating %%d .cat files for !OEA!\r
         inf2cat /driver:%CD%\%%d /os:!OEA!\r
         if ERRORLEVEL 1 (\r
             echo %CD% inf2cat failed\r
@@ -100,21 +119,21 @@ for %%d in (amd64 x86 ia64) do (
         echo %0 - Signing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             echo %0 - Signing %%d\%%f\r
-            signtool sign /a /f %1 %PWD% %TS% %%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            signtool verify /pa /v %%f > nul\r
+            signtool verify /kp %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool verify %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            echo %0 - Successfully Signed %%d\%%f\r
+rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
-        cd ..\r
+        popd\r
     )\r
 )\r
 \r
index 837d48a0fd4bafda6cdbf663b9bd636640a96868..a711a3c31e23c8c76b442fb375d0d750ce3eb02e 100644 (file)
@@ -22,11 +22,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -38,5 +40,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 9e8dd1513b705c13b84fc34c8692a4e972287b2b..85cc202214d18494668c968ec3995afd09fb23f9 100644 (file)
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\amd64\ibbus.sys" />\r
+              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibbus.pdb" Source="..\bin\HCA\amd64\ibbus.pdb" />\r
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\amd64\ibiou.sys" />\r
+              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibiou.pdb" Source="..\bin\HCA\amd64\ibiou.pdb" />\r
               <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_iou.cat" Name="IB_iou.cat"\r
                      Source="..\bin\HCA\amd64\ib_iou.cat" />\r
               <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mthca.sys" Name="MTHCA.SYS"\r
                      Source="..\bin\HCA\amd64\mthca.sys" />\r
+              <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mthca.pdb" Source="..\bin\HCA\amd64\mthca.pdb" />\r
               <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                      LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                      Source="..\bin\HCA\amd64\mthcau.dll" />\r
               <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                      Source="..\bin\hca\amd64\mlx4_bus.sys" />\r
+              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mlx4_bus.pdb"\r
+                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />\r
               <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
                      LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
                      Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                      Source="..\bin\hca\amd64\mlx4_hca.sys" />\r
+              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+                     Name="mlx4_hca.pdb"\r
+                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />\r
               <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                      LongName="mlx4u.dll" Name="mlx4u.dll"\r
                      Source="..\bin\hca\amd64\mlx4u.dll" />\r
                 <Component Id="cCHK_kernel"\r
                            Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                   <CreateFolder />\r
-                  <File Id="file1" Name="ibbus.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\ibbus.sys" />\r
-                  <File Id="file2" Name="ibiou.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\ibiou.sys" />\r
-                  <File Id="file3" Name="ibsrp.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\ibsrp.sys" />\r
-                  <File Id="file4" Name="ipoib.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\ipoib.sys" />\r
-                  <File Id="file5" Name="mlx4_bus.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\mlx4_bus.sys" />\r
-                  <File Id="file6" Name="mlx4_hca.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\mlx4_hca.sys" />\r
-                  <File Id="file7" Name="mthca.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\mthca.sys" />\r
-                  <File Id="file8" Name="qlgcvnic.sys"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\kernel\objchk_wnet_amd64\amd64\qlgcvnic.sys" />\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
+\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
+\r
                 </Component>\r
             </Directory>\r
       \r
               <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                      LongName="ipoib.sys" Name="IPOIB.SYS"\r
                      Source="..\bin\net\amd64\ipoib.sys" />\r
+              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ipoib.pdb" Source="..\bin\net\amd64\ipoib.pdb" />\r
               <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
                      Source="..\bin\net\amd64\ibndprov.dll" />\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="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                     Name="qlgcvnic.pdb"\r
+                     Source="..\bin\net\amd64\qlgcvnic.pdb" />\r
               <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                      LongName="netvnic.inf" Name="NETVNIC.INF"\r
                      Source="..\bin\net\amd64\netvnic.inf" />\r
               <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibsrp.sys" Name="IBSRP.SYS"\r
                      Source="..\bin\storage\amd64\ibsrp.sys" />\r
+              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                     Name="ibsrp.pdb" Source="..\bin\storage\amd64\ibsrp.pdb" />\r
             </Component>\r
           </Directory>\r
 \r
index 9d545b0ca5ab03fbff1f0dfbcfb40eaff6f1ef3d..35c23bcba2052ebc9fff7af8d6fae1f13f5ab7ac 100644 (file)
@@ -20,11 +20,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -36,5 +38,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 66d8e9eb28d21ff4f27b48327f960c00dc13ed7d..0f445791e33518f89dd7d5c15ab60272f2d995b7 100644 (file)
                         <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibbus.sys" Name="IBBUS.SYS"\r
                               Source="..\bin\HCA\x86\ibbus.sys" />\r
+                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibbus.pdb"\r
+                              Source="..\bin\HCA\x86\ibbus.pdb" />\r
                         <File Id="ib_bus.cat" Compressed="yes" DiskId="1"\r
                               LongName="ib_bus.cat" Name="IB_BUS.cat"\r
                               Source="..\bin\HCA\x86\ib_bus.cat" />\r
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibiou.pdb"\r
+                              Source="..\bin\HCA\x86\ibiou.pdb" />\r
                         <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                               LongName="ib_iou.cat" Name="IB_iou.cat"\r
                               Source="..\bin\HCA\x86\ib_iou.cat" />\r
                         <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mthca.sys" Name="MTHCA.SYS"\r
                               Source="..\bin\HCA\x86\mthca.sys" />\r
+                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mthca.pdb"\r
+                              Source="..\bin\HCA\x86\mthca.pdb" />\r
                         <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                               LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                               Source="..\bin\HCA\x86\mthcau.dll" />\r
                         <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                               Source="..\bin\hca\x86\mlx4_bus.sys" />\r
+                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_bus.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
                         <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                              LongName="WdfCoInstaller01007.dll"\r
-                              Name="WCO.dll"\r
+                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
                               Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                         <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                               Source="..\bin\hca\x86\mlx4_hca.sys" />\r
+                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_hca.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_hca.pdb" />\r
                         <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                               LongName="mlx4u.dll" Name="mlx4u.dll"\r
                               Source="..\bin\hca\x86\mlx4u.dll" />\r
                     <Component Id="cCHK_kernel"\r
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
-                      <File Id="file15" Name="ibbus.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\ibbus.sys" />\r
-                      <File Id="file16" Name="ibiou.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\ibiou.sys" />\r
-                      <File Id="file17" Name="ibsrp.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\ibsrp.sys" />\r
-                      <File Id="file18" Name="ipoib.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\ipoib.sys" />\r
-                      <File Id="file19" Name="mthca.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\mthca.sys" />\r
-                      <File Id="file20" Name="qlgcvnic.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wnet_x86\i386\qlgcvnic.sys" />\r
+\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+\r
                     </Component>\r
                   </Directory>\r
             \r
                         <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                               LongName="ipoib.sys" Name="IPOIB.SYS"\r
                               Source="..\bin\net\x86\ipoib.sys" />\r
+                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ipoib.pdb"\r
+                              Source="..\bin\net\x86\ipoib.pdb" />\r
                         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                               Source="..\bin\net\x86\ibwsd.dll" />\r
                         <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
                               LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
                               Source="..\bin\net\x86\qlgcvnic.sys" />\r
+                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                              Name="qlgcvnic.pdb"\r
+                              Source="..\bin\net\x86\qlgcvnic.pdb" />\r
                         <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                               LongName="netvnic.inf" Name="NETVNIC.INF"\r
                               Source="..\bin\net\x86\netvnic.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
+                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibsrp.pdb"\r
+                              Source="..\bin\storage\x86\ibsrp.pdb" />\r
                     </Component>\r
                 </Directory>\r
 \r
index 502b7b8864ef484ca11a3d78f8e775ecfa074615..04096c06371565d0d97a360037c34b723882dc4c 100644 (file)
@@ -17,7 +17,7 @@ if NOT EXIST %DST% (
     echo %0: Installer output path %DST% not found?\r
     exit /B\r
 )\r
-nmake /? > %DST%\jnk.txt\r
+nmake /NOLOGO /? > %DST%\jnk.txt\r
 if ERRORLEVEL 1 (\r
     echo %0 missing nmake.exe in PATH?\r
     exit /B\r
@@ -39,21 +39,21 @@ rem if EXIST %DST%\WOF_%OS%_x64.msi  del /Q /F %DST%\WOF_%OS%_x64.msi
 if EXIST %DST%\WOF_%OS%_x86.msi  del /Q /F %DST%\WOF_%OS%_x86.msi\r
 \r
 rem pushd ia64\r
-rem nmake full\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 full\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 full\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
index a52dc38483952114a4d956012aeff314afda3662..3d33845711bf0c57ac0485ffc35edfde55bbf08a 100644 (file)
@@ -17,6 +17,7 @@ if not "!F!" == "off" (
 )\r
 \r
 set OE=XP\r
+set DU=/du www.openfabrics.org\r
 \r
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
@@ -81,7 +82,7 @@ for %%d in ( x86 ) do (
     if not exist %%d (\r
        echo %0 - skipping arch folder %%d\r
     ) else (\r
-        cd  %%d\r
+        pushd  %%d\r
         echo %0 - Delete existing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             if exist %%f del /F /Q %%f\r
@@ -90,8 +91,26 @@ for %%d in ( x86 ) do (
                if "%%d" == "x86"   set OEA=%OE%_X86\r
 rem     if "%%d" == "amd64" set OEA=%OE%_X64\r
 rem    if "%%d" == "ia64"  set OEA=%OE%_IA64\r
-        echo %0 - Generating %%d .cat files for !OEA!\r
 \r
+        echo %0 - Signing %%d .sys driver files for !OEA!\r
+\r
+        for %%f in ( *.sys ) do (\r
+            echo %0 - Signing %%d\%%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool sign %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+            signtool verify /kp %%f\r
+            if ERRORLEVEL 1 (\r
+                echo %0 signtool verify %%f failed?\r
+                echo %0    file %CD%\%%f\r
+                exit /B 1\r
+            )\r
+        )\r
+\r
+        echo %0 - Generating %%d .cat files for !OEA!\r
         inf2cat /driver:%CD%\%%d /os:!OEA!\r
         if ERRORLEVEL 1 (\r
             echo %CD% inf2cat failed\r
@@ -100,21 +119,21 @@ rem       if "%%d" == "ia64"  set OEA=%OE%_IA64
         echo %0 - Signing %%d .cat files\r
         for %%f in ( *.cat ) do (\r
             echo %0 - Signing %%d\%%f\r
-            signtool sign /a /f %1 %PWD% %TS% %%f\r
+            signtool sign /a /f %1 %PWD% %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            signtool verify /pa /v %%f > nul\r
+            signtool verify /kp %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool verify %%f failed?\r
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-            echo %0 - Successfully Signed %%d\%%f\r
+rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
-        cd ..\r
+        popd\r
     )\r
 )\r
 \r
index 6e7f391cb4a551c589034c68b6ee99e63eddb671..328a234e92400a822517f20a6e6f4bbdbfaca102 100644 (file)
@@ -20,11 +20,13 @@ clean:
 MySetup: $(P).msi\r
 \r
 license.rtf: ..\..\license.rtf\r
-       copy ..\..\license.rtf .\license.rtf\r
+       @copy ..\..\license.rtf .\license.rtf\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
 $(P).msi: $(S).wixobj license.rtf\r
+       @echo --\r
+       @echo Building $(P).msi\r
        $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)\r
        @del /q $(S).wixobj 2>nul\r
        @del /q license.rtf 2>nul\r
@@ -36,5 +38,5 @@ $(P).msi: $(S).wixobj license.rtf
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-  $(L)\candle.exe /nologo -trace -v $<\r
+       @$(L)\candle.exe /nologo -trace -v $<\r
 \r
index 52534abc63c94a124d5717cc859f70a6e61baa39..68af2bf9666b92ae3d93d0f953d538ae14895a06 100644 (file)
                         <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibbus.sys" Name="IBBUS.SYS"\r
                               Source="..\bin\HCA\x86\ibbus.sys" />\r
+                        <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibbus.pdb"\r
+                              Source="..\bin\HCA\x86\ibbus.pdb" />\r
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibiou.pdb"\r
+                              Source="..\bin\HCA\x86\ibiou.pdb" />\r
                         <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
                               LongName="ib_iou.cat" Name="IB_iou.cat"\r
                               Source="..\bin\HCA\x86\ib_iou.cat" />\r
                         <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mthca.sys" Name="MTHCA.SYS"\r
                               Source="..\bin\HCA\x86\mthca.sys" />\r
+                        <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mthca.pdb"\r
+                              Source="..\bin\HCA\x86\mthca.pdb" />\r
                         <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
                               LongName="mthcau.dll" Name="MTHCAU.DLL"\r
                               Source="..\bin\HCA\x86\mthcau.dll" />\r
                         <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                               Source="..\bin\hca\x86\mlx4_bus.sys" />\r
+                        <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_bus.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
                         <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
                               LongName="WdfCoInstaller01007.dll"\r
                               Name="WCO.dll"\r
                         <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
                               Source="..\bin\hca\x86\mlx4_hca.sys" />\r
+                        <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+                              Name="mlx4_hca.pdb"\r
+                              Source="..\bin\hca\x86\mlx4_hca.pdb" />\r
                         <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
                               LongName="mlx4u.dll" Name="mlx4u.dll"\r
                               Source="..\bin\hca\x86\mlx4u.dll" />\r
                     <Component Id="cCHK_kernel"\r
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
-                      <File Id="file15" Name="ibbus.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\ibbus.sys" />\r
-                      <File Id="file16" Name="ibiou.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\ibiou.sys" />\r
-                      <File Id="file17" Name="ibsrp.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\ibsrp.sys" />\r
-                      <File Id="file18" Name="ipoib.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\ipoib.sys" />\r
-                      <File Id="file19" Name="mthca.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\mthca.sys" />\r
-                      <File Id="file20" Name="qlgcvnic.sys"\r
-                        DiskId="1" Compressed="yes"\r
-                        Source="..\bin\bin\kernel\objchk_wxp_x86\i386\qlgcvnic.sys" />\r
+\r
+\r
+                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
+                    Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+\r
+                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                  <File Id="cat2" Name="ib_bus.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_bus.cat" />\r
+                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+\r
+                  <File Id="chk5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                  <File Id="cat5" DiskId="1" Compressed="yes"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                  <File Id="sym5" DiskId="1" Compressed="yes"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+\r
+                  <File Id="chk7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                  <File Id="cat7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                  <File Id="sym7" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+\r
+                  <File Id="chk8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                  <File Id="cat8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                  <File Id="sym8" DiskId="1" Compressed="yes"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+\r
                     </Component>\r
                   </Directory>\r
             \r
                         <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
                               LongName="ipoib.sys" Name="IPOIB.SYS"\r
                               Source="..\bin\net\x86\ipoib.sys" />\r
+                        <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ipoib.pdb"\r
+                              Source="..\bin\net\x86\ipoib.pdb" />\r
 <!--\r
   XP does not support WSD\r
                         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                         <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
                               LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
                               Source="..\bin\net\x86\qlgcvnic.sys" />\r
+                        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+                              Name="qlgcvnic.pdb"\r
+                              Source="..\bin\net\x86\qlgcvnic.pdb" />\r
                         <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
                               LongName="netvnic.inf" Name="NETVNIC.INF"\r
                               Source="..\bin\net\x86\netvnic.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
+                        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+                              Name="ibsrp.pdb"\r
+                              Source="..\bin\storage\x86\ibsrp.pdb" />\r
                     </Component>\r
                 </Directory>\r
 -->\r
index a8e97de3ed8a408baabd5c93b72fc15174d5a965..7bdb58b9bb2d59089e7704735e6487819c72adbc 100644 (file)
@@ -122,7 +122,7 @@ set _PSDK=%SystemDrive%\progra~1\mi2578~1
 rem Special override case for WinOF 2.0 release.\r
 rem setup value for OPENIB_REV assignment.\r
 \r
-set SVN=1516\r
+set SVN=1535\r
 set LBL=_R2.0\r
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
@@ -225,7 +225,7 @@ if NOT EXIST "%IDIR%" (
 \r
 rem Verify WIX 2.0 toolset is available - if not, download from\r
 rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109\r
-rem   select wix-2.0.5325.0-binaries.zip download and unzip to\r
+rem   select wix-2.0.5805.0-binaries.zip download and unzip to\r
 rem   ..\branches\WinOF\WIX\WIX_tools\\r
 rem\r
 if NOT EXIST %WIX%\WIX_tools\%WIX_BIN% (\r
@@ -242,10 +242,11 @@ set STIME=%TIME%
 rem skip build - assumes binaries already built.\r
 \r
 if "%1" == "wix" (\r
-    set CERTNAME=nosign\r
+    set MSI_CMD=msi\r
     goto mk_msi\r
 )\r
 \r
+set MSI_CMD=all\r
 if "%1" == "msi" (\r
     if not EXIST "%RBIN_WLH%"  goto InstallBin\r
     if not EXIST "%RBIN_WNET%" goto InstallBin\r
@@ -370,14 +371,15 @@ if "%1" == "makebin" goto finito
 \r
 :mk_msi\r
 \r
-echo %0 - Drivers Signed with %CERTNAME% , Binary releases built in\r
+echo %0 - Drivers Signed with %CERTNAME%\r
+echo   Binary releases created in\r
 echo     %RBIN_WLH%\r
 echo     %RBIN_WNET%\r
 echo     %RBIN_WXP%\r
 \r
 rem build WIX installers --> see ..\branches\WinOF\WIX\r
 \r
-%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %CERTPWD% %IDIR%"\r
+%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %MSI_CMD% %CERTNAME% %CERTPWD% %IDIR%"\r
 \r
 \r
 :finito\r
index a4b77f5f6379778535a0c857332bd021a7490b22..481468f90341ef8145a462828e6163b61d251979 100644 (file)
@@ -3,10 +3,10 @@ setlocal
 \r
 rem usage: makebin src dst [wlh | wnet | wxp]\r
 rem\r
-rem  src - OpenIB src path ...\gen1\trunk\r
-rem  dst - full path tp where binaries are copied, 'bin\' created here.\r
-rem  OSE - (Operating System Environment) which windows version {wxp,wlh,wnet}\r
-rem        representing {XP, server 2008 & server 2003}\r
+rem  src(%1) - OpenIB src path ...\gen1\trunk\r
+rem  dst(%2) - full path tp where binaries are copied, 'bin\' created here.\r
+rem  OSE(%3) - (Operating System Environment) which windows version\r
+rem            {wxp,wlh,wnet} representing {XP, server 2008 & server 2003}\r
 \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
@@ -63,13 +63,13 @@ rem
 \r
 if /I "%OSE%" == "wxp" goto wxp_drv\r
 \r
-rem Copy AMD64 drivers\r
+rem Copy AMD64 Free drivers\r
 set bin_dir=%1\bin\kernel\objfre_%OSE%_amd64\amd64\r
 set dest_dir=%2\HCA\amd64\\r
 \r
 if "%DBG%" == "TRUE" echo DBG: AMD64 free drivers\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ib_bus.inf ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul\r
     if ERRORLEVEL 1 (\r
@@ -83,6 +83,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\amd64\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\amd64\ /yq\r
 \r
+xcopy %bin_dir%\ipoib.pdb %2\net\amd64\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\amd64\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\amd64\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\amd64\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\amd64\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\amd64\ /yq\r
@@ -95,7 +99,7 @@ if "%DBG%" == "TRUE" echo DBG: ia64 free drivers
 \r
 rem add mlx4_hca.inf & mlx4_bus.inf when Connectx on ia64 works.\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ibbus.pdb ib_bus.inf ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -109,6 +113,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\ia64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\ia64\ /yq\r
 \r
+xcopy %bin_dir%\ipoib.pdb %2\net\ia64\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\ia64\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\ia64\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\ia64\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\ia64\ /yq\r
@@ -122,7 +130,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 free drivers
 set bin_dir=%1\bin\kernel\objfre_%OSE%_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ibbus.pdb ib_bus.inf ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -135,6 +143,11 @@ xcopy %WdfCoInstaller%\x86\WdfCoInstaller01007.dll %dest_dir% /yq
 xcopy %bin_dir%\ipoib.sys %2\net\x86\ /yq\r
 xcopy %bin_dir%\qlgcvnic.sys %2\net\x86\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\x86\ /yq\r
+\r
+xcopy %bin_dir%\ipoib.pdb %2\net\x86\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\x86\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\x86\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq\r
@@ -149,7 +162,7 @@ set bin_dir=%1\bin\user\objchk_%OSE%_amd64\amd64
 set dest_dir=%2\HCA\amd64\\r
 \r
 for %%i in (ibald.dll complibd.dll mthcaud.dll IbInstaller.dll mlx4ud.dll) do (\r
-       xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
         exit /B 1\r
@@ -758,6 +771,79 @@ if NOT exist %2\Misc (
 copy /Y/A %1\Docs\Manual.htm %2\Misc\Manual.htm\r
 copy /Y/A %1\tests\cmtest\user\cmtest_main.c %2\Misc\cmtest.c\r
 \r
+rem setup Checked Drivers & Symbols for signing and installation.\r
+if "%DBG%" == "TRUE" echo %3 Checked Drivers+symbols\r
+\r
+if NOT exist %2\Chk (\r
+    mkdir %2\Chk\r
+    if ERRORLEVEL 1 (\r
+        echo "failed[%ERRORLEVEL%] mkdir %2\Chk ?"\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+for %%i in ( HCA net storage ) do (\r
+    xcopy %2\%%i %2\Chk\%%i\ /S /Y /Q\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %2\%%i %2\Chk /syq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+rem cleanout free symbols\r
+for /F %%i in ('dir /B/S Chk\*.pdb') do (\r
+  @del /F/Q %%i\r
+)\r
+\r
+set B=%2\bin\kernel\objchk_%3\r
+\r
+for %%i in ( ibbus mthca ibiou mlx4_hca mlx4_bus ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\HCA\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\HCA\amd64\%%i.pdb\r
+    )\r
+\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\HCA\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\HCA\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\HCA\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\HCA\x86\%%i.pdb\r
+    )\r
+)\r
+\r
+\r
+for %%i in ( ipoib qlgcvnic ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\net\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\net\amd64\%%i.pdb\r
+    )\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\net\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\net\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\net\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\net\x86\%%i.pdb\r
+    )\r
+)\r
+\r
+for %%i in ( ibsrp ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\storage\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\storage\amd64\%%i.pdb\r
+    )\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\storage\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\storage\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\storage\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\storage\x86\%%i.pdb\r
+    )\r
+)\r
+\r
 goto end\r
 \r
 :usage\r
index 96645ff21d4761c86fd892bc72d0457ba26313d9..5af455652592e720007b715bf7d7d9f0a109d258 100644 (file)
@@ -67,4 +67,4 @@
 #endif\r
 #define VER_PRODUCTNAME_STR            IB_PRODUCTNAME\r
 \r
-#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2007 OpenFabrics Alliance"\r
+#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2008 OpenFabrics Alliance"\r
index 86a2e50df4f8b17d5ae24bdec371e51ea599ac9f..9e606bb218d2e056ec1ddad0c8be741d3d6936ce 100644 (file)
@@ -19,7 +19,7 @@ OPENIB_REV=0
 !ENDIF\r
 \r
 !IFNDEF VER_PROVIDER\r
-VER_PROVIDER="""OpenIB"""\r
+VER_PROVIDER="""OpenFabrics"""\r
 !ENDIF\r
 \r
 C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \\r
index 73fa7baec80b0ecad2b5dc5ebffba7aca9303622..39628429388fbee080412ce098016696da24b0b8 100644 (file)
@@ -1,4 +1,4 @@
-; OpenIB Internet Protocol over InfiniBand Adapter\r
+; OpenFabrics Alliance Internet Protocol over InfiniBand Adapter\r
 ; Copyright 2005 SilverStorm Technologies all Rights Reserved.\r
 ; Copyright 2006 Mellanox Technologies all Rights Reserved.\r
 \r
@@ -204,10 +204,10 @@ WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
-OPENIB               = "OpenIB Alliance"\r
-IpoibDesc            = "OpenIB IPoIB Adapter"\r
+OPENIB               = "OpenFabrics Alliance"\r
+IpoibDesc            = "OpenFabrics IPoIB Adapter"\r
 IpoibServiceDispName = "IPoIB"\r
-IcsDisk1             = "OpenIB IPoIB Disk #1"\r
+IcsDisk1             = "OpenFabrics IPoIB Disk #1"\r
 DIRID_SYSTEM         = 11\r
 DIRID_DRIVERS        = 12\r
 DIRID_SYSTEM_X86     = 16425\r
index 95cbf93beae916e79cae7e2e3511c1c12242ffad..75d006a069a7d792124dc63d658d6801da8e3da3 100644 (file)
@@ -1,5 +1,5 @@
 TARGETNAME=fake\r
-TARGETPATH=..\..\bin\user\obj$(BUILD_ALT_DIR)\r
+TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
 USE_MSVCRT=1\r