[WIX] rename CustomAction:DriverInstall to reflect how it's being called now as MS...

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

diff --git a/trunk/OFED/WIX/CustomActions.vbs b/trunk/OFED/WIX/CustomActions.vbs
index 0d20761703abb8bd5c1e6a3bed5e8f5d7b388ae1..dc70266e3005cd2f1628c4d254a87549d95b0f07 100644 (file)
--- a/trunk/OFED/WIX/CustomActions.vbs
+++ b/trunk/OFED/WIX/CustomActions.vbs
@@ -120,7 +120,7 @@ End Function
 \r
 \r
 ' A CustomAction (CA) that runs after SetupInitialize which sets up\r
-' CustomAction Data for the defered action DriverInstall().\r
+' CustomAction Data for the defered action PostDriverInstall.\r
 ' A CA can only see Installer properties through pre-loaded 'CustomActionData'\r
 \r
 Sub WinOF_setup\r
@@ -158,7 +158,7 @@ Sub WinOF_setup
     ' 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder ;\r
        ' 4-VersionNT; 5-ADDLOCAL; 6-REMOVE; 7-NODRV; 8-DBG\r
 \r
-       Session.Property("DriverInstall") = _\r
+       Session.Property("PostDriverInstall") = _\r
                Session.Property("INSTALLDIR")          & ";" & _\r
                Session.Property("SystemFolder")        & ";" & _\r
                Session.Property("System64Folder")      & ";" & _\r
@@ -742,9 +742,9 @@ End Sub
 \r
 \r
 \r
-''''''''''' Device Driver Install ''''''''''''\r
+''''''''''' Post Device Driver Install ''''''''''''\r
 \r
-Function DriverInstall()\r
+Function PostDriverInstall()\r
     Dim CheckMode, PropArray\r
        Dim VersionNT, InstallThis, localSM\r
     Dim rc, cmd, sInstalldir, fso\r
@@ -801,12 +801,12 @@ Function DriverInstall()
                OpenSM_StartMeUp WshShell,sInstalldir\r
                If sDBG >= "1" Then\r
                        msgbox "Local Subnet Management Service [OpenSM] started.",,_\r
-                                       "DriverInstall"\r
-                       MsiLogInfo "[DriverInstall] Local Subnet Management Service [OpenSM] started."\r
+                                       "PostDriverInstall"\r
+                       MsiLogInfo "[PostDriverInstall] Local Subnet Management Service [OpenSM] started."\r
                End If\r
        End If\r
 \r
-       DriverInstall = 0\r
+       PostDriverInstall = 0\r
 \r
 End Function\r
 \r
@@ -1656,7 +1656,7 @@ End Sub
 ' Convert the disabled OpenSM Windows service to an 'auto' startup on next boot.\r
 ' OpenSM service was created by WIX installer directives - see WOF.wxs file.\r
 ' Performs local service conversion and then starts the local OpenSM service.\r
-' Routine called from DriverInstall phase 'IF' a local OpenSM service was\r
+' Routine called from PostDriverInstall phase 'IF' a local OpenSM service was\r
 ' requested. The point is to get a local OpenSM up and running prior to loading\r
 ' the IOU and SRP/VNIC drivers. Server 2003 IOU driver load fails if OpenSM\r
 ' has not yet registered the IOC?\r

diff --git a/trunk/OFED/WIX/common/InstallExecuteSeq.inc b/trunk/OFED/WIX/common/InstallExecuteSeq.inc
index 382f1ff9240628a94f159c69d3281fa12c839a14..4b043aea045cfb9c974024d8d9af990417da940e 100644 (file)
--- a/trunk/OFED/WIX/common/InstallExecuteSeq.inc
+++ b/trunk/OFED/WIX/common/InstallExecuteSeq.inc
@@ -9,8 +9,8 @@
     <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"\r
          VBScriptCall="ChkPreviousInstall" Return="check" />\r
 \r
-    <CustomAction Id="DriverInstall" BinaryKey="CA"\r
-         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />\r
+    <CustomAction Id="PostDriverInstall" BinaryKey="CA"\r
+         VBScriptCall="PostDriverInstall" Return="check" Execute="deferred" />\r
 \r
     <CustomAction Id="Remove_IB_Devices" BinaryKey="CA"\r
          VBScriptCall="Remove_IB_Devices" Return="check" />\r
@@ -45,7 +45,7 @@
        <Custom Action="ChkPreviousInstall" After='WinOF_setup'>\r
                NOT Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="DriverInstall" After='InstallServices'>\r
+       <Custom Action="PostDriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="CheckDriversOK" After="InstallFinalize">\r