Changeset 86798 in vbox

Timestamp:

Nov 3, 2020 2:18:48 PM (4 years ago)

Author:

vboxsync

Message:

Windows host installer: Streamlined checking for the Python dependencies by calling the appropriate custom actions before spawning the next dialogs. bugref:9855

File:

• trunk/src/VBox/Installer/win/UserInterface.wxi (modified) (2 diffs)

trunk/src/VBox/Installer/win/UserInterface.wxi

@@ -306 +306 @@
         <?else ?>
                 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-                    <Publish Event="NewDialog" Value="VBoxWarnPythonDlg"><![CDATA[(&VBoxPython=3 AND (VBOX_PYTHON_DEPS_INSTALLED="0"))]]></Publish>
-                    <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[((&VBoxPython<3) OR (VBOX_PYTHON_DEPS_INSTALLED="1"))]]></Publish>
+                    <!-- Check for the Python core package and other dependencies first.
+                         The install helper code will set the public properties VBOX_PYTHON_INSTALLED / VBOX_PYTHON_DEPS_INSTALLED. -->
+                    <Publish Event="DoAction" Value="ca_IsPythonInstalled" Order="0" />
+                    <Publish Event="DoAction" Value="ca_ArePythonAPIDepsInstalled" Order="1" />
+                    <Publish Event="NewDialog" Value="VBoxWarnPythonDlg"><![CDATA[(&VBoxPython=3) AND (VBOX_PYTHON_DEPS_INSTALLED="0")]]></Publish>
+                    <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&VBoxPython<3) OR (VBOX_PYTHON_DEPS_INSTALLED="1")]]></Publish>
                 <?else ?>
                     <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
@@ -1238 +1242 @@
             <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
             <Custom Action="ca_DefaultTargetDir" After="FileCost"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
-<?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-            <Custom Action="ca_IsPythonInstalled" After="FileCost" />
-            <Custom Action="ca_ArePythonAPIDepsInstalled" After="ca_IsPythonInstalled" />
-<?endif?>
+
             <FindRelatedProducts Suppress="no">1</FindRelatedProducts>