[WinOF] Install to WinOF\IBcore instead of WinOF\mthca

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

diff --git a/branches/WinOF/InstallShield/CustomActions.vbs b/branches/WinOF/InstallShield/CustomActions.vbs
index c3308661a457653a0bfe9f2859e88c769c328bf7..c9a207c4e5494bda454a9cee4641728f60cba969 100644 (file)
--- a/branches/WinOF/InstallShield/CustomActions.vbs
+++ b/branches/WinOF/InstallShield/CustomActions.vbs
@@ -387,12 +387,12 @@ Sub DriverInstall()
        Set WshShell = CreateObject("WScript.Shell")\r
        \r
     ' rescan system buses\r
-       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe rescan", 0, true)\r
+       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe rescan", 0, true)\r
        ' Display error number and description if applicable\r
     If Err Then ShowError\r
                \r
     ' Install HCA Driver\r
-       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe update mthca.inf PCI\VEN_15b3", 0, true)\r
+       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe update mthca.inf PCI\VEN_15b3", 0, true)\r
        ' Display error number and description if applicable\r
     If Err Then ShowError\r
        \r
@@ -402,7 +402,7 @@ Sub DriverInstall()
     ' 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
+       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "net & ..\IBcore\devman.exe update netipoib.inf IBA\IPoIB", 0, true)\r
        If Err Then ShowError\r
     End If\r
     \r
@@ -412,23 +412,23 @@ Sub DriverInstall()
        SYSWOW = PropArray(1)  \r
                ' msgbox "driverInstall syswow " & SYSWOW\r
                        \r
-               if fso.FileExists(sInstalldir & "mthca\cl32.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\cl32.dll", SYSWOW & "complib.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\cl32.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\cl32.dll", SYSWOW & "complib.dll"\r
                end if\r
-               if fso.FileExists(sInstalldir & "mthca\cl32d.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\cl32d.dll", SYSWOW & "complibd.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\cl32d.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\cl32d.dll", SYSWOW & "complibd.dll"\r
                end if\r
-               if fso.FileExists(sInstalldir & "mthca\ibal32.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\ibal32.dll", SYSWOW & "ibal.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\ibal32.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\ibal32.dll", SYSWOW & "ibal.dll"\r
                end if\r
-               if fso.FileExists(sInstalldir & "mthca\ibal32d.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\ibal32d.dll", SYSWOW & "ibald.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\ibal32d.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\ibal32d.dll", SYSWOW & "ibald.dll"\r
                end if\r
-               if fso.FileExists(sInstalldir & "mthca\mtuvpd32.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\mtuvpd32.dll", SYSWOW & "mthcau.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\mtuvpd32.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\mtuvpd32.dll", SYSWOW & "mthcau.dll"\r
                end if\r
-               if fso.FileExists(sInstalldir & "mthca\mtuvpd32d.dll") then\r
-                       fso.CopyFile sInstalldir & "mthca\mtuvpd32d.dll", SYSWOW & "mthcaud.dll"\r
+               if fso.FileExists(sInstalldir & "IBcore\mtuvpd32d.dll") then\r
+                       fso.CopyFile sInstalldir & "IBcore\mtuvpd32d.dll", SYSWOW & "mthcaud.dll"\r
                end if\r
                if fso.FileExists(sInstalldir & "net\ibwsd32.dll") then\r
                        fso.CopyFile sInstalldir & "net\ibwsd32.dll", SYSWOW & "ibwsd.dll"\r
@@ -449,7 +449,7 @@ Function FindDevices()
        sInstalldir = Session.Property("INSTALLDIR")\r
        Set WshShell = CreateObject("WScript.Shell")\r
 \r
-       Set ibaDevicesExec = WshShell.Exec ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe FindAll * | FIND ""IBA""")\r
+       Set ibaDevicesExec = WshShell.Exec ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe FindAll * | FIND ""IBA""")\r
        ibaDevices = split(ibaDevicesExec.StdOut.ReadAll, vbCrLF)\r
 \r
        ' Getting the array Size\r
@@ -523,7 +523,7 @@ Sub RunAtReboot()
     ' msgbox "REBOOT " & Session.property("REBOOT")\r
     ' msgbox "INSTALL " & Session.property("INSTALL")\r
        \r
-       src = sInstalldir & "mthca\WinOFDelDriverFiles.bat" \r
+       src = sInstalldir & "IBcore\WinOFDelDriverFiles.bat" \r
     dst = fso.GetSpecialFolder(2) & "WinOFDelDriverFiles.bat"\r
     If fso.FileExists(src) Then\r
         FileDelete(dst)\r
@@ -574,7 +574,7 @@ Sub DriverUninstall()
                if (Instr(deviceCan,"IBA\IPOIB") = 1) Then\r
                        device = split(deviceCan, " ")\r
                        ' Removing\r
-               Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe remove @" & device(0), 0, true)\r
+               Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe remove @" & device(0), 0, true)\r
                End if\r
          Next\r
 \r
@@ -583,7 +583,7 @@ Sub DriverUninstall()
                if (Instr(deviceCan,"InfiniBand I/O Unit")) Then\r
                        device = split(deviceCan, " ")\r
                        ' Removing I/O Unit of the SRP\r
-               Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & " & mthca\devman.exe remove @" & device(0), 0, true)\r
+               Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & " & IBcore\devman.exe remove @" & device(0), 0, true)\r
                End if\r
          Next\r
          \r
@@ -592,17 +592,17 @@ Sub DriverUninstall()
                if (Instr(deviceCan,"SRP")) Then\r
                        device = split(deviceCan, " ")\r
                        ' Removing SRP\r
-                       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & " & mthca\devman.exe remove @" & device(0), 0, true)\r
+                       Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & " & IBcore\devman.exe remove @" & device(0), 0, true)\r
                End if\r
          Next\r
 \r
       ' Remove BUS/Fabric driver\r
-      Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe remove {94f41ced-78eb-407c-b5df-958040af0fd8}", 0, true)\r
+      Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe remove {94f41ced-78eb-407c-b5df-958040af0fd8}", 0, true)\r
       ' Display error number and description if applicable\r
       If Err Then ShowError\r
 \r
       ' Remove HCAs\r
-      Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "mthca & devman.exe remove PCI\VEN_15b3", 0, true)\r
+      Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe remove PCI\VEN_15b3", 0, true)\r
       ' Display error number and description if applicable\r
       If Err Then ShowError\r
 \r