From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 28 Jun 2007 23:09:17 +0000 (+0000)
Subject: {WinOF] WIX
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4ba1b9008580940c4a4f7534264164721df5bfdb;p=~shefty%2Frdma-win.git

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