[WIX] !x86 arch - Install 32-bit DAPL libraries directly into SysWOW64\ instead of...

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

diff --git a/trunk/OFED/WIX/common/dapl_rt.inc b/trunk/OFED/WIX/common/dapl_rt.inc
index 57eaba47643be4a7cd33244b1f665f105ce8be58..1a56cd4b84413acc9921c87d2cb12116e90f6f73 100644 (file)
--- a/trunk/OFED/WIX/common/dapl_rt.inc
+++ b/trunk/OFED/WIX/common/dapl_rt.inc
@@ -2,21 +2,6 @@
 \r
       <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">\r
 \r
-          <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>\r
-              <File Id="_dapl32.dll" DiskId="1"\r
-                     Name="dapl232.dll"\r
-                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />\r
-              <File Id="_dapl32d.dll" DiskId="1"\r
-                     Name="dapl232d.dll"\r
-                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />\r
-              <File Id="_dat32.dll" DiskId="1"\r
-                     Name="dat232.dll"\r
-                     Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />\r
-              <File Id="_dat32d.dll" DiskId="1"\r
-                     Name="dat232d.dll"\r
-                     Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />\r
-          <?endif?>\r
-\r
           <File Id="dapl2test.exe" DiskId="1"\r
                  Name="dapl2test.exe"\r
                  Source="..\bin\tools\$(var.ARCH)\release\dapl2test.exe" />\r

diff --git a/trunk/OFED/WIX/common/directory_structure.inc b/trunk/OFED/WIX/common/directory_structure.inc
index 2709c5aa88d44fd2c162d84c39964e1662bc47ba..33cec742428841a30100bc3c3bd7ef44ae9512d3 100644 (file)
--- 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">\r
         <Directory Id="WINROOT" />\r
         <Directory Id="$(var.SysNative)" />\r
+\r
+        <?if $(var.ARCHP) != "x86" ?>\r
+           <Directory Id="SystemFolder" />\r
+        <?endif?>\r
+\r
         <Directory Id="$(var.ProgramFilesNative)" Name="PFiles">\r
             <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
                <Directory Id="DriversDir" Name="Drivers" />\r

diff --git a/trunk/OFED/WIX/common/std_features.inc b/trunk/OFED/WIX/common/std_features.inc
index 6cdf0229e074d0a5e5fb348f8ff444bdc65c8575..0c494edbb3d598fb3e7dd9d581ae316151a910cf 100644 (file)
--- 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'>\r
         <ComponentRef Id="cDAPL2RT" />\r
         <ComponentRef Id="cSys32DAPL2RT" />\r
+        <?if $(var.ARCHP) != "x86" ?>\r
+           <ComponentRef Id="cSysWowDAPL2RT" />\r
+        <?endif?>\r
       </Feature>\r
 \r
       <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r

diff --git a/trunk/OFED/WIX/common/system_files.inc b/trunk/OFED/WIX/common/system_files.inc
index d6fbee1dbbb3942a9fb670fd90c8d14a28bd985a..7c5809dd07195eaeaa1061faf53bf144f4bc6b81 100644 (file)
--- a/trunk/OFED/WIX/common/system_files.inc
+++ b/trunk/OFED/WIX/common/system_files.inc
@@ -90,4 +90,28 @@
 \r
  </DirectoryRef> \r
 \r
+ <?if $(var.ARCHP) != "x86" ?> \r
+\r
+    <!-- Files installed in %windir%\sysWOW64 -->\r
+\r
+    <DirectoryRef Id="SystemFolder"> \r
+       <Component Id="cSysWowDAPL2RT" Win64="no"\r
+                  Guid="3363834C-12D7-43db-95AA-14527C3D146A">\r
+           <File Id="_dapl32.dll" DiskId="1"\r
+                 Name="dapl2.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />\r
+           <File Id="_dapl32d.dll" DiskId="1"\r
+                 Name="dapl2d.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />\r
+           <File Id="_dat32.dll" DiskId="1"\r
+                 Name="dat2.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />\r
+           <File Id="_dat32d.dll" DiskId="1"\r
+                 Name="dat2d.dll"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />\r
+       </Component>\r
+    </DirectoryRef> \r
+\r
+ <?endif?>\r
+\r
 </Include>\r