[WinOF] Make installs with NODRV=1 work as expected: *.wxs files observe NODRV as...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 24 Jun 2009 19:11:33 +0000 (19:11 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 24 Jun 2009 19:11:33 +0000 (19:11 +0000)
Consolidate standard 'features' into a single include file; XP non-support issues handled via WIX #ifdef's.

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

15 files changed:
WinOF/WIX/CustomActions.vbs
WinOF/WIX/common/IBcore.inc
WinOF/WIX/common/InstallExecuteSeq.inc
WinOF/WIX/common/OpenSM_service.inc
WinOF/WIX/common/std_features.inc [new file with mode: 0644]
WinOF/WIX/win7/ia64/wof.wxs
WinOF/WIX/win7/x64/wof.wxs
WinOF/WIX/win7/x86/wof.wxs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/x64/wof.wxs
WinOF/WIX/wlh/x86/wof.wxs
WinOF/WIX/wnet/ia64/wof.wxs
WinOF/WIX/wnet/x64/wof.wxs
WinOF/WIX/wnet/x86/wof.wxs
WinOF/WIX/wxp/x86/wof.wxs

index c973131..749debc 100644 (file)
@@ -123,7 +123,6 @@ Sub WinOF_setup
                Session.Property("REMOVE")                      & ";" & _\r
                Session.Property("NODRV")                       & ";" & _\r
                Session.Property("DBG")\r
-\r
 End Sub\r
 \r
 \r
@@ -1366,8 +1365,10 @@ Sub DriverUninstall()
        Set WshShell = CreateObject("WScript.Shell")\r
        Set fso = CreateObject("Scripting.FileSystemObject")\r
 \r
-       ' WSD is not supported on XP and should NOT have been installed.\r
-       ' otherwise, remove the service: ND (Network Direct) then WinSock Direct.\r
+       ' Check if install was done with NODRV=1, if so then nothing to do, exit\r
+       If Session.Property("NODRV") = "1" Then\r
+               Exit Sub\r
+       End If\r
 \r
        sDBG = Session.Property("DBG")\r
        sVersionNT = Session.Property("VersionNT")\r
@@ -1382,6 +1383,9 @@ Sub DriverUninstall()
                                   "Drivers\net & ndinstall.exe -r", 0, true)\r
        End If\r
        \r
+       ' WSD is not supported on XP and should NOT have been installed.\r
+       ' otherwise, remove the service: ND (Network Direct) then WinSock Direct.\r
+\r
        If sVersionNT <> WindowsXP AND fso.FileExists(sInstalldir & "installsp.exe") Then\r
                Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir & _\r
                                   " & installsp.exe -r", 0, true)\r
@@ -1480,19 +1484,24 @@ End Sub
 ' supported on XP.\r
 \r
 Sub WSDEnable()\r
-      Dim sInstalldir, WshShell, fso\r
+       Dim sInstalldir, WshShell, fso\r
 \r
-      sInstalldir = Session.Property("INSTALLDIR")\r
+       sInstalldir = Session.Property("INSTALLDIR")\r
 \r
-      Set WshShell = CreateObject("WScript.Shell")\r
-      Set fso = CreateObject("Scripting.FileSystemObject")\r
+       Set WshShell = CreateObject("WScript.Shell")\r
+       Set fso = CreateObject("Scripting.FileSystemObject")\r
+\r
+       ' Check if install was done with NODRV=1, if so then nothing to do, exit\r
+       If Session.Property("NODRV") = "1" Then\r
+               Exit Sub\r
+       End If\r
 \r
-      If fso.FileExists(sInstalldir & "installsp.exe") Then\r
-          ' install the WinSockdirect service\r
-         Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _\r
+       If fso.FileExists(sInstalldir & "installsp.exe") Then\r
+               ' install the WinSockdirect service\r
+               Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _\r
                                  & " & installsp.exe -i", 0, true)\r
-      End If\r
-      If Err Then ShowError\r
+       End If\r
+       If Err Then ShowError\r
 \r
 End Sub\r
 \r
@@ -1510,9 +1519,9 @@ Sub ND_StartMeUp()
 \r
     ' Start the Network Direct Service if installed\r
 \r
-    If fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
+    If fso.FileExists(sInstalldir & "Drivers\net\ndinstall.exe") Then\r
         Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _\r
-                               & " & net\ndinstall.exe -i", 0, true)\r
+                               & " & Drivers\net\ndinstall.exe -i", 0, true)\r
         If Err Then ShowErr2("ND service install failed")\r
     End If\r
 \r
@@ -1598,6 +1607,11 @@ Function ChkInstallAndReboot()
     Set fso = CreateObject("Scripting.FileSystemObject")    \r
     Set WshShell = CreateObject("WScript.Shell")\r
 \r
+       ' Check if install was done with NODRV=1, if so then nothing to do, exit\r
+       If Session.Property("NODRV") = "1" Then\r
+               Exit Function\r
+       End If\r
+\r
        VersionNT = Session.Property("VersionNT")\r
 \r
        ' remove any lingering driver installed files\r
index 5b93f01..18a8fbe 100644 (file)
@@ -1,6 +1,6 @@
 <Include>\r
 \r
-    <Component Id="cIBcore"\r
+    <Component Id="cDriverTools"\r
                Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
       <CreateFolder />\r
       <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
index 5e32503..f8bb552 100644 (file)
@@ -37,7 +37,7 @@
 \r
        <!--> Install ONLY </!-->\r
        <Custom Action="ChkPreviousInstall" After='WinOF_setup'>\r
-               NOT Installed</Custom>\r
+               NOT Installed AND Not NODRV </Custom>\r
 \r
        <ScheduleReboot After='ChkPreviousInstall'>\r
                REBOOT="FORCE"</ScheduleReboot>\r
@@ -60,7 +60,7 @@
 \r
        <!--> REMOVE ONLY </!-->\r
        <Custom Action="DriverUninstall" After="PublishProduct">\r
-               REMOVE="ALL" </Custom>\r
+               REMOVE="ALL" AND Not NODRV </Custom>\r
 \r
        <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>\r
 \r
index d7087ef..9717c55 100644 (file)
@@ -6,25 +6,25 @@
                Permanent='no' Transitive='no' Win64='no'\r
                Location='either'>\r
 \r
-        <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
-              LongName="opensm.exe" Name="OPENSM.EXE"\r
-              Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"\r
-              Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
-              Checksum='no' ReadOnly='no' />\r
+         <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
+               LongName="opensm.exe" Name="OPENSM.EXE"\r
+               Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"\r
+               Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
+               Checksum='no' ReadOnly='no' />\r
 \r
-        <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
-            Description='InfiniBand Subnet Configuration and Management'\r
-            DisplayName='InfiniBand Subnet Manager'\r
-            Arguments='-e --service'\r
-            ErrorControl='normal'\r
-            Start='disabled'\r
-            Interactive='no'\r
-            Type='ownProcess' />\r
+         <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
+               Description='InfiniBand Subnet Configuration and Management'\r
+               DisplayName='InfiniBand Subnet Manager'\r
+               Arguments='-e --service'\r
+               ErrorControl='normal'\r
+               Start='disabled'\r
+               Interactive='no'\r
+               Type='ownProcess' />\r
 \r
-        <ServiceControl Id='osmSvcControl' Name='OpenSM'\r
-                        Stop='uninstall'\r
-                        Wait='no'\r
-                        Remove='uninstall' />\r
+         <ServiceControl Id='osmSvcControl' Name='OpenSM'\r
+               Stop='uninstall'\r
+               Wait='no'\r
+               Remove='uninstall' />\r
     </Component>\r
 \r
     <Component Id="OpenSM_Service_enabled"\r
diff --git a/WinOF/WIX/common/std_features.inc b/WinOF/WIX/common/std_features.inc
new file mode 100644 (file)
index 0000000..70602e3
--- /dev/null
@@ -0,0 +1,175 @@
+<Include>\r
+\r
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
+        Description="Drivers, Libraries, Subnet Management, Tools, Diags, Docs"\r
+        Display="collapse" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
+\r
+      <ComponentRef Id="cDriverTools" />\r
+      <ComponentRef Id="Docs" />\r
+      <ComponentRef Id="Tools" />\r
+      <ComponentRef Id="OpenSMservice" />\r
+\r
+      <?if $(var.OS) = "wlh" AND $(var.ARCHP) = "x64" ?>\r
+         <ComponentRef Id="cCertPush" />\r
+      <?endif?>\r
+\r
+      <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
+           Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
+           Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+           AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        <Condition Level="200"><![CDATA[NODRV=1]]></Condition>\r
+        <ComponentRef Id="cMthcaDriver" />\r
+        <ComponentRef Id="cMLX4BusDriver" />\r
+        <ComponentRef Id="cMLX4HcaDriver" />\r
+      </Feature>\r
+\r
+      <Feature Id="fWV" Title="WinVerbs"\r
+          Description="OFED verbs - Libraries + utilities"\r
+          Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+          AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+          <ComponentRef Id="cWinVerbsOFED" />\r
+          <ComponentRef Id="cWinVerbsUApps" />\r
+      </Feature>\r
+\r
+      <Feature Id="fIOU" Title="I/O Unit Driver"\r
+         Description="InfiniBand I/O Unit Driver"\r
+         Display="expand" Level="1" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        <Condition Level="200"><![CDATA[NODRV=1]]></Condition>\r
+        <ComponentRef Id="cIOUdriver" />\r
+      </Feature>\r
+\r
+    </Feature>\r
+\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
+      <Condition Level="200"><![CDATA[NODRV=1]]></Condition>\r
+      <ComponentRef Id="cIPoIB" />\r
+    </Feature>\r
+\r
+    <?if $(var.OS) != "XP" ?>\r
+\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, IPoIB is required for WSD. -->\r
+          <Condition Level="300"><![CDATA[NODRV=1]]></Condition>\r
+          <Condition Level="400"><![CDATA[VersionNT=501]]></Condition>\r
+          <Condition Level="201"> IPOIB_EXISTS </Condition>\r
+          <ComponentRef Id="WinsockDirect" />\r
+        </Feature>\r
+\r
+    <?endif?>\r
+\r
+    <?if $(var.ARCHP) != "ia64" ?>\r
+\r
+        <!-- when ND builds/works for ia64. -->\r
+        <Feature Id="fND" Title="Network Direct"\r
+            Description="Network Direct Enabled"\r
+            Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+            AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+            <ComponentRef Id="cNetworkDirect" />\r
+            <Condition Level="201"> IPOIB_EXISTS </Condition>\r
+        </Feature>\r
+\r
+    <?endif?>\r
+\r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+        Description="Open Subnet Management started as a local Windows Service"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
+\r
+      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
+         Display="expand" Level="1" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
+        <ComponentRef Id="cDatCfg" />\r
+      </Feature>\r
+\r
+      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
+         Description="DAT 1.1 runtime libraries"\r
+         Display="expand" Level="1" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        <ComponentRef Id="cDAPL1RT" />\r
+      </Feature>\r
+\r
+      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
+         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
+         Display="expand" Level="2" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
+         <ComponentRef Id="cDATV1" />\r
+         <ComponentRef Id="cDatBldV1Hdrs" />\r
+         <ComponentRef Id="cDatBldV1Libs" />\r
+      </Feature>\r
+\r
+      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
+         Description="DAT 2.0 runtime libraries"\r
+         Display="expand" Level="1" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        <ComponentRef Id="cDAPL2RT" />\r
+      </Feature>\r
+\r
+      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
+         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
+         Display="expand" Level="2" \r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
+         <ComponentRef Id="cDATV2" />\r
+         <ComponentRef Id="cDatBldV2Hdrs" />\r
+         <ComponentRef Id="cDatBldV2Libs" />\r
+      </Feature>\r
+    </Feature>\r
+\r
+    <?if $(var.OS) != "XP" ?>\r
+\r
+        <!-- Skip SRP on XP 32bit -->\r
+        <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
+            Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+            AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+          <Condition Level="200"><![CDATA[NODRV=1]]></Condition>\r
+          <ComponentRef Id="cSRP_driver_installed" />\r
+        </Feature>\r
+\r
+    <?endif?>\r
+\r
+    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
+        Description="QLogic - Virtual NIC over InfiniBand"\r
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+      <Condition Level="200"><![CDATA[NODRV=1]]></Condition>\r
+      <ComponentRef Id="cQLVNIC_driver_installed" />\r
+    </Feature>\r
+\r
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
+         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+      <ComponentRef Id="cIBAL_Libs" />\r
+      <ComponentRef Id="cIBAL_Incs" />\r
+      <ComponentRef Id="cIBAL_Complib" />\r
+      <ComponentRef Id="cIBAL_IBA" />\r
+      <ComponentRef Id="cDDK_example" />\r
+      <ComponentRef Id="cVS_example" />\r
+    </Feature>\r
+\r
+    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
+         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
+         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+      <ComponentRef Id="cCHK_kernel" />\r
+      <ComponentRef Id="cCHK_user" />\r
+    </Feature>\r
+\r
+</Include>\r
index df8faa4..886ed36 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-<!-- when ND on ia64 works.\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-    </Feature>\r
--->\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index 52eebf1..5fb61d8 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-      <ComponentRef Id="cCertPush" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index 23ac09b..0bf3c94 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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="0"><![CDATA[VersionNT=501]]></Condition>\r
-        <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <!-- skip SRP on 32-bit Windows XP -->\r
-        <Condition Level="0">\r
-          <![CDATA[VersionNT=501 AND (Not Intel64 AND Not Msix64)]]>\r
-        </Condition>\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index b90ae9f..3089a99 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-<!-- when ND on ia64 works.\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-    </Feature>\r
--->\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index e5e5cf4..ff172ae 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-      <ComponentRef Id="cCertPush" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index 2dcbfed..c9aa20c 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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="0"><![CDATA[VersionNT=501]]></Condition>\r
-        <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <!-- skip SRP on 32-bit Windows XP -->\r
-        <Condition Level="0">\r
-          <![CDATA[VersionNT=501 AND (Not Intel64 AND Not Msix64)]]>\r
-        </Condition>\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index 291a6ef..f51da3d 100644 (file)
     <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
-       Features - Level=1 == Typical, no WSD on XP\r
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-<!-- when ND on ia64 works.\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition> \r
-    </Feature>\r
--->\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index ac67466..093773c 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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, IPoIB is required for WSD. -->\r
-      <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-      <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-    <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index f05d959..02b6992 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\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="0"><![CDATA[VersionNT=501]]></Condition>\r
-        <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\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
-        <!-- skip SRP on 32-bit Windows XP -->\r
-        <Condition Level="0">\r
-          <![CDATA[VersionNT=501 AND (Not Intel64 AND Not Msix64)]]>\r
-        </Condition>\r
-        <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
index 05b2ef3..82a3b1e 100644 (file)
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
-    <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cMthcaDriver" />\r
-      <ComponentRef Id="cMLX4BusDriver" />\r
-      <ComponentRef Id="cMLX4HcaDriver" />\r
-    </Feature>\r
-\r
-    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
-        Description="InfiniBand: Core, Tools, Docs"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
-      <ComponentRef Id="cIBcore" />\r
-      <ComponentRef Id="cIOUdriver" />\r
-      <ComponentRef Id="Docs" />\r
-      <ComponentRef Id="Tools" />\r
-      <ComponentRef Id="OpenSMservice" />\r
-    </Feature>\r
-\r
-    <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries + utilities"\r
-        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsOFED" />\r
-        <ComponentRef Id="cWinVerbsUApps" />\r
-    </Feature>\r
-\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="cIPoIB" />\r
-    </Feature>\r
-\r
-<!-- No WSD on XP\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
-        <Condition Level="0"><![CDATA[VersionNT=501]]></Condition>\r
-        <ComponentRef Id="WinsockDirect" />\r
-    </Feature>\r
--->\r
-    <Feature Id="fND" Title="Network Direct"\r
-        Description="Network Direct Enabled"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cNetworkDirect" />\r
-    </Feature>\r
-\r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a local Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
-        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-\r
-      <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
-        <ComponentRef Id="cDatCfg" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
-         Description="DAT 2.0 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL2RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r
-         Description="DAT 2.0 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT2_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV2" />\r
-         <ComponentRef Id="cDatBldV2Hdrs" />\r
-         <ComponentRef Id="cDatBldV2Libs" />\r
-      </Feature>\r
-    </Feature>\r
-\r
-<!-- Skip SRP on XP/32\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
--->\r
-        <!-- skip SRP on 32-bit Windows XP -->\r
-<!-- Skip SRP on XP/32\r
-        <Condition Level="0">\r
-          <![CDATA[VersionNT=501 AND (Not Intel64 AND Not Msix64)]]>\r
-        </Condition>\r
-        <ComponentRef Id="cSRP_driver_installed" />\r
-    </Feature>\r
--->\r
-\r
-    <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-        Description="QLogic - Virtual NIC over InfiniBand"\r
-        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-      <ComponentRef Id="cQLVNIC_driver_installed" />\r
-    </Feature>\r
-\r
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
-         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
-      <ComponentRef Id="cIBAL_Libs" />\r
-      <ComponentRef Id="cIBAL_Incs" />\r
-      <ComponentRef Id="cIBAL_Complib" />\r
-      <ComponentRef Id="cIBAL_IBA" />\r
-      <ComponentRef Id="cDDK_example" />\r
-      <ComponentRef Id="cVS_example" />\r
-    </Feature>\r
-\r
-    <Feature Id="fCHECKED" Title="Debug/Checked Modules"\r
-         Description="Checked versions: Not installed; see %ProgramFiles%\WinOF\Checked."\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="cCHK_kernel" />\r
-      <ComponentRef Id="cCHK_user" />\r
-    </Feature>\r
+    <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r