From f79e8a3b1a44db825ed355bb7bfdd70c7da4f9d3 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Fri, 22 May 2009 17:08:22 +0000
Subject: [PATCH] [WINOF] make sure 64-bit systems get ibwsd32.dll file.
 Previous changes to remove ND from ia64 introduced this bug.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2195 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/WinOF/WIX/common/ipoib.inc | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/trunk/WinOF/WIX/common/ipoib.inc b/trunk/WinOF/WIX/common/ipoib.inc
index cfb03539..72335bd6 100644
--- a/trunk/WinOF/WIX/common/ipoib.inc
+++ b/trunk/WinOF/WIX/common/ipoib.inc
@@ -18,6 +18,26 @@
         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"
                LongName="ibwsd.dll" Name="IBWSD.DLL"
                Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />
+
+        <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+            <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
+                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"
+                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />
+
+            <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />
+            <RemoveFile Id='rm64_ibwsd32.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />
+            <RemoveFile Id='rm32_ibwsd32.dll' On='uninstall'
+                 Property="SystemFolder"
+                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />
+        <?endif?>
+
+        <RemoveFile Id='rm32_ibwsd.dll' On='uninstall'
+                 Property="SystemFolder"
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />
       <?endif?>
 
       <?if $(var.ARCHP) != "ia64" ?>
@@ -30,9 +50,6 @@
       <?endif?>
 
       <?if $(var.ARCHP) = "x64" ?>
-          <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"
-                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"
-                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />
           <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
                  LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />
@@ -47,15 +64,6 @@
 
       <!-- Orphaned install files - remove on uninstall -->
 
-      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
-          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'
-                 Property="System64Folder"
-                 Name="ibwsd.dll" LongName='ibwsd.dll' />
-      <?endif?>
-
-      <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
-             Property="SystemFolder"
-             Name="ibwsd.dll" LongName='ibwsd.dll' />
       <RemoveFile Id='o64_ibndprov.dll' On='uninstall'
              Property="SystemFolder"
              Name="ibndprov.dll" LongName='ibndprov.dll' />
-- 
2.46.0