{WinOF] WIX

DAPLtest CA call to create %SystemDrive%\DAT\dat.conf if nonexistant.
white-space additions for readability.

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

diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 5824987ef0bf275c0fa8c07b6b8794e5935c78ee..08c3bf1e4cbb8a8380ef5f7e68c4c9ce183229ee 100644 (file)
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -405,7 +405,7 @@
       <ComponentRef Id="SRP_driver" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Enabled" Level="5"\r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
          Description="Open Subnet Management started as a Windows Service"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -430,9 +430,12 @@
     <CustomAction Id='WSD_start' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
-    <CustomAction Id='OpenSM_start' BinaryKey='CA'\r
+    <CustomAction Id='OpenSM_setup' BinaryKey='CA'\r
          VBScriptCall='OpenSMServiceEvent' Return='check' />\r
 \r
+    <CustomAction Id="DAPLsetup" BinaryKey="CA"\r
+         VBScriptCall="DAPL_setup" Return="ignore" />\r
+\r
     <CustomAction Id='HammerTime' BinaryKey='CA'\r
          VBScriptCall='HammerTime' Return='check' />\r
 \r
@@ -452,8 +455,10 @@
                Not Installed</Custom>\r
        <Custom Action="WSD_start" After='InstallFinalize'>\r
                Not Installed</Custom>\r
-       <Custom Action="OpenSM_start" After='WSD_start'>\r
+       <Custom Action="OpenSM_setup" After='WSD_start'>\r
                Not Installed</Custom>\r
+       <Custom Action="DAPLsetup" After="OpenSM_setup">\r
+           Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r
        <Custom Action="DriverUninstall" After='PublishProduct'>\r
@@ -462,7 +467,7 @@
     </InstallExecuteSequence>\r
 \r
 \r
-    <UIRef Id="WixUI_Mondo" />\r
+    <UIRef Id="WixUI_FeatureTree" />\r
     <UIRef Id="WixUI_ErrorProgressText" />\r
     <Icon Id="openfabrics" SourceFile="..\openfabrics.ico" />\r
     <UI />\r