[WinOF] start of the 2.0 release cycle.

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

diff --git a/branches/WinOF/WIX/README_release.txt b/branches/WinOF/WIX/README_release.txt
index d10fe010e84261147cad84056aef4ecb1418612c..aa23dadf1baeadb630cb0f07ef75aa47ac6eb242 100644 (file)
--- a/branches/WinOF/WIX/README_release.txt
+++ b/branches/WinOF/WIX/README_release.txt
@@ -1,22 +1,24 @@
 \r
-[06-30-08] WinOF 2.0 (RCx) release\r
+[08-26-08] WinOF 2.0 (RC0) release\r
 \r
 \r
 WinOF 2.0 Summary Changes \r
 -------------------------\r
 \r
 1) WinOF 2.0 release based on openib-windows svn source revision\r
-   (branches\WOF2-0 svn.xxxx).\r
+   (branches\WOF2-0 svn.1504).\r
 \r
    Last WinOF release (1.1) based on svn 1177.\r
 \r
 2) Stability enhancements in\r
    IB Core\r
+        BSOD nonexistant GUID in registry fixed.\r
    IPoIB       \r
    WSD\r
    VNIC\r
    SRP\r
        Disconnect hang fixed.\r
+        BSOD fixed.\r
    DAT/DAPL\r
 \r
 3) New Functionality\r
@@ -29,11 +31,16 @@ WinOF 2.0 Summary Changes
        WNET - Windows Server 2003 & XP(64bit)\r
        WXP  - Windows XP (32bit)\r
 \r
-   DAT/DAPL\r
-       DAPL v2 Socket CM available for Windows to Linux (OFED 1.4) Dat interoperability.\r
+   IPoIB:\r
+       multicast garbage collector.\r
+       IGMPv2 support.\r
+\r
+   WinVerbs: OFED verbs API for Windows\r
+\r
+5) Drivers digitally signed by the OpenFabrics Alliance\r
 \r
-3) WinOF symbol store available.\r
-   Point windbg at http://www.openfabrics.org/downloads/WinOF/v2.0/OS-flavor/SymStor\r
+4) WinOF symbol store available.\r
+   Point windbg at http://www.openfabrics.org/downloads/WinOF/v2.0/{wlh,wnet,wxp}/SymStor\r
 \r
 \r
 \r

diff --git a/branches/WinOF/WIX/Release_notes.htm b/branches/WinOF/WIX/Release_notes.htm
index 679681b0075ec4eff123204e2a72a654911672d6..db461d8bebe763a14adfacbee6b3232a84564bd9 100644 (file)
--- a/branches/WinOF/WIX/Release_notes.htm
+++ b/branches/WinOF/WIX/Release_notes.htm
@@ -92,7 +92,7 @@ src=openfabrics.gif></h1>
 <h1 align=center style='text-align:center'><a name="1.1_Release_Notes">2.0 Release Notes</a></h1>\r
 \r
 <h3 align=center style='text-align:center'>\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->05/28/2008<!--webbot bot="Timestamp" endspan i-checksum="12646" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->08/25/2008<!--webbot bot="Timestamp" endspan i-checksum="12604" --></h3>\r
 \r
 <div class=MsoNormal align=center style='text-align:center'>\r
 \r
@@ -145,30 +145,27 @@ 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\WOF1-1 svn revision <font color="#FF0000">1177</font>)\r
+(branches\WOF1-1 svn revision <font color="#FF0000">1504</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
 &nbsp;</span></p>\r
 <p class=MsoPlainText><font size="3"><span style="font-family: Times New Roman">\r
-This WinOF 1.1 is a new release as it contains new functionality and bug fixes \r
+This WinOF 2.0 is a new release as it contains new functionality and bug fixes \r
 to numerous components:</span></font></p>\r
 \r
 </div>\r
 <ul>\r
+       <li>\r
+       <p class="MsoPlainText"><font face="Times New Roman" size="3">Windows Server \r
+       2008 and Vista are now support.</font></p></li>\r
        <li>\r
        <p class="MsoPlainText"><font face="Times New Roman" size="3">Mellanox has \r
-       provided driver support for ConnectX hardware.</font></p></li>\r
+       ConnectX(mlx4) drivers for increased stability.</font></p></li>\r
        <li>\r
        <p class="MsoPlainText"><font face="Times New Roman" size="3">QLogic has \r
        enhanced VNIC &amp; SRP for increased stability.</font></p></li>\r
        <li>\r
-       <p class="MsoPlainText"><font face="Times New Roman" size="3">DAPL Socket CM provider now enables Windows to Linux \r
-       DAT interoperability</font></p></li>\r
-       <li>\r
-       <p class="MsoPlainText"><font face="Times New Roman" size="3">DAT/DAPL source is synchronized with OFED 1.3 DAT/DAPL.</font></p>\r
-       </li>\r
-       <li>\r
        <p class="MsoPlainText"><font face="Times New Roman" size="3">Bug fixes for stability in IBcore, WSD, VNIC, SRP, IPoIB, DAT/DAPL</font></p>\r
        </li>\r
 </ul>\r
@@ -252,6 +249,10 @@ supported devices below</span></li>
        <p style='margin-left:.5in;text-indent:-.25in'><span dir="LTR">Vista</span></p>\r
        </li>\r
        <li>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>Windows Server 200 \r
+       HPC Edition</span></p>\r
+       </li>\r
+       <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><span dir="LTR">Windows Server 2003</span></p>\r
        </li>\r
        <li>\r
@@ -285,7 +286,7 @@ tab-stops:list .5in'>
        <p style='margin-left:.5in;text-indent:-.25in;mso-list:l13 level1 lfo1;\r
 tab-stops:list .5in'><span style="background-position: 0% 0%">MT25408 - </span>\r
        <span style="background-position: 0% 0%">ConnectX DDR Channel Adapter, not \r
-       yet available on IA64 platforms.</span></p>\r
+       yet supported on IA64 platforms.</span></p>\r
        </li>\r
 </ul>\r
 <p>Both SDR and DDR mode of the InfiniHost III family are supported.<br><br>For official Firmware (FW) versions and update tools please see:<br>\r
@@ -299,7 +300,8 @@ Current HCA firmware version can be viewed from the 'vstat' command.</p>
        <p style='margin-left:.5in;text-indent:-.25in'><span dir="LTR">QLogic</span></p>\r
        </li>\r
        <li>\r
-       <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>SilverStorm</span></p>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>SilverStorm - \r
+       update your firmware!</span></p>\r
        </li>\r
        <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><span dir="LTR">Voltaire</span></p>\r

diff --git a/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WinOF/WIX/wlh/ia64/wof.wxs
index 7d82173ead024975f09353ecf11cd8a2347fd1b7..ec144d2b224e0218cbcff886930055717e219387 100644 (file)
--- a/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -217,6 +217,9 @@
             <Component Id="cIBcore"\r
                        Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
               <CreateFolder />\r
+              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                     LongName="dpinst.exe" Name="dpinst.exe"\r
+                     Source="..\..\ia64\dpinst.exe" />\r
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\ia64\devman.exe" />\r
@@ -238,9 +241,14 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                      LongName="complibd.dll" Name="COMPLIB1.DLL"\r
                      Source="..\bin\HCA\ia64\complibd.dll" />\r
+<!--\r
               <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                      Source="..\bin\HCA\ia64\ib_bus.inf" />\r
+              <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
@@ -265,9 +273,6 @@
               <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="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                     Source="..\bin\HCA\ia64\IbInstaller.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

diff --git a/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WinOF/WIX/wlh/x64/wof.wxs
index cef3276fef02d5054a57151ff838b6f6847156ae..8ee8fe39cf992d12dab83a84183744c0ca0e9471 100644 (file)
--- a/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -218,6 +218,9 @@
             <Component Id="cIBcore"\r
                        Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
               <CreateFolder />\r
+              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                     LongName="dpinst.exe" Name="dpinst.exe"\r
+                     Source="..\..\x64\dpinst.exe" />\r
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\x64\devman.exe" />\r
@@ -240,9 +243,14 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                      LongName="complibd.dll" Name="COMPLIB1.DLL"\r
                      Source="..\bin\HCA\amd64\complibd.dll" />\r
+<!--\r
               <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                      Source="..\bin\HCA\amd64\ib_bus.inf" />\r
+              <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
@@ -267,9 +275,6 @@
               <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibald.dll" Name="IBALD.DLL"\r
                      Source="..\bin\HCA\amd64\ibald.dll" />\r
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                     Source="..\bin\HCA\amd64\IbInstaller.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

diff --git a/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WinOF/WIX/wlh/x86/wof.wxs
index 41811c3b7d56d420731bb6ccd20dd107bbc75e31..97cdc2b576ce5dd5b7b282d348834b74ba7954ad 100644 (file)
--- a/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -215,6 +215,9 @@
                     <Component Id="cIBcore"\r
                                Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
                         <CreateFolder />\r
+                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                              LongName="dpinst.exe" Name="dpinst.exe"\r
+                              Source="..\..\x86\dpinst.exe" />\r
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
@@ -224,9 +227,14 @@
                         <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                               LongName="complibd.dll" Name="COMPLIBD.DLL"\r
                               Source="..\bin\HCA\x86\complibd.dll" />\r
+<!--\r
                         <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                               LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                               Source="..\bin\HCA\x86\ib_bus.inf" />\r
+                        <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
@@ -239,9 +247,6 @@
                         <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibald.dll" Name="IBALD.DLL"\r
                               Source="..\bin\HCA\x86\ibald.dll" />\r
-                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                              Source="..\bin\HCA\x86\IbInstaller.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

diff --git a/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WinOF/WIX/wnet/ia64/wof.wxs
index bc792df1acbd624e5cf09391b6f48632935e986a..2e7d7e4f112f4f168c6a840fe7145c3b110b33b4 100644 (file)
--- a/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -218,6 +218,9 @@
             <Component Id="cIBcore"\r
                        Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
               <CreateFolder />\r
+              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                     LongName="dpinst.exe" Name="dpinst.exe"\r
+                     Source="..\..\ia64\dpinst.exe" />\r
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\ia64\devman.exe" />\r
@@ -239,9 +242,14 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                      LongName="complibd.dll" Name="COMPLIB1.DLL"\r
                      Source="..\bin\HCA\ia64\complibd.dll" />\r
+<!--\r
               <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                      Source="..\bin\HCA\ia64\ib_bus.inf" />\r
+              <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
@@ -266,9 +274,6 @@
               <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibald.dll" Name="IBALD.DLL"\r
                      Source="..\bin\HCA\ia64\ibald.dll" />\r
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                     Source="..\bin\HCA\ia64\IbInstaller.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

diff --git a/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WinOF/WIX/wnet/x64/wof.wxs
index 96a3ddaff1534b56ffb9d65919ae8eb338602d5c..9e8dd1513b705c13b84fc34c8692a4e972287b2b 100644 (file)
--- a/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -218,6 +218,9 @@
             <Component Id="cIBcore"\r
                        Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
               <CreateFolder />\r
+              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                     LongName="dpinst.exe" Name="dpinst.exe"\r
+                     Source="..\..\x64\dpinst.exe" />\r
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\x64\devman.exe" />\r
@@ -258,18 +261,20 @@
               <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibald.dll" Name="IBALD.DLL"\r
                      Source="..\bin\HCA\amd64\ibald.dll" />\r
+<!--\r
               <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                      LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                      Source="..\bin\HCA\amd64\ib_bus.inf" />\r
+              <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
               <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="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                     Source="..\bin\HCA\amd64\IbInstaller.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

diff --git a/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WinOF/WIX/wnet/x86/wof.wxs
index a227c39832ae764b11878f966e91243df70a3352..66d8e9eb28d21ff4f27b48327f960c00dc13ed7d 100644 (file)
--- a/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -215,6 +215,9 @@
                     <Component Id="cIBcore"\r
                                Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
                         <CreateFolder />\r
+                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                              LongName="dpinst.exe" Name="dpinst.exe"\r
+                              Source="..\..\x86\dpinst.exe" />\r
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
@@ -236,12 +239,14 @@
                         <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
                         <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                               LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                               Source="..\bin\HCA\x86\ib_bus.inf" />\r
+-->\r
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r

diff --git a/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WinOF/WIX/wxp/x86/wof.wxs
index f8a7b3052f3955c6b9597b13dd404101a8181dea..52534abc63c94a124d5717cc859f70a6e61baa39 100644 (file)
--- a/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -215,6 +215,9 @@
                     <Component Id="cIBcore"\r
                                Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
                         <CreateFolder />\r
+                        <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+                              LongName="dpinst.exe" Name="dpinst.exe"\r
+                              Source="..\..\x86\dpinst.exe" />\r
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
@@ -224,9 +227,14 @@
                         <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                               LongName="complibd.dll" Name="COMPLIBD.DLL"\r
                               Source="..\bin\HCA\x86\complibd.dll" />\r
+<!--\r
                         <File Id="ib_bus.inf" Compressed="yes" DiskId="1"\r
                               LongName="ib_bus.inf" Name="IB_BUS.INF"\r
                               Source="..\bin\HCA\x86\ib_bus.inf" />\r
+                        <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
@@ -239,9 +247,6 @@
                         <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="IbInstaller.dll" Compressed="yes" DiskId="1"\r
-                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"\r
-                              Source="..\bin\HCA\x86\IbInstaller.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