From 326f37709e5ce917d248b79946d684ae8a8fbd16 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Wed, 10 Sep 2008 17:28:11 +0000
Subject: [PATCH] [WinOF] prepare for RC2

git-svn-id: svn://openib.tc.cornell.edu/gen1@1591 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs | 13 +------------
 branches/WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs  | 13 +------------
 branches/WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs  | 13 +------------
 .../WOF2-0/branches/WinOF/WIX/wnet/ia64/wof.wxs     | 13 +------------
 branches/WOF2-0/branches/WinOF/WIX/wnet/x64/wof.wxs | 13 +------------
 branches/WOF2-0/branches/WinOF/WIX/wnet/x86/wof.wxs | 13 +------------
 branches/WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs  | 13 +------------
 7 files changed, 7 insertions(+), 84 deletions(-)

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 e1d9ab40..54af6736 100644
--- 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
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) ia64"
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) ia64"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
     Version="2.0.0"
@@ -246,17 +246,6 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"
                      LongName="complibd.dll" Name="COMPLIB1.DLL"
                      Source="..\bin\HCA\ia64\complibd.dll" />
-<!--
-              <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.inf" Name="IB_BUS.INF"
-                     Source="..\bin\HCA\ia64\ib_bus.inf" />
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                     Source="..\bin\HCA\ia64\IbInstaller.dll" />
-              <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.cat" Name="IB_BUS.cat"
-                     Source="..\bin\HCA\ia64\ib_bus.cat" />
--->
               <File Id="ibal32.dll" Compressed="yes" DiskId="1"
                      LongName="ibal32.dll" Name="IBAL32.DLL"
                      Source="..\bin\HCA\ia64\ibal32.dll" />
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 97103cd3..93ed9646 100644
--- 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
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) x64"
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) x64"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
     Version="2.0.0"
@@ -248,17 +248,6 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"
                      LongName="complibd.dll" Name="COMPLIB1.DLL"
                      Source="..\bin\HCA\amd64\complibd.dll" />
-<!--
-              <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.inf" Name="IB_BUS.INF"
-                     Source="..\bin\HCA\amd64\ib_bus.inf" />
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                     Source="..\bin\HCA\amd64\IbInstaller.dll" />
-              <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.cat" Name="IB_BUS.cat"
-                     Source="..\bin\HCA\amd64\ib_bus.cat" />
--->
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"
                      LongName="ibbus.sys" Name="IBBUS.SYS"
                      Source="..\bin\HCA\amd64\ibbus.sys" />
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 e5310a7d..00def6e6 100644
--- 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 @@
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86"
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86"
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
    Version="2.0.0"
@@ -229,17 +229,6 @@
                         <File Id="complibd.dll" Compressed="yes" DiskId="1"
                               LongName="complibd.dll" Name="COMPLIBD.DLL"
                               Source="..\bin\HCA\x86\complibd.dll" />
-<!--
-                        <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.inf" Name="IB_BUS.INF"
-                              Source="..\bin\HCA\x86\ib_bus.inf" />
-                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                              Source="..\bin\HCA\x86\IbInstaller.dll" />
-                        <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.cat" Name="IB_BUS.cat"
-                              Source="..\bin\HCA\x86\ib_bus.cat" />
--->
                         <File Id="ibbus.sys" Compressed="yes" DiskId="1"
                               LongName="ibbus.sys" Name="IBBUS.SYS"
                               Source="..\bin\HCA\x86\ibbus.sys" />
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 319dbb0b..f5941464 100644
--- 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
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) ia64"
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) ia64"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
     Version="2.0.0"
@@ -247,17 +247,6 @@
               <File Id="complibd.dll" Compressed="yes" DiskId="1"
                      LongName="complibd.dll" Name="COMPLIB1.DLL"
                      Source="..\bin\HCA\ia64\complibd.dll" />
-<!--
-              <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.inf" Name="IB_BUS.INF"
-                     Source="..\bin\HCA\ia64\ib_bus.inf" />
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                     Source="..\bin\HCA\ia64\IbInstaller.dll" />
-              <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.cat" Name="IB_BUS.cat"
-                     Source="..\bin\HCA\ia64\ib_bus.cat" />
--->
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"
                      LongName="ibbus.sys" Name="IBBUS.SYS"
                      Source="..\bin\HCA\ia64\ibbus.sys" />
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 31ec49cf..43ba50b7 100644
--- 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
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC1) x64"
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC2) x64"
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' 
     Version="2.0.0"
@@ -266,17 +266,6 @@
               <File Id="ibald.dll" Compressed="yes" DiskId="1"
                      LongName="ibald.dll" Name="IBALD.DLL"
                      Source="..\bin\HCA\amd64\ibald.dll" />
-<!--
-              <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.inf" Name="IB_BUS.INF"
-                     Source="..\bin\HCA\amd64\ib_bus.inf" />
-              <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                     LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                     Source="..\bin\HCA\amd64\IbInstaller.dll" />
-              <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                     LongName="ib_bus.cat" Name="IB_BUS.cat"
-                     Source="..\bin\HCA\amd64\ib_bus.cat" />
--->
               <File Id="ibbus.sys" Compressed="yes" DiskId="1"
                      LongName="ibbus.sys" Name="IBBUS.SYS"
                      Source="..\bin\HCA\amd64\ibbus.sys" />
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 6fe0ef76..2eb3a4a1 100644
--- 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 @@
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86"
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86"
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
    Version="2.0.0"
@@ -241,17 +241,6 @@
                         <File Id="ibbus.pdb" Compressed="yes" DiskId="1"
                               Name="ibbus.pdb"
                               Source="..\bin\HCA\x86\ibbus.pdb" />
-<!--
-                        <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.cat" Name="IB_BUS.cat"
-                              Source="..\bin\HCA\x86\ib_bus.cat" />
-                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                              Source="..\bin\HCA\x86\IbInstaller.dll" />
-                        <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.inf" Name="IB_BUS.INF"
-                              Source="..\bin\HCA\x86\ib_bus.inf" />
--->
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"
                               LongName="ibiou.sys" Name="IBIOU.SYS"
                               Source="..\bin\HCA\x86\ibiou.sys" />
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 a14239ff..64dcb2b0 100644
--- 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 @@
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC1) x86 XP"
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC2) x86 XP"
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'
    Version="2.0.0"
@@ -229,17 +229,6 @@
                         <File Id="complibd.dll" Compressed="yes" DiskId="1"
                               LongName="complibd.dll" Name="COMPLIBD.DLL"
                               Source="..\bin\HCA\x86\complibd.dll" />
-<!--
-                        <File Id="ib_bus.inf" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.inf" Name="IB_BUS.INF"
-                              Source="..\bin\HCA\x86\ib_bus.inf" />
-                        <File Id="IbInstaller.dll" Compressed="yes" DiskId="1"
-                              LongName="IbInstaller.dll" Name="IBINSTA.DLL"
-                              Source="..\bin\HCA\x86\IbInstaller.dll" />
-                        <File Id="ib_bus.cat" Compressed="yes" DiskId="1"
-                              LongName="ib_bus.cat" Name="IB_BUS.cat"
-                              Source="..\bin\HCA\x86\ib_bus.cat" />
--->
                         <File Id="ibal.dll" Compressed="yes" DiskId="1"
                               LongName="ibal.dll" Name="IBAL.DLL"
                               Source="..\bin\HCA\x86\ibal.dll" />
-- 
2.46.0