From eda00f320aa683b74acb3563125c5f4d368df7ad Mon Sep 17 00:00:00 2001
From: Stan Smith <stan.smith@intel.com>
Date: Fri, 25 Jun 2010 23:45:03 +0000
Subject: [PATCH] [WIX] !x86 arch - Install 32-bit DAPL libraries directly into
 SysWOW64\ instead of %ProgramFiles%\OFED\.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2837 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/OFED/WIX/common/dapl_rt.inc             | 15 ------------
 trunk/OFED/WIX/common/directory_structure.inc |  5 ++++
 trunk/OFED/WIX/common/std_features.inc        |  3 +++
 trunk/OFED/WIX/common/system_files.inc        | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/trunk/OFED/WIX/common/dapl_rt.inc b/trunk/OFED/WIX/common/dapl_rt.inc
index 57eaba47..1a56cd4b 100644
--- a/trunk/OFED/WIX/common/dapl_rt.inc
+++ b/trunk/OFED/WIX/common/dapl_rt.inc
@@ -2,21 +2,6 @@
 
       <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">
 
-          <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>
-              <File Id="_dapl32.dll" DiskId="1"
-                     Name="dapl232.dll"
-                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />
-              <File Id="_dapl32d.dll" DiskId="1"
-                     Name="dapl232d.dll"
-                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />
-              <File Id="_dat32.dll" DiskId="1"
-                     Name="dat232.dll"
-                     Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />
-              <File Id="_dat32d.dll" DiskId="1"
-                     Name="dat232d.dll"
-                     Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />
-          <?endif?>
-
           <File Id="dapl2test.exe" DiskId="1"
                  Name="dapl2test.exe"
                  Source="..\bin\tools\$(var.ARCH)\release\dapl2test.exe" />
diff --git a/trunk/OFED/WIX/common/directory_structure.inc b/trunk/OFED/WIX/common/directory_structure.inc
index 2709c5aa..33cec742 100644
--- a/trunk/OFED/WIX/common/directory_structure.inc
+++ b/trunk/OFED/WIX/common/directory_structure.inc
@@ -6,6 +6,11 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
         <Directory Id="WINROOT" />
         <Directory Id="$(var.SysNative)" />
+
+        <?if $(var.ARCHP) != "x86" ?>
+           <Directory Id="SystemFolder" />
+        <?endif?>
+
         <Directory Id="$(var.ProgramFilesNative)" Name="PFiles">
             <Directory Id="INSTALLDIR" Name="$(var.PID)">
                <Directory Id="DriversDir" Name="Drivers" />
diff --git a/trunk/OFED/WIX/common/std_features.inc b/trunk/OFED/WIX/common/std_features.inc
index 6cdf0229..0c494edb 100644
--- a/trunk/OFED/WIX/common/std_features.inc
+++ b/trunk/OFED/WIX/common/std_features.inc
@@ -105,6 +105,9 @@
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
         <ComponentRef Id="cDAPL2RT" />
         <ComponentRef Id="cSys32DAPL2RT" />
+        <?if $(var.ARCHP) != "x86" ?>
+           <ComponentRef Id="cSysWowDAPL2RT" />
+        <?endif?>
       </Feature>
 
       <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"
diff --git a/trunk/OFED/WIX/common/system_files.inc b/trunk/OFED/WIX/common/system_files.inc
index d6fbee1d..7c5809dd 100644
--- a/trunk/OFED/WIX/common/system_files.inc
+++ b/trunk/OFED/WIX/common/system_files.inc
@@ -90,4 +90,28 @@
 
  </DirectoryRef> 
 
+ <?if $(var.ARCHP) != "x86" ?> 
+
+    <!-- Files installed in %windir%\sysWOW64 -->
+
+    <DirectoryRef Id="SystemFolder"> 
+       <Component Id="cSysWowDAPL2RT" Win64="no"
+                  Guid="3363834C-12D7-43db-95AA-14527C3D146A">
+           <File Id="_dapl32.dll" DiskId="1"
+                 Name="dapl2.dll"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />
+           <File Id="_dapl32d.dll" DiskId="1"
+                 Name="dapl2d.dll"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />
+           <File Id="_dat32.dll" DiskId="1"
+                 Name="dat2.dll"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />
+           <File Id="_dat32d.dll" DiskId="1"
+                 Name="dat2d.dll"
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />
+       </Component>
+    </DirectoryRef> 
+
+ <?endif?>
+
 </Include>
-- 
2.41.0