From f27abd64fc035a5e730b7b043131c394dd3cf352 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 28 Feb 2008 20:58:55 +0000
Subject: [PATCH] [WinOF] moved IB SDK feature to the end of the feature list
 as it's not a default install.

git-svn-id: svn://openib.tc.cornell.edu/gen1@953 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 branches/WinOF/WIX/ia64/wof.wxs | 24 ++++++++++++------------
 branches/WinOF/WIX/x64/wof.wxs  | 24 ++++++++++++------------
 branches/WinOF/WIX/x86/wof.wxs  | 24 ++++++++++++------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs
index fbef1d37..e19dbf7e 100644
--- a/branches/WinOF/WIX/ia64/wof.wxs
+++ b/branches/WinOF/WIX/ia64/wof.wxs
@@ -979,18 +979,6 @@
       <ComponentRef Id="OpenSMservice" />
     </Feature>
 
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
-         Description="InfiniBand Software Development Kit (Headers + Libs)"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
-      <ComponentRef Id="cIBAL_Libs" />
-      <ComponentRef Id="cIBAL_Incs" />
-      <ComponentRef Id="cIBAL_Complib" />
-      <ComponentRef Id="cIBAL_IBA" />
-      <ComponentRef Id="cDDK_example" />
-      <ComponentRef Id="cVS_example" />
-    </Feature>
-
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
          Description="Internet Protocols over InfiniBand" Display="expand"
          ConfigurableDirectory="INSTALLDIR"
@@ -1075,6 +1063,18 @@
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
+         Description="InfiniBand Software Development Kit (Headers + Libs)"
+         Display="expand" ConfigurableDirectory="INSTALLDIR"
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+      <ComponentRef Id="cIBAL_Libs" />
+      <ComponentRef Id="cIBAL_Incs" />
+      <ComponentRef Id="cIBAL_Complib" />
+      <ComponentRef Id="cIBAL_IBA" />
+      <ComponentRef Id="cDDK_example" />
+      <ComponentRef Id="cVS_example" />
+    </Feature>
+
     <!--> File where Custom Actions are defined -->
     <Binary Id='CA' src='..\CustomActions.vbs' />
 
diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 31f663f3..d3df9c5a 100644
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -987,18 +987,6 @@
       <ComponentRef Id="OpenSMservice" />
     </Feature>
 
-    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
-         Description="InfiniBand Software Development Kit (Headers + Libs)"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
-      <ComponentRef Id="cIBAL_Libs" />
-      <ComponentRef Id="cIBAL_Incs" />
-      <ComponentRef Id="cIBAL_Complib" />
-      <ComponentRef Id="cIBAL_IBA" />
-      <ComponentRef Id="cDDK_example" />
-      <ComponentRef Id="cVS_example" />
-    </Feature>
-
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
          Description="Internet Protocols over InfiniBand" Display="expand"
          ConfigurableDirectory="INSTALLDIR"
@@ -1083,6 +1071,18 @@
       <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"
+         Description="InfiniBand Software Development Kit (Headers + Libs)"
+         Display="expand" ConfigurableDirectory="INSTALLDIR"
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+      <ComponentRef Id="cIBAL_Libs" />
+      <ComponentRef Id="cIBAL_Incs" />
+      <ComponentRef Id="cIBAL_Complib" />
+      <ComponentRef Id="cIBAL_IBA" />
+      <ComponentRef Id="cDDK_example" />
+      <ComponentRef Id="cVS_example" />
+    </Feature>
+
     <!--> File where Custom Actions are defined -->
     <Binary Id='CA' src='..\CustomActions.vbs' />
 
diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index 7f9b7bec..ed64f9fd 100644
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -880,18 +880,6 @@
         <ComponentRef Id="OpenSMservice" />
     </Feature>
 
-    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
-         Description="InfiniBand Software Development Kit (Headers + Libs)"
-         Display="expand" ConfigurableDirectory="INSTALLDIR"
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
-      <ComponentRef Id="cIBAL_Libs" />
-      <ComponentRef Id="cIBAL_Incs" />
-      <ComponentRef Id="cIBAL_Complib" />
-      <ComponentRef Id="cIBAL_IBA" />
-      <ComponentRef Id="cDDK_example" />
-      <ComponentRef Id="cVS_example" />
-    </Feature>
-
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"
         Description="Internet Protocols over InfiniBand" Display="expand"
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
@@ -976,6 +964,18 @@
         <ComponentRef Id="OpenSM_Service_enabled" />
     </Feature>
 
+    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"
+         Description="InfiniBand Software Development Kit (Headers + Libs)"
+         Display="expand" ConfigurableDirectory="INSTALLDIR"
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
+      <ComponentRef Id="cIBAL_Libs" />
+      <ComponentRef Id="cIBAL_Incs" />
+      <ComponentRef Id="cIBAL_Complib" />
+      <ComponentRef Id="cIBAL_IBA" />
+      <ComponentRef Id="cDDK_example" />
+      <ComponentRef Id="cVS_example" />
+    </Feature>
+
     <!--> File where Custom Actions are defined -->
     <Binary Id="CA" src="..\CustomActions.vbs" />
 
-- 
2.41.0