[WinOF] prepare for RC2

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

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 e1d9ab405e3445632a7728dc6fc3180704695f83..54af673643f5e694ffcf4aa7523239d72735a8b7 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 (RC1) ia64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -246,17 +246,6 @@
               <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
-              <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

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 97103cd38d9fc13a64e02d31e1462c4436fd9dd6..93ed9646483b820a5fcdac6b43b13bd4c7a14238 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 (RC1) x64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -248,17 +248,6 @@
               <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
-              <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

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 e5310a7d884a872999a43dbd166944039134bd2b..00def6e613704bce5903d9dff68f73bfe9d835c2 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 (RC1) x86"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -229,17 +229,6 @@
                         <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
-                        <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

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 319dbb0b2d204f25046353c64064e1fc1d114d31..f59414642f859ba3b8713634c4c814941a80fe13 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 (RC1) ia64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -247,17 +247,6 @@
               <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
-              <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

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 31ec49cff199b51cbd74e9c72442cb4172d2174b..43ba50b77fdff6dbaac46c1879e05b07245f4781 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 (RC1) x64"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
     Version="2.0.0"\r
@@ -266,17 +266,6 @@
               <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
-              <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

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 6fe0ef76a1b827c9b4ef77e13ab11623e39b1a21..2eb3a4a110fe4fa2fc4275bab8bdf459cc750c33 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 (RC1) x86"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -241,17 +241,6 @@
                         <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
-                        <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/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs
index a14239ff44c56102482a042b3b6470fe1cf0a83f..64dcb2b000e3341a37079898e27ada7be3333587 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 (RC1) x86 XP"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86 XP"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
    Version="2.0.0"\r
@@ -229,17 +229,6 @@
                         <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
-                        <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