[WinOF]

branches\WinOF\WIX\
  CustomActions.vbs
     invoke ndinstall.exe -i / -r (Install,uninstall).
     devcon invocations for remove, use '*' instead of explicit dev names for IPOIB.
ND install + 32bit .cdf considerations.
  branches\WinOF\WIX\wxp\x86\wof.wxs
  branches\WinOF\WIX\wnet\ia64\wof.wxs
  branches\WinOF\WIX\wnet\x64\wof.wxs
  branches\WinOF\WIX\wnet\x86\wof.wxs
  branches\WinOF\WIX\wlh\ia64\wof.wxs
  branches\WinOF\WIX\wlh\x64\wof.wxs
  branches\WinOF\WIX\wlh\x86\wof.wxs

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

diff --git a/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WinOF/WIX/wlh/ia64/wof.wxs
index a6ee5618f81a4bb5332affcf7b2860797b53ddea..8bb3bf6c320d17ad01440e376adaa92a90001a6e 100644 (file)
--- a/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF for IA64/IPF Itanium on Windows Server 2008\r
+   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)"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
-    Version="1.1.0"\r
+    Version="2.0.0"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -433,6 +433,12 @@ End Remove -->
               <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                      Source="..\bin\net\ia64\ibwsd.dll" />\r
+              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                     Source="..\bin\net\ia64\ibndprov.dll" />\r
+              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+                     Source="..\bin\net\ia64\ibndprov32.dll" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -441,10 +447,6 @@ End Remove -->
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\ia64\installsp.exe" />\r
-            <File Id="installsp.exe.manifest" Compressed="yes" DiskId="1"\r
-                     LongName="installsp.exe.manifest"\r
-                     Name="INSTALL.man"\r
-                    Source="..\bin\net\ia64\installsp.exe.manifest" />\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1227,7 +1229,7 @@ End Remove -->
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WinOF/WIX/wlh/x64/wof.wxs
index 7d0cbae937aa220f1b5b255999b7c867eaaf23b3..fbe8a8fa37098663e17391400b67d6990ceae748 100644 (file)
--- a/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF for x64 Windows Server 2008 or Vista\r
+   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)"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
-    Version="1.1.0"\r
+    Version="2.0.0"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -460,6 +460,12 @@
               <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                      Source="..\bin\net\amd64\ibwsd.dll" />\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="ibndprov32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+                     Source="..\bin\net\amd64\ibndprov32.dll" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -468,10 +474,9 @@
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\amd64\installsp.exe" />\r
-            <File Id="installsp.exe.manifest" Compressed="yes" DiskId="1"\r
-                     LongName="installsp.exe.manifest"\r
-                     Name="INSTALLM.man"\r
-                   Source="..\bin\net\amd64\installsp.exe.manifest" />\r
+            <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                     Source="..\bin\net\amd64\ndinstall.exe" />\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1259,7 +1264,7 @@
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WinOF/WIX/wlh/x86/wof.wxs
index 4a4ff9ddc45d71424dc3edc509ce911b20e8d0a7..a8c63976de9336ed0a32389daf14ad00bb94e69c 100644 (file)
--- a/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -4,10 +4,10 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0)"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
-   Version="1.1.0"\r
+   Version="2.0.0"\r
    Language="1033" Codepage="1252"\r
    Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -405,6 +405,9 @@
                         <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="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                              Source="..\bin\net\x86\ibndprov.dll" />\r
                     </Component>\r
                 </Directory>\r
 \r
@@ -413,10 +416,9 @@
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\net\x86\installsp.exe" />\r
-                    <File Id="installsp.exe.manifest" Compressed="yes"\r
-                             DiskId="1" LongName="installsp.exe.manifest"\r
-                             Name="INSTALL.man"\r
-                             Source="..\bin\net\x86\installsp.exe.manifest" />\r
+                    <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                              Source="..\bin\net\x86\ndinstall.exe" />\r
                 </Component>\r
 \r
                 <Component Id="cDAPL1RT"\r
@@ -1155,7 +1157,7 @@
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WinOF/WIX/wnet/ia64/wof.wxs
index bf4e1a265822943f03280c6933ee64b73c31dca7..f0c64051d2c164004ba67463d7730753d5a24574 100644 (file)
--- a/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF 1.0.1 for IA64/IPF Itanium on Windown Server 2003\r
+   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)"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) ia64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
-    Version="1.1.0"\r
+    Version="2.0.0"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -425,6 +425,9 @@ End Remove -->
               <File Id="ipoib_cat" Compressed="yes" DiskId="1"\r
                      LongName="ipoib.cat" Name="IPOI.cat"\r
                      Source="..\bin\net\ia64\ipoib.cat" />\r
+              <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="ibwsd32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
                      Source="..\bin\net\ia64\ibwsd32.dll" />\r
@@ -434,9 +437,12 @@ End Remove -->
               <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                      Source="..\bin\net\ia64\ibwsd.dll" />\r
-              <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="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                     Source="..\bin\net\ia64\ibndprov.dll" />\r
+              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+                     Source="..\bin\net\ia64\ibndprov32.dll" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -445,10 +451,6 @@ End Remove -->
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\ia64\installsp.exe" />\r
-            <File Id="installsp.exe.manifest" Compressed="yes" DiskId="1"\r
-                     LongName="installsp.exe.manifest"\r
-                     Name="INSTALL.man"\r
-                    Source="..\bin\net\ia64\installsp.exe.manifest" />\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1231,7 +1233,7 @@ End Remove -->
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WinOF/WIX/wnet/x64/wof.wxs
index fa437c402a3c1ea19246a082d96885ee5353c1a2..0dbd31639a997d029acd665c06e02bc9802c318e 100644 (file)
--- a/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -3,10 +3,10 @@
    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)"\r
+  <Product Name="Windows Open Fabrics InfiniBand v2.0 (RC0) x64"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
-    Version="1.1.0"\r
+    Version="2.0.0"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -460,6 +460,12 @@
               <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="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                     Source="..\bin\net\amd64\ibndprov.dll" />\r
+              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+                     Source="..\bin\net\amd64\ibndprov32.dll" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -468,10 +474,9 @@
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\amd64\installsp.exe" />\r
-            <File Id="installsp.exe.manifest" Compressed="yes" DiskId="1"\r
-                     LongName="installsp.exe.manifest"\r
-                     Name="INSTALLM.man"\r
-                   Source="..\bin\net\amd64\installsp.exe.manifest" />\r
+            <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                     LongName="ndinstall.exe" Name="INSTALL.EXE"\r
+                     Source="..\bin\net\amd64\ndinstall.exe" />\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1259,7 +1264,7 @@
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WinOF/WIX/wnet/x86/wof.wxs
index 25dd33a0b799407447606af4433fef479f7359e5..3a94c40950dd3416aa92bfa59d65e376af19fef0 100644 (file)
--- a/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -4,10 +4,10 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0)"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
-   Version="1.1.0"\r
+   Version="2.0.0"\r
    Language="1033" Codepage="1252"\r
    Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -224,12 +224,6 @@
                         <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
                               LongName="complibd.dll" Name="COMPLIBD.DLL"\r
                               Source="..\bin\HCA\x86\complibd.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
-                        <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="ibal.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibal.dll" Name="IBAL.DLL"\r
                               Source="..\bin\HCA\x86\ibal.dll" />\r
@@ -239,9 +233,17 @@
                         <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="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
@@ -405,6 +407,9 @@
                         <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="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                              Source="..\bin\net\x86\ibndprov.dll" />\r
                     </Component>\r
                 </Directory>\r
 \r
@@ -413,10 +418,9 @@
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\net\x86\installsp.exe" />\r
-                    <File Id="installsp.exe.manifest" Compressed="yes"\r
-                             DiskId="1" LongName="installsp.exe.manifest"\r
-                             Name="INSTALL.man"\r
-                             Source="..\bin\net\x86\installsp.exe.manifest" />\r
+                    <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                              Source="..\bin\net\x86\ndinstall.exe" />\r
                 </Component>\r
 \r
                 <Component Id="cDAPL1RT"\r
@@ -1155,7 +1159,7 @@
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r

diff --git a/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WinOF/WIX/wxp/x86/wof.wxs
index f791efe3e30a47460232a6366b89cd9a7334f174..a0df7b63a0e22af89fe9b7834278db23cbbcfa17 100644 (file)
--- a/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -4,10 +4,10 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0)"\r
+  <Product Name="Windows OpenFabrics InfiniBand v2.0 (RC0) x86 XP"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
-   Version="1.1.0"\r
+   Version="2.0.0"\r
    Language="1033" Codepage="1252"\r
    Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -410,10 +410,6 @@
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\net\x86\installsp.exe" />\r
-                    <File Id="installsp.exe.manifest" Compressed="yes"\r
-                             DiskId="1" LongName="installsp.exe.manifest"\r
-                             Name="INSTALL.man"\r
-                             Source="..\bin\net\x86\installsp.exe.manifest" />\r
                 </Component>\r
 -->\r
 \r
@@ -1160,7 +1156,7 @@
     </Feature>\r
 \r
     <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: copy only - Not installed."\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checed."\r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r