[WinOF] Driver (.cat) & .msi signing is correctly working with OFA certificate &...

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

diff --git a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
index 017c867ec4ec73cad2a68714f45b1e17970224a4..150240c919b16abca60538b6cb5f022de8f4305d 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
@@ -702,17 +702,8 @@ Function DriverInstall()
 \r
     ' rescan system buses\r
     Return = WshShell.Run (devman & "rescan", 0, true)\r
-    ' Display error number and description if applicable\r
-    If Err Then ShowError\r
-    If Return <> 0 Then\r
-        msgbox "Driver Install - failed device rescan? " & Return & " Err "_\r
-                               & Err\r
-        DriverInstall=ERROR_INSTALL_FAILURE\r
-        Exit Function\r
-    End if\r
                \r
     ' Install HCA (Host Channel Adapter) Driver(s)\r
-\r
     DrvInstalled = false\r
 \r
        ' what HCAs are selected to install?\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/build-all-MSI.bat b/branches/WOF2-0/branches/WinOF/WIX/build-all-MSI.bat
index 651b6881ea3c665ca9bfe30d24bf0cdce327836e..c6648f6b8937f497ca79860935626894c4daa221 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/build-all-MSI.bat
+++ b/branches/WOF2-0/branches/WinOF/WIX/build-all-MSI.bat
@@ -3,16 +3,17 @@ setlocal
 rem Build WIX installers (.msi) for 'all' architectures & Operating environments\r
 rem\r
 rem usage:\r
-rem   %0 cmd Signing-Certificate-FileName CertPassword {dest-path-for-msi-files}\r
+rem   %0 cmd Signing-Certificate-FileName CertSubjectName {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     CertName - see /n switch\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 all/msi Certificate-FileName CertPassword {dest-path-for-msi-files}\r
+set USE=usage %0 all/msi Certificate-FileName CertSubjName[see signtool /n] {dest-path-for-msi-files}\r
 \r
 if "%1" == "" (\r
     echo %0: %USE%\r
@@ -37,8 +38,8 @@ if NOT EXIST %2 (
     exit /B 1\r
 )\r
 \r
-rem need a password\r
-if "%3" == "" (\r
+rem need a Cert subject name string - name is passed in quoted!\r
+if %3 == "" (\r
     echo %0: %USE%\r
     exit /B 1\r
 )\r
@@ -99,7 +100,7 @@ for %%o in ( wlh wnet wxp ) do (
         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
+            signtool sign /ac %CD%\%2 /n %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

diff --git a/branches/WOF2-0/branches/WinOF/WIX/sign-all-drivers.bat b/branches/WOF2-0/branches/WinOF/WIX/sign-all-drivers.bat
index f6e1bd74cfe13c0ff632c280de3be10c3cdd3773..2d8b207038ab76c99af737f02cad583aa1968439 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/sign-all-drivers.bat
+++ b/branches/WOF2-0/branches/WinOF/WIX/sign-all-drivers.bat
@@ -3,7 +3,7 @@ setlocal
 rem\r
 rem Digitally sign all drivers for all OSes & architectures.\r
 rem\r
-rem example - sign-all-drivers CertFilename CertPassword {noTimeStamp}\r
+rem example - sign-all-drivers CertFilename CertSubjName {noTimeStamp}\r
 rem see TS below.\r
 rem\r
 \r
@@ -18,8 +18,8 @@ if not EXIST %1 (
     exit /B 1\r
 )\r
 \r
-if "%2" == "" (\r
-    echo %0 - Missing Cert Password?\r
+if %2 == "" (\r
+    echo %0 - Missing Cert Subject name?\r
     exit /B 1\r
 )\r
 \r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs
index bf3ca17208ecf8e572a52f377256edc1307f0fff..e1d9ab405e3445632a7728dc6fc3180704695f83 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -3,7 +3,7 @@
    WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows Server 2008\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) ia64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -142,45 +142,50 @@
 \r
           <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
            <Environment Id='UpdatePath' Name='PATH' Action='create'\r
-                           System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-            <File Id="vstat" Name="vstat.exe" Compressed="yes" DiskId="1"\r
-                    Source="..\bin\tools\ia64\release\vstat.exe" Vital="yes" />\r
+                        System='yes' Part='last' Value='[INSTALLDIR]' /> \r
+\r
+            <File Id="part_man" Name="part_man.exe"\r
+                  Compressed="yes" DiskId="1" Vital="yes"\r
+                  Source="..\bin\tools\ia64\release\part_man.exe" />\r
+            <File Id="vstat" Name="vstat.exe"\r
+                  Compressed="yes" DiskId="1" Vital="yes"\r
+                  Source="..\bin\tools\ia64\release\vstat.exe" />\r
             <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
-                    DiskId="1" Name="TTCP.EXE"\r
-                    Source="..\bin\tools\ia64\release\ttcp.exe" />\r
+                  DiskId="1" Name="TTCP.EXE"\r
+                  Source="..\bin\tools\ia64\release\ttcp.exe" />\r
             <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"\r
-                    DiskId="1" Name="CMTEST.EXE"\r
-                    Source="..\bin\tools\ia64\release\cmtest.exe" />\r
+                  DiskId="1" Name="CMTEST.EXE"\r
+                  Source="..\bin\tools\ia64\release\cmtest.exe" />\r
             <File Id="ib_limits.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_limits.exe" />\r
+                  LongName="ib_limits.exe" Name="IB_LIMI.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_limits.exe" />\r
             <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_read_bw.exe" />\r
+                  LongName="ib_read_bw.exe" Name="IB_READ.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_read_bw.exe" />\r
             <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_read_lat.exe" />\r
+                  LongName="ib_read_lat.exe" Name="IB_READ1.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_read_lat.exe" />\r
             <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_send_bw.exe" />\r
+                  LongName="ib_send_bw.exe" Name="IB_SEND.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_send_bw.exe" />\r
             <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_send_lat.exe" />\r
+                  LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_send_lat.exe" />\r
             <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_write_bw.exe" />\r
+                  LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_write_bw.exe" />\r
             <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"\r
-                     Source="..\bin\tools\ia64\release\ib_write_lat.exe" />\r
+                  LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"\r
+                  Source="..\bin\tools\ia64\release\ib_write_lat.exe" />\r
             <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"\r
-                     Source="..\bin\tools\ia64\release\ibtrapgen.exe" />\r
+                  LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"\r
+                  Source="..\bin\tools\ia64\release\ibtrapgen.exe" />\r
             <File Id="osmtest.exe" Compressed="yes" DiskId="1"\r
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"\r
-                     Source="..\bin\tools\ia64\release\osmtest.exe" />\r
+                  LongName="osmtest.exe" Name="OSMTEST.EXE"\r
+                  Source="..\bin\tools\ia64\release\osmtest.exe" />\r
             <File Id="PrintIP.exe" Compressed="yes" DiskId="1"\r
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
-                     Source="..\bin\tools\ia64\release\PrintIP.exe" />\r
+                  LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
+                  Source="..\bin\tools\ia64\release\PrintIP.exe" />\r
             <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"\r
                      Vital="yes" Source="..\bin\tools\ia64\release\nsc.exe" />\r
           </Component>\r
@@ -248,10 +253,10 @@
               <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                      LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                      Source="..\bin\HCA\ia64\IbInstaller.dll" />\r
--->\r
               <File Id="ib_bus.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.cat" Name="IB_BUS.cat"\r
                      Source="..\bin\HCA\ia64\ib_bus.cat" />\r
+-->\r
               <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibal32.dll" Name="IBAL32.DLL"\r
                      Source="..\bin\HCA\ia64\ibal32.dll" />\r
@@ -382,8 +387,6 @@ End Remove -->
 \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
@@ -459,6 +462,9 @@ End Remove -->
                   Source="..\bin\bin\user\objchk_wlh_ia64\ia64\opensm.exe" />\r
                 <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"\r
                   Source="..\bin\bin\user\objchk_wlh_ia64\ia64\vstat.exe" />\r
+                <File Id="file116" Name="part_man.exe"\r
+                  DiskId="1" Compressed="yes"\r
+                  Source="..\bin\bin\user\objchk_wlh_ia64\ia64\part_man.exe" />\r
               </Component>\r
             </Directory>\r
           </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wlh/signDrivers.bat b/branches/WOF2-0/branches/WinOF/WIX/wlh/signDrivers.bat
index 43218c3177715f99064c49aae7126482d5719ab1..8ed0d38c3fcd356276f870ae9a9dde5dba7c6dd0 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wlh/signDrivers.bat
+++ b/branches/WOF2-0/branches/WinOF/WIX/wlh/signDrivers.bat
@@ -3,9 +3,9 @@ setlocal
 \r
 rem Sign device drivers for architectures specified\r
 \r
-rem usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}\r
+rem usage: signDrivers CertFilename CertSubjectName path-2-drivers {noTimeStamp}\r
 \r
-rem example: signDirvers cse1CStore bin\hca\r
+rem example: signDirvers cse1CStore TestCert bin\hca\r
 \r
 \r
 rem cmd.exe /V:on (delayed environment variable expansion) is required!\r
@@ -22,7 +22,7 @@ set DU=/du www.openfabrics.org
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
 if "%1" == "" (\r
-    echo %0 - missing CertName file?\r
+    echo %0 - missing CertFileName?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
@@ -33,18 +33,13 @@ if not EXIST %1 (
     exit /B 1\r
 )\r
 \r
-if "%2" == "" (\r
-    echo %0 - missing Cert FileName password?\r
+rem %2 is already quoted.\r
+if %2 == "" (\r
+    echo %0 - missing Cert Subject Name?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
 \r
-if "%2" == "nopassword" (\r
-    set PWD=\r
-) else (\r
-    set PWD=/p %2\r
-)\r
-\r
 if "%3" == "" (\r
     echo %0 - missing path-2-driver files?\r
     echo %0 - %Usage%\r
@@ -92,24 +87,6 @@ for %%d in (amd64 x86 ia64) do (
                if "%%d" == "x86"   set OEA=%OE%_X86,Vista_X86\r
        if "%%d" == "ia64"  set OEA=%OE%_IA64\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
@@ -119,7 +96,7 @@ 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% %DU% %%f\r
+            signtool sign /ac %1 /n %2 %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
@@ -131,7 +108,6 @@ for %%d in (amd64 x86 ia64) do (
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
         popd\r
     )\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs
index ca3fba82274aac46329b20e6d3205fa6a411bd45..97103cd38d9fc13a64e02d31e1462c4436fd9dd6 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -3,7 +3,7 @@
    WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) x64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -144,8 +144,13 @@
           <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
             <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                          System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-            <File Id="vstat" Name="vstat.exe" Compressed="yes" DiskId="1"\r
-                    Source="..\bin\tools\amd64\release\vstat.exe" Vital="yes" />\r
+\r
+            <File Id="part_man" Name="part_man.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\amd64\release\part_man.exe" />\r
+            <File Id="vstat" Name="vstat.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\amd64\release\vstat.exe" />\r
             <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                     DiskId="1" Name="TTCP.EXE"\r
                     Source="..\bin\tools\amd64\release\ttcp.exe" />\r
@@ -250,10 +255,10 @@
               <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                      LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                      Source="..\bin\HCA\amd64\IbInstaller.dll" />\r
--->\r
               <File Id="ib_bus.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.cat" Name="IB_BUS.cat"\r
                      Source="..\bin\HCA\amd64\ib_bus.cat" />\r
+-->\r
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\amd64\ibbus.sys" />\r
@@ -383,8 +388,6 @@
 \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
@@ -505,6 +508,9 @@
                   <File Id="file174" Name="vstat.exe"\r
                     DiskId="1" Compressed="yes"\r
                     Source="..\bin\bin\user\objchk_wlh_amd64\amd64\vstat.exe" />\r
+                  <File Id="file175" Name="part_man.exe"\r
+                    DiskId="1" Compressed="yes"\r
+                    Source="..\bin\bin\user\objchk_wlh_amd64\amd64\part_man.exe" />\r
                 </Component>\r
             </Directory>\r
           </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs
index 11ca170a3332d49b10197d1d2af1130a66f19ca5..e5310a7d884a872999a43dbd166944039134bd2b 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -4,7 +4,7 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -135,13 +135,15 @@
 \r
                 <Component Id="Tools"\r
                            Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-\r
                     <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                            System='yes' Part='last' Value='[INSTALLDIR]' />\r
 \r
-                    <File Id="vstat" Name="vstat.exe" Compressed="yes"\r
-                          DiskId="1" Source="..\bin\tools\x86\release\vstat.exe"\r
-                          Vital="yes" />\r
+                    <File Id="part_man" Name="part_man.exe"\r
+                          Compressed="yes" DiskId="1" Vital="yes"\r
+                          Source="..\bin\tools\x86\release\part_man.exe" />\r
+                    <File Id="vstat" Name="vstat.exe"\r
+                          Compressed="yes" Vital="yes" DiskId="1"\r
+                          Source="..\bin\tools\x86\release\vstat.exe" />\r
                     <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                           DiskId="1" Name="TTCP.EXE"\r
                           Source="..\bin\tools\x86\release\ttcp.exe" />\r
@@ -234,10 +236,10 @@
                         <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                               LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                               Source="..\bin\HCA\x86\IbInstaller.dll" />\r
--->\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
+-->\r
                         <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibbus.sys" Name="IBBUS.SYS"\r
                               Source="..\bin\HCA\x86\ibbus.sys" />\r
@@ -342,8 +344,6 @@
 \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
@@ -461,6 +461,9 @@
                       <File Id="file151" Name="vstat.exe"\r
                         DiskId="1" Compressed="yes"\r
                         Source="..\bin\bin\user\objchk_wlh_x86\i386\vstat.exe" />\r
+                      <File Id="file152" Name="part_man.exe"\r
+                        DiskId="1" Compressed="yes"\r
+                        Source="..\bin\bin\user\objchk_wlh_x86\i386\part_man.exe" />\r
                     </Component>\r
                   </Directory>\r
                 </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs
index af19fa99d972cb9bb855fde7546c0090d5b69333..319dbb0b2d204f25046353c64064e1fc1d114d31 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -3,7 +3,7 @@
    WinOF for IA64/IPF Itanium on Windown Server 2003\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) ia64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -144,8 +144,13 @@
           <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
            <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                            System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-            <File Id="vstat" Name="vstat.exe" Compressed="yes" DiskId="1"\r
-                    Source="..\bin\tools\ia64\release\vstat.exe" Vital="yes" />\r
+\r
+            <File Id="part_man" Name="part_man.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\ia64\release\part_man.exe" />\r
+            <File Id="vstat" Name="vstat.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\ia64\release\vstat.exe" />\r
             <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                     DiskId="1" Name="TTCP.EXE"\r
                     Source="..\bin\tools\ia64\release\ttcp.exe" />\r
@@ -249,10 +254,10 @@
               <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                      LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                      Source="..\bin\HCA\ia64\IbInstaller.dll" />\r
--->\r
               <File Id="ib_bus.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.cat" Name="IB_BUS.cat"\r
                      Source="..\bin\HCA\ia64\ib_bus.cat" />\r
+-->\r
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\ia64\ibbus.sys" />\r
@@ -388,8 +393,6 @@ End Remove -->
 \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
@@ -488,6 +491,9 @@ End ConnectX remove -->
                   Source="..\bin\bin\user\objchk_wnet_ia64\ia64\opensm.exe" />\r
                 <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"\r
                   Source="..\bin\bin\user\objchk_wnet_ia64\ia64\vstat.exe" />\r
+                <File Id="file116" Name="part_man.exe"\r
+                  DiskId="1" Compressed="yes"\r
+                  Source="..\bin\bin\user\objchk_wnet_ia64\ia64\part_man.exe" />\r
               </Component>\r
             </Directory>\r
           </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wnet/signDrivers.bat b/branches/WOF2-0/branches/WinOF/WIX/wnet/signDrivers.bat
index 81a9d8e9aa00d5f152d6d39664844a7ea89f0ed5..78e7be4dde172d4bf88a31640f6e3f578e7febd4 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wnet/signDrivers.bat
+++ b/branches/WOF2-0/branches/WinOF/WIX/wnet/signDrivers.bat
@@ -3,9 +3,9 @@ setlocal
 \r
 rem Sign device drivers for architectures specified\r
 \r
-rem usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}\r
+rem usage: signDrivers CertFilename CertSubjectName path-2-drivers {noTimeStamp}\r
 \r
-rem example: signDirvers cse1CStore bin\hca\r
+rem example: signDirvers cse1CStore TestCert bin\hca\r
 \r
 \r
 rem cmd.exe /V:on (delayed environment variable expansion) is required!\r
@@ -22,7 +22,7 @@ set DU=/du www.openfabrics.org
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
 if "%1" == "" (\r
-    echo %0 - missing CertName file?\r
+    echo %0 - missing CertFileName?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
@@ -33,18 +33,13 @@ if not EXIST %1 (
     exit /B 1\r
 )\r
 \r
-if "%2" == "" (\r
-    echo %0 - missing Cert FileName password?\r
+rem %2 is already quoted\r
+if %2 == "" (\r
+    echo %0 - missing Cert Subject Name?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
 \r
-if "%2" == "nopassword" (\r
-    set PWD=\r
-) else (\r
-    set PWD=/p %2\r
-)\r
-\r
 if "%3" == "" (\r
     echo %0 - missing path-2-driver files?\r
     echo %0 - %Usage%\r
@@ -92,24 +87,6 @@ for %%d in (amd64 x86 ia64) do (
                if "%%d" == "x86"   set OEA=%OE%_X86\r
        if "%%d" == "ia64"  set OEA=%OE%_IA64\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
@@ -119,7 +96,7 @@ 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% %DU% %%f\r
+            signtool sign /ac %1 /n %2 %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
@@ -131,7 +108,6 @@ for %%d in (amd64 x86 ia64) do (
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
         popd\r
     )\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs
index 85cc202214d18494668c968ec3995afd09fb23f9..31ec49cff199b51cbd74e9c72442cb4172d2174b 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -3,7 +3,7 @@
    WinOF for x64 Windows Server 2003 or XP64\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) x64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -144,8 +144,13 @@
           <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
             <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                          System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-            <File Id="vstat" Name="vstat.exe" Compressed="yes" DiskId="1"\r
-                    Source="..\bin\tools\amd64\release\vstat.exe" Vital="yes" />\r
+\r
+            <File Id="part_man" Name="part_man.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\amd64\release\part_man.exe" />\r
+            <File Id="vstat" Name="vstat.exe"\r
+                    Compressed="yes" DiskId="1" Vital="yes"\r
+                    Source="..\bin\tools\amd64\release\vstat.exe" />\r
             <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                     DiskId="1" Name="TTCP.EXE"\r
                     Source="..\bin\tools\amd64\release\ttcp.exe" />\r
@@ -268,10 +273,10 @@
               <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                      LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                      Source="..\bin\HCA\amd64\IbInstaller.dll" />\r
--->\r
               <File Id="ib_bus.cat" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.cat" Name="IB_BUS.cat"\r
                      Source="..\bin\HCA\amd64\ib_bus.cat" />\r
+-->\r
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibbus.sys" Name="IBBUS.SYS"\r
                      Source="..\bin\HCA\amd64\ibbus.sys" />\r
@@ -380,8 +385,6 @@
 \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
@@ -502,6 +505,9 @@
                   <File Id="file174" Name="vstat.exe"\r
                     DiskId="1" Compressed="yes"\r
                     Source="..\bin\bin\user\objchk_wnet_amd64\amd64\vstat.exe" />\r
+                  <File Id="file175" Name="part_man.exe"\r
+                    DiskId="1" Compressed="yes"\r
+                    Source="..\bin\bin\user\objchk_wnet_amd64\amd64\part_man.exe" />\r
                 </Component>\r
             </Directory>\r
           </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs
index 0f445791e33518f89dd7d5c15ab60272f2d995b7..6fe0ef76a1b827c9b4ef77e13ab11623e39b1a21 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -4,7 +4,7 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -135,13 +135,15 @@
 \r
                 <Component Id="Tools"\r
                            Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-\r
                     <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                            System='yes' Part='last' Value='[INSTALLDIR]' />\r
 \r
-                    <File Id="vstat" Name="vstat.exe" Compressed="yes"\r
-                          DiskId="1" Source="..\bin\tools\x86\release\vstat.exe"\r
-                          Vital="yes" />\r
+                    <File Id="part_man" Name="part_man.exe"\r
+                          Compressed="yes" DiskId="1" Vital="yes"\r
+                          Source="..\bin\tools\x86\release\part_man.exe" />\r
+                    <File Id="vstat" Name="vstat.exe"\r
+                          Compressed="yes" DiskId="1" Vital="yes"\r
+                          Source="..\bin\tools\x86\release\vstat.exe" />\r
                     <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                           DiskId="1" Name="TTCP.EXE"\r
                           Source="..\bin\tools\x86\release\ttcp.exe" />\r
@@ -239,10 +241,10 @@
                         <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
                               Name="ibbus.pdb"\r
                               Source="..\bin\HCA\x86\ibbus.pdb" />\r
+<!--\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
-<!--\r
                         <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                               LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                               Source="..\bin\HCA\x86\IbInstaller.dll" />\r
@@ -342,8 +344,6 @@
 \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
@@ -461,6 +461,9 @@
                       <File Id="file151" Name="vstat.exe"\r
                         DiskId="1" Compressed="yes"\r
                         Source="..\bin\bin\user\objchk_wnet_x86\i386\vstat.exe" />\r
+                      <File Id="file152" Name="part_man.exe"\r
+                        DiskId="1" Compressed="yes"\r
+                        Source="..\bin\bin\user\objchk_wnet_x86\i386\part_man.exe" />\r
                     </Component>\r
                   </Directory>\r
                 </Directory>\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wxp/signDrivers.bat b/branches/WOF2-0/branches/WinOF/WIX/wxp/signDrivers.bat
index 3d33845711bf0c57ac0485ffc35edfde55bbf08a..5c4ba7347cb45733a4efbfa49433d098f237ada2 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wxp/signDrivers.bat
+++ b/branches/WOF2-0/branches/WinOF/WIX/wxp/signDrivers.bat
@@ -3,9 +3,9 @@ setlocal
 \r
 rem Sign device drivers for architectures specified\r
 \r
-rem usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}\r
+rem usage: signDrivers CertFilename CertSubjectName path-2-drivers {noTimeStamp}\r
 \r
-rem example: signDirvers cse1CStore bin\hca\r
+rem example: signDirvers cse1CStore TestCert bin\hca\r
 \r
 \r
 rem cmd.exe /V:on (delayed environment variable expansion) is required!\r
@@ -22,7 +22,7 @@ set DU=/du www.openfabrics.org
 set Usage='usage: signDrivers CertFilename password path-2-drivers {noTimeStamp}'\r
 \r
 if "%1" == "" (\r
-    echo %0 - missing CertName file?\r
+    echo %0 - missing CertFileName?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
@@ -33,18 +33,13 @@ if not EXIST %1 (
     exit /B 1\r
 )\r
 \r
-if "%2" == "" (\r
-    echo %0 - missing Cert FileName password?\r
+rem %2 already quoted\r
+if %2 == "" (\r
+    echo %0 - missing Cert Subject Name?\r
     echo %0 - %Usage%\r
     exit /B 1\r
 )\r
 \r
-if "%2" == "nopassword" (\r
-    set PWD=\r
-) else (\r
-    set PWD=/p %2\r
-)\r
-\r
 if "%3" == "" (\r
     echo %0 - missing path-2-driver files?\r
     echo %0 - %Usage%\r
@@ -92,24 +87,6 @@ for %%d in ( x86 ) do (
 rem     if "%%d" == "amd64" set OEA=%OE%_X64\r
 rem    if "%%d" == "ia64"  set OEA=%OE%_IA64\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
@@ -119,7 +96,7 @@ 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% %DU% %%f\r
+            signtool sign /ac %1 /n %2 %TS% %DU% %%f\r
             if ERRORLEVEL 1 (\r
                 echo %0 signtool sign %%f failed?\r
                 echo %0    file %CD%\%%f\r
@@ -131,7 +108,6 @@ rem if "%%d" == "ia64"  set OEA=%OE%_IA64
                 echo %0    file %CD%\%%f\r
                 exit /B 1\r
             )\r
-rem            echo %0 - Successfully Signed %%d\%%f\r
         )\r
         popd\r
     )\r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs
index 68af2bf9666b92ae3d93d0f953d538ae14895a06..a14239ff44c56102482a042b3b6470fe1cf0a83f 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -4,7 +4,7 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86 XP"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86 XP"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -135,13 +135,15 @@
 \r
                 <Component Id="Tools"\r
                            Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-\r
                     <Environment Id='UpdatePath' Name='PATH' Action='create'\r
                            System='yes' Part='last' Value='[INSTALLDIR]' />\r
 \r
-                    <File Id="vstat" Name="vstat.exe" Compressed="yes"\r
-                          DiskId="1" Source="..\bin\tools\x86\release\vstat.exe"\r
-                          Vital="yes" />\r
+                    <File Id="part_man" Name="part_man.exe"\r
+                          Compressed="yes" DiskId="1" Vital="yes"\r
+                          Source="..\bin\tools\x86\release\part_man.exe" />\r
+                    <File Id="vstat" Name="vstat.exe"\r
+                          Compressed="yes" DiskId="1" Vital="yes"\r
+                          Source="..\bin\tools\x86\release\vstat.exe" />\r
                     <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
                           DiskId="1" Name="TTCP.EXE"\r
                           Source="..\bin\tools\x86\release\ttcp.exe" />\r
@@ -234,10 +236,10 @@
                         <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
                               LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
                               Source="..\bin\HCA\x86\IbInstaller.dll" />\r
--->\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
+-->\r
                         <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibal.dll" Name="IBAL.DLL"\r
                               Source="..\bin\HCA\x86\ibal.dll" />\r
@@ -343,8 +345,6 @@
 \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
@@ -455,6 +455,9 @@
                       <File Id="file151" Name="vstat.exe"\r
                         DiskId="1" Compressed="yes"\r
                         Source="..\bin\bin\user\objchk_wxp_x86\i386\vstat.exe" />\r
+                      <File Id="file152" Name="part_man.exe"\r
+                        DiskId="1" Compressed="yes"\r
+                        Source="..\bin\bin\user\objchk_wxp_x86\i386\part_man.exe" />\r
                     </Component>\r
                   </Directory>\r
                 </Directory>\r

diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index 7bdb58b9bb2d59089e7704735e6487819c72adbc..be1a0845d503441cbbae8c8ad08e3ac5381d853f 100644 (file)
--- a/branches/WOF2-0/trunk/BuildRelease.bat
+++ b/branches/WOF2-0/trunk/BuildRelease.bat
@@ -81,15 +81,15 @@ if "%1" == "clean" (
     exit /B 0\r
 )\r
 \r
-rem Driver Signing Certificate filename, assumes %WIX%\%CERTNAME% is valid.\r
-rem set CERTNAME=noCert\r
-set CERTNAME=WinOF_Software_Pub.pfx\r
-set CERTPWD=WinOF\r
+rem Driver Signing Certificate filename, assumes %WIX%\%CERTFILE% is valid.\r
+rem set CERTFILE=noCert\r
+set CERTFILE=MSCV-VSClass3.cer\r
+set CERTSNAME="OpenFabrics Alliance"\r
 \r
 rem A Digital driver signing certificate store name may be required.\r
 if "%1" == "all" (\r
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] \r
-    if "%CERTNAME%" == "" (\r
+    if "%CERTFILE%" == "noCert" set /P CERTFILE=[Enter Certificate FileName] \r
+    if "%CERTFILE%" == "" (\r
         echo %0\r
         echo %0: Err - driver signing certificate filename required.\r
         echo %0: see certmgr.exe\r
@@ -98,8 +98,8 @@ if "%1" == "all" (
 )\r
 \r
 if "%1" == "msi" (\r
-    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate FileName] \r
-    if "%CERTNAME%" == "" (\r
+    if "%CERTFILE%" == "noCert" set /P CERTFILE=[Enter Certificate FileName] \r
+    if "%CERTFILE%" == "" (\r
         echo %0\r
         echo %0: Err - driver signing certificate filename required.\r
         echo %0: see certmgr.exe\r
@@ -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=1535\r
+set SVN=1554\r
 set LBL=_R2.0\r
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
@@ -209,7 +209,7 @@ if "%1" == "msi-dir" (
 \r
 echo %0 - Building with WDK @ %_DDK%\r
 echo Building for OPENIB_REV %SVN%, installer files @ %IDIR%\r
-echo   Drivers signed using Certificate '%CERTNAME%'\r
+echo   Drivers signed using Certificate '%CERTFILE%'\r
 \r
 rem pause thoughtfully.\r
 if exist %windir%\system32\timeout.exe (\r
@@ -371,7 +371,7 @@ if "%1" == "makebin" goto finito
 \r
 :mk_msi\r
 \r
-echo %0 - Drivers Signed with %CERTNAME%\r
+echo %0 - Drivers Signed with %CERTFILE%\r
 echo   Binary releases created in\r
 echo     %RBIN_WLH%\r
 echo     %RBIN_WNET%\r
@@ -379,7 +379,7 @@ echo     %RBIN_WXP%
 \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 %MSI_CMD% %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% %CERTFILE% %CERTSNAME% %IDIR%"\r
 \r
 \r
 :finito\r