[WinOF] Delete opensm created files. Encapsulate run_once experiements; not enabled.

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

diff --git a/branches/WinOF/InstallShield/CustomActions.vbs b/branches/WinOF/InstallShield/CustomActions.vbs
index 8a5e63fb7e63cfc6fd73afbe66a015f9f664d843..412728bddc40e789315e856f24db7e5f5bec2730 100644 (file)
--- a/branches/WinOF/InstallShield/CustomActions.vbs
+++ b/branches/WinOF/InstallShield/CustomActions.vbs
@@ -201,8 +201,15 @@ Function RemoveInstalledFiles()
        FileDelete(Win & "lastgood\system32\ibwsd.dll")\r
        FileDelete(Win & "lastgood\sys64wow\ibwsd.dll")\r
     \r
-    ' delete opensm file\r
-    FileDelete(sInstalldir & "etc\guid2lid")\r
+    ' delete opensm files\r
+    Dim fso\r
+    Dim sTemp\r
+    Set fso = CreateObject("Scripting.FileSystemObject")\r
+    sTemp = fso.GetSpecialFolder(2)\r
+    FileDelete(sTemp & "guid2lid")\r
+    FileDelete(sTemp & "opensm-sa.dump")\r
+    FileDelete(sTemp & "osm.log")\r
+    FileDelete(sTemp & "osm-subnet.lst")\r
     \r
     ' Delete oem*.inf and oem*.pnf files\r
     dim  InfFiles, PnfFiles, IFILES, PFILES\r
@@ -230,11 +237,8 @@ Function RemoveInstalledFiles()
     Next\r
     \r
     '  cleanup DAPL/DAT\r
-    Dim tmp\r
-    tmp = Win & "dat.dll"\r
-    FileMDelete(tmp)\r
-    tmp = Win & "dapl.dll"\r
-    FileMDelete(tmp)\r
+    FileDelete(Win & "dat.dll")\r
+    FileDelete(Win & "dapl.dll")\r
       \r
 End Function\r
 \r
@@ -502,6 +506,39 @@ Function Find_IPOIB_LAC()
 End Function\r
 \r
 \r
+' Not used - sub works although the script invoked does \r
+' not remove the intended files?\r
+' Get file delete script name and put it in the runonce registry key for\r
+' file delete on restart.\r
+\r
+Sub RunAtReboot()\r
+       dim run_once_cmd\r
+       dim src\r
+       dim dstp\r
+       dim key_name\r
+       Dim fso\r
+    Dim sInstalldir\r
+    \r
+    Set fso = CreateObject("Scripting.FileSystemObject")\r
+    sInstalldir = Session.Property("INSTALLDIR")\r
+\r
+    ' msgbox "INSTALLED " & Session.property("INSTALLED") ' XXX\r
+    ' msgbox "REBOOT " & Session.property("REBOOT")\r
+    ' msgbox "INSTALL " & Session.property("INSTALL")\r
+       \r
+       src = sInstalldir & "mthca\WinOFDelDriverFiles.bat" \r
+    dst = fso.GetSpecialFolder(2) & "WinOFDelDriverFiles.bat"\r
+    If fso.FileExists(src) Then\r
+        FileDelete(dst)\r
+       fso.MoveFile src, dst\r
+               run_once_cmd = "cmd.exe /c " & dst\r
+               key_name = "Software\Microsoft\Windows\CurrentVersion\RunOnce"\r
+               AddRegStringValue key_name,"WinOF",run_once_cmd\r
+       End if    \r
+End Sub\r
+\r
+\r
+\r
 ''''''''''' Driver Uninstall ''''''''''''\r
 \r
 Sub DriverUninstall()  \r
@@ -514,7 +551,7 @@ Sub DriverUninstall()
       Dim fso\r
       Set fso = CreateObject("Scripting.FileSystemObject")\r
 \r
-      ' if WSD enabled, then shut down the service\r
+         ' if WSD enabled, then shut down the service\r
       If fso.FileExists(sInstalldir & "installsp.exe") Then\r
        Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & " & installsp.exe -r", 0, true)\r
       End If\r
@@ -606,8 +643,8 @@ Sub DriverUninstall()
       RemoveInstalledFiles\r
       \r
          Session.Property("REBOOT") = "FORCE"\r
-\r
-         err.clear \r
+         \r
+       err.clear \r
 End Sub\r
 \r
 \r
@@ -710,21 +747,6 @@ Function ChkInstallAndReboot()
                Exit Function\r
        End if\r
                \r
-       ' XXX - not working.\r
-       ' Get product code and putting it in the runonce registry key for\r
-       ' install upon restart\r
-\r
-       dim p_code: p_code = Session.Property("ProductCode")\r
-       dim run_once_cmd\r
-       dim srcp \r
-    ' srcp = WScript.ScriptFullName   # returns <null> in this env?\r
-       ' p_code = Session.Property("ProductCode")\r
-       run_once_cmd = "cmd.exe /c " & srcp ' & " /S "  \r
-       ' msgbox (" run_once " & run_once_cmd)\r
-\r
-       ' key_name = "Software\Microsoft\Windows\CurrentVersion\RunOnce"\r
-       ' AddRegStringValue key_name,"WinOFinstall",run_once_cmd\r
-    \r
        ChkInstallAndReboot = 0\r
 \r
        ' the driveruninstall call sets reboot=force, ForceReboot action\r