[WinOF] RC2 changes

Leave %WINDIR%\dat.dll and %WINDIR%\dapl.dll alone as they are managed by installer (aka, don't shoot self in foot).

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

diff --git a/branches/WinOF/InstallShield/CustomActions.vbs b/branches/WinOF/InstallShield/CustomActions.vbs
index 15d1c63c4da699bc7ad797af934decc394743993..9a2bc0290cc54293012e6f0ba8e7f6c393bbba44 100644 (file)
--- a/branches/WinOF/InstallShield/CustomActions.vbs
+++ b/branches/WinOF/InstallShield/CustomActions.vbs
@@ -110,7 +110,7 @@ Function FileMove(filename,destination)
 End Function\r
 \r
 \r
-Function RemoveInstalledFiles()\r
+Function RemoveDriverFiles()\r
        Dim Win\r
        Dim sDRIVERS\r
     Dim sSystem64Folder    \r
@@ -232,10 +232,6 @@ Function RemoveInstalledFiles()
        End IF\r
     Next\r
     \r
-    '  cleanup DAPL/DAT\r
-    FileDelete(Win & "dat.dll")\r
-    FileDelete(Win & "dapl.dll")\r
-      \r
 End Function\r
 \r
 ''''''''''' Delete registry key ''''''''''''\r
@@ -382,7 +378,7 @@ Sub DriverInstall()
        Dim sInstalldir\r
        sInstalldir = PropArray(0)\r
        \r
-       RemoveInstalledFiles\r
+       RemoveDriverFiles\r
    \r
        Set WshShell = CreateObject("WScript.Shell")\r
        \r
@@ -653,7 +649,7 @@ Sub DriverUninstall()
          Next\r
                \r
       ' remove driver installed files\r
-      RemoveInstalledFiles\r
+      RemoveDriverFiles\r
       \r
          Session.Property("REBOOT") = "FORCE"\r
          \r
@@ -703,7 +699,7 @@ Sub OpensmServiceEvent()
     \r
     ' if opensm.service.txt exists then the install requestor\r
     ' has asked that opensm be run as a service.\r
-    \r
+\r
        If Not fso.FileExists(opensmService) Then\r
                Exit sub\r
        End if\r
@@ -771,7 +767,7 @@ End Function
 \r
 \r
 \r
-' deferred action to increment ticks while action is taking place\r
+' NOT USED - deferred action to increment ticks while action is taking place\r
 '\r
 Function AddProgressInfo( )\r
        Const INSTALLMESSAGE_ACTIONSTART = &H08000000\r
@@ -811,5 +807,3 @@ Function AddProgressInfo( )
        AddProgressInfo = 0\r
 End Function\r
 \r
-\r
-\r