[OFED] enable ND on ia64; winverbs is the default ND provider.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:54:45 +0000 (18:54 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:54:45 +0000 (18:54 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2747 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

OFED/WIX/common/ipoib.inc
OFED/WIX/common/std_features.inc

index 2a2c230..7433559 100644 (file)
             Name="wvndprov.dll"\r
             Source="..\bin\net\$(var.ARCH)\wvndprov.dll" />\r
 \r
-      <?if $(var.ARCHP) != "ia64" ?>\r
+      <?if $(var.ARCHP) = "ia64" ?>\r
+          <File Id="wvndprov32.dll" DiskId="1"\r
+                 Name="wvndprov32.dll"\r
+                 Source="..\bin\net\$(var.ARCH)\wvndprov32.dll" />\r
+          <RemoveFile Id='rmw64_wvndprov.dll' On='uninstall'\r
+                 Property="System64Folder" Name='wvndprov.dll' />\r
+      <?else?>\r
           <File Id="ibndprov.dll" DiskId="1"\r
                 Name="ibndprov.dll"\r
                 Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
                  Name="ibndprov32.dll"\r
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\r
 \r
+          <File Id="wvndprov32.dll" DiskId="1"\r
+                 Name="wvndprov32.dll"\r
+                 Source="..\bin\net\$(var.ARCH)\wvndprov32.dll" />\r
+\r
           <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'\r
-                 Property="System64Folder" Name='ibndprov32.dll' />\r
-          <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'\r
-                 Property="System64Folder" Name='ndinstall.exe' />\r
+                 Property="System64Folder" Name='ibndprov.dll' />\r
+          <RemoveFile Id='rm64_wvndprov.dll' On='uninstall'\r
+                 Property="System64Folder" Name='wvndprov.dll' />\r
       <?endif?>\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
              Property="SystemFolder" Name='ibwsd.dll' />\r
       <RemoveFile Id='o64_ibndprov.dll' On='uninstall'\r
              Property="SystemFolder" Name='ibndprov.dll' />\r
+      <RemoveFile Id='rm32_wvndprov.dll' On='uninstall'\r
+             Property="SystemFolder" Name='wvndprov.dll' />\r
       <RemoveFile Id='o64_ndinstall.exe' On='uninstall'\r
+             Property="System64Folder" Name='ndinstall.exe' />\r
+      <RemoveFile Id='rm32_ndinstall.exe' On='uninstall'\r
              Property="SystemFolder" Name='ndinstall.exe' />\r
 \r
     </Component>\r
index ce72277..431f3af 100644 (file)
 \r
     <?endif?>\r
 \r
-    <?if $(var.ARCHP) != "ia64" ?>\r
-\r
-        <!-- when ND builds/works for ia64. -->\r
-        <Feature Id="fND" Title="Network Direct"\r
-            Description="Network Direct Enabled"\r
-            Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-            AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-            <ComponentRef Id="cNetworkDirect" />\r
-            <Condition Level="201"> IPOIB_EXISTS </Condition>\r
-        </Feature>\r
-\r
-    <?endif?>\r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+      <ComponentRef Id="cNetworkDirect" />\r
+      <Condition Level="201"> IPOIB_EXISTS </Condition>\r
+    </Feature>\r
 \r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
         Description="Open Subnet Management started as a local Windows Service"\r