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

[WinOF] WIX
white-space for readability.
DAPLsetup CA call to create %SystemDrive%\DAT\dat.conf if it doesn't exist.


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

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index 57c259da..ac284d98 100644
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -284,65 +284,109 @@
     <!--
        Features - Level=1 == Typical, no WSD on XP
      -->
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1" Description="InfiniBand: Core, Tools, Docs" Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow">
+    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
+        Description="InfiniBand: Core, Tools, Docs" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="disallow">
         <ComponentRef Id="Docs" />
         <ComponentRef Id="Tools" />
         <ComponentRef Id="HcaDriver" />
     </Feature>
-    <Feature Id="fIPoIB" Title="IPoIB" Level="1" Description="Internet Protocols over InfiniBand" Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <Feature Id="fIPoIB" Title="IPoIB" Level="1"
+        Description="Internet Protocols over InfiniBand" Display="expand"
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
         <ComponentRef Id="IPoIB" />
     </Feature>
-    <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <!-- skip WSD on Windows XP -->
         <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>
         <Condition Level="201"> IPOIB_EXISTS </Condition>
         <ComponentRef Id="WinsockDirect" />
     </Feature>
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <Condition Level="201"> IPOIB_EXISTS </Condition>
         <ComponentRef Id="DAPL" />
     </Feature>
-    <Feature Id="fVNIC" Title="VNIC" Description="Virtual NIC over InfiniBand" Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <Feature Id="fVNIC" Title="VNIC" Description="Virtual NIC over InfiniBand"
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">
         <ComponentRef Id="VNIC" />
     </Feature>
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA" Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
+        InstallDefault="local" Absent="allow">
         <ComponentRef Id="SRP_inf" />
         <ComponentRef Id="SRP_driver" />
     </Feature>
-    <Feature Id="fOSMS" Title="OpenSM Service Enabled" Level="5" Description="Open Subnet Management started as a Windows Service" Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow">
+    <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">
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
+
     <!--> File where Custom Actions are defined -->
     <Binary Id="CA" src="..\CustomActions.vbs" />
-    <CustomAction Id="WinOF_setup" BinaryKey="CA" VBScriptCall="WinOF_setup" Return="check" />
-    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA" VBScriptCall="ChkInstallAndReboot" Return="check" />
-    <CustomAction Id="DriverInstall" BinaryKey="CA" VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
-    <CustomAction Id="DriverUninstall" BinaryKey="CA" VBScriptCall="DriverUninstall" Return="check" />
-    <CustomAction Id="WSD_start" BinaryKey="CA" VBScriptCall="WSDEnable" Return="check" />
-    <CustomAction Id="OpenSM_start" BinaryKey="CA" VBScriptCall="OpenSMServiceEvent" Return="check" />
-    <CustomAction Id="HammerTime" BinaryKey="CA" VBScriptCall="HammerTime" Return="check" />
-    <CustomAction Id="test" BinaryKey="CA" VBScriptCall="Hello" Return="check" />
+
+    <CustomAction Id="WinOF_setup" BinaryKey="CA"
+         VBScriptCall="WinOF_setup" Return="check" />
+
+    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"
+         VBScriptCall="ChkInstallAndReboot" Return="check" />
+
+    <CustomAction Id="DriverInstall" BinaryKey="CA"
+         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />
+
+    <CustomAction Id="DriverUninstall" BinaryKey="CA"
+         VBScriptCall="DriverUninstall" Return="check" />
+
+    <CustomAction Id="WSD_start" BinaryKey="CA"
+         VBScriptCall="WSDEnable" Return="check" />
+
+    <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" />
+
+    <CustomAction Id="test" BinaryKey="CA"
+         VBScriptCall="Hello" Return="check" />
+
     <InstallExecuteSequence>
        <!--> Always executed (Install or uninstall </!-->
        <Custom Action="WinOF_setup" After="InstallInitialize" />
+
        <!--> 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="DriverInstall" After="PatchFiles"> Not Installed</Custom>
+
        <Custom Action="WSD_start" After="InstallFinalize">
            Not Installed</Custom>
-       <Custom Action="OpenSM_start" After="WSD_start">
-           Not Installed</Custom>
+
+       <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">
            REMOVE="ALL" </Custom>
        <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>
     </InstallExecuteSequence>
 
-    <UIRef Id="WixUI_Mondo" />
+    <UIRef Id="WixUI_FeatureTree" />
         <UIRef Id="WixUI_ErrorProgressText" />
         <Icon Id="openfabrics" SourceFile="..\openfabrics.ico" />
     <UI />