From e6d568f81b918eeb3f11305292795f5488df8376 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 2 Oct 2007 00:48:21 +0000
Subject: [PATCH] [WinOF] WIX updated to handled .cdf & manifest files.

git-svn-id: svn://openib.tc.cornell.edu/gen1@837 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 branches/WinOF/WIX/x86/wof.wxs | 49 ++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index 26965254..ac5b26c6 100644
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -191,6 +191,9 @@
                         <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="ib_bus.cdf" Compressed="yes" DiskId="1"
+                              LongName="ib_bus.cdf" Name="IB_BUS.cdf"
+                              Source="..\bin\HCA\x86\ib_bus.cdf" />
                         <File Id="ibal.dll" Compressed="yes" DiskId="1"
                               LongName="ibal.dll" Name="IBAL.DLL"
                               Source="..\bin\HCA\x86\ibal.dll" />
@@ -209,6 +212,9 @@
                         <File Id="mthca.inf" Compressed="yes" DiskId="1"
                               LongName="mthca.inf" Name="MTHCA.INF"
                               Source="..\bin\HCA\x86\mthca.inf" />
+                        <File Id="mthca.cdf" Compressed="yes" DiskId="1"
+                              LongName="mthca.cdf" Name="MTHCA.cdf"
+                              Source="..\bin\HCA\x86\mthca.cdf" />
                         <File Id="mthca.sys" Compressed="yes" DiskId="1"
                               LongName="mthca.sys" Name="MTHCA.SYS"
                               Source="..\bin\HCA\x86\mthca.sys" />
@@ -228,6 +234,9 @@
                         <File Id="netipoib_inf" Compressed="yes" DiskId="1"
                               LongName="netipoib.inf" Name="NETIPOI.INF"
                               Source="..\bin\net\x86\netipoib.inf" />
+                        <File Id="ipoib_cdf" Compressed="yes" DiskId="1"
+                              LongName="ipoib.cdf" Name="IPOI.cdf"
+                              Source="..\bin\net\x86\ipoib.cdf" />
                         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
                               LongName="ibwsd.dll" Name="IBWSD.DLL"
                               Source="..\bin\net\x86\ibwsd.dll" />
@@ -241,7 +250,11 @@
                            Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"
                               LongName="installsp.exe" Name="INSTALL.EXE"
-                              Source="..\bin\tools\x86\release\installsp.exe" />
+                              Source="..\bin\net\x86\installsp.exe" />
+                    <File Id="installsp.exe.manifest" Compressed="yes"
+                             DiskId="1" LongName="installsp.exe.manifest"
+                             Name="INSTALL.man"
+                             Source="..\bin\net\x86\installsp.exe.manifest" />
                 </Component>
 
                 <Component Id="cDAPL1RT"
@@ -365,9 +378,6 @@
 
                 <Component Id="OpenSM_Service_enabled"
                            Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">
-                    <File Id="opensm.txt" Compressed="yes" DiskId="1"
-                          LongName="opensm.service.txt" Name="OPENSM.TXT"
-                          Source="..\opensm.service.txt" />
                 </Component>
             </Directory>
         </Directory>
@@ -559,7 +569,7 @@
         <ComponentRef Id="WinsockDirect" />
     </Feature>
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <Condition Level="201"> IPOIB_EXISTS </Condition>
 
@@ -578,13 +588,6 @@
         <ComponentRef Id="cDAPL1RT" />
       </Feature>
 
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"
-         Description="DAT 2.0 runtime libraries"
-         Display="expand" Level="2" 
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
-        <ComponentRef Id="cDAPL2RT" />
-      </Feature>
-
       <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"
          Description="DAT 1.1 Application Build Kit - Headers and Libraries"
          Display="expand" Level="2" 
@@ -595,6 +598,13 @@
          <ComponentRef Id="cDatBldV1Libs" />
       </Feature>
 
+      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"
+         Description="DAT 2.0 runtime libraries"
+         Display="expand" Level="1" 
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>
+        <ComponentRef Id="cDAPL2RT" />
+      </Feature>
+
       <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"
          Description="DAT 2.0 Application Build Kit - Headers and Libraries"
          Display="expand" Level="2" 
@@ -643,7 +653,10 @@
          VBScriptCall="WSDEnable" Return="check" />
 
     <CustomAction Id="OpenSM_setup" BinaryKey="CA"
-         VBScriptCall="OpenSMServiceEvent" Return="check" />
+         VBScriptCall="OpenSM_Install" Return="check" />
+
+    <CustomAction Id="OpenSM_start" BinaryKey="CA"
+         VBScriptCall="OpenSM_StartMeUp" Return="check" />
 
     <CustomAction Id="HammerTime" BinaryKey="CA"
          VBScriptCall="HammerTime" Return="check" />
@@ -658,13 +671,21 @@
        <!--> Install ONLY </!-->
        <Custom Action="ChkPreviousInstall" After="WinOF_setup">
            NOT Installed</Custom>
+
        <ScheduleReboot After="ChkPreviousInstall">
            REBOOT="FORCE"</ScheduleReboot>
+
        <Custom Action="DriverInstall" After="PatchFiles"> Not Installed</Custom>
+
        <Custom Action="WSD_start" After="InstallFinalize">
            Not Installed</Custom>
+
        <Custom Action="OpenSM_setup" After="WSD_start"> Not Installed </Custom>
-       <Custom Action="BcastRegChanged" After="OpenSM_setup">
+
+       <Custom Action="OpenSM_start" After="OpenSM_setup">
+          ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>
+
+       <Custom Action="BcastRegChanged" After="OpenSM_start">
            Not Installed</Custom>
 
        <!--> REMOVE ONLY </!-->
-- 
2.41.0