[OFED] enable ND on ia64; winverbs is the default ND provider.

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

diff --git a/trunk/OFED/WIX/common/ipoib.inc b/trunk/OFED/WIX/common/ipoib.inc
index 2a2c2303874e110f0bc0ee364b2af33b73eed984..7433559864c769df93e7d0e3ddfefa18417343ab 100644 (file)
--- a/trunk/OFED/WIX/common/ipoib.inc
+++ b/trunk/OFED/WIX/common/ipoib.inc
@@ -56,7 +56,13 @@
             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
@@ -67,10 +73,14 @@
                  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
@@ -81,7 +91,11 @@
              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

diff --git a/trunk/OFED/WIX/common/std_features.inc b/trunk/OFED/WIX/common/std_features.inc
index ce722778af4588bd1727524bf06df19530ee20da..431f3afc924f7f3b83496d701f2f77aac7188eea 100644 (file)
--- a/trunk/OFED/WIX/common/std_features.inc
+++ b/trunk/OFED/WIX/common/std_features.inc
@@ -70,18 +70,13 @@
 \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