[WinOF] IPoIB is now manually installed via devman.exe instead of being tagged as...

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

diff --git a/branches/WinOF/InstallShield/CustomActions.vbs b/branches/WinOF/InstallShield/CustomActions.vbs
index 412728bddc40e789315e856f24db7e5f5bec2730..6861cf1ab7435fc424a70d725bd8a6100e55a61a 100644 (file)
--- a/branches/WinOF/InstallShield/CustomActions.vbs
+++ b/branches/WinOF/InstallShield/CustomActions.vbs
@@ -157,7 +157,7 @@ Function RemoveInstalledFiles()
     FileMDelete(sDRIVERS & "ibsrp.sys")\r
     FileMDelete(sDRIVERS & "vnic.sys")\r
     \r
-    If (MTARCH="amd64") Then\r
+    If (MTARCH="amd64" Or MTARCH="ia64") Then\r
        ' System64Folder = System32, SystemFolder = Syswow64\r
                ' check/remove from .dll cache prior to removal from system32\\r
                Dim dllCache\r
@@ -405,12 +405,13 @@ Sub DriverInstall()
 \r
     ' Check/install IPoIB driver\r
     ' Only if InstallShield component 'net' is NOT tagged as containing a Device Driver    \r
-    ' If fso.FileExists(sInstalldir & "net\netipoib.inf") Then\r
-    '      Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "net & ..\mthca\devman.exe update netipoib.inf IBA\IPoIB", 0, true)\r
-    ' End If\r
+    If fso.FileExists(sInstalldir & "net\netipoib.inf") Then\r
+       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "net & ..\mthca\devman.exe update netipoib.inf IBA\IPoIB", 0, true)\r
+       If Err Then ShowError\r
+    End If\r
     \r
-   ' Copy 32 bit dlls on amd64 architecture\r
-    If (MTARCH="amd64") Then\r
+   ' Copy 32 bit dlls on 64-bit architectures\r
+    If (MTARCH="amd64" Or MTARCH="ia64") Then\r
                Dim SYSWOW\r
        SYSWOW = PropArray(1)  \r
                ' msgbox "driverInstall syswow " & SYSWOW\r