[WINOF] make sure 64-bit systems get ibwsd32.dll file. Previous changes to remove...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 22 May 2009 17:08:22 +0000 (17:08 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 22 May 2009 17:08:22 +0000 (17:08 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2195 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/common/ipoib.inc

index cfb0353..72335bd 100644 (file)
         <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
                LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />\r
+\r
+        <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+            <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
+                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />\r
+\r
+            <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+            <RemoveFile Id='rm64_ibwsd32.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />\r
+            <RemoveFile Id='rm32_ibwsd32.dll' On='uninstall'\r
+                 Property="SystemFolder"\r
+                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />\r
+        <?endif?>\r
+\r
+        <RemoveFile Id='rm32_ibwsd.dll' On='uninstall'\r
+                 Property="SystemFolder"\r
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
       <?endif?>\r
 \r
       <?if $(var.ARCHP) != "ia64" ?>\r
@@ -30,9 +50,6 @@
       <?endif?>\r
 \r
       <?if $(var.ARCHP) = "x64" ?>\r
-          <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
-                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
-                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />\r
           <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                  LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
 \r
-      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
-          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
-      <?endif?>\r
-\r
-      <RemoveFile Id='o64_ibwsd.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="ibwsd.dll" LongName='ibwsd.dll' />\r
       <RemoveFile Id='o64_ibndprov.dll' On='uninstall'\r
              Property="SystemFolder"\r
              Name="ibndprov.dll" LongName='ibndprov.dll' />\r