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