Changeset 104462 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 30, 2024 12:26:51 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162977

Message:

Windows host installer: More quoting changes for WIX v4 needed for custom action conditions. ​bugref:10644

File:

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

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

@@ -576 +576 @@
                  change their Windows color scheme.
                  Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
-            <Control Id="StartVBoxCheckBox" Type="CheckBox" X="135" Y="115" Width="200" Height="17" Property="VBOX_START" CheckBoxValue="1" Default="no" HideCondition="(InstallMode=&quot;Repair&quot;) OR (InstallMode=&quot;Remove&quot;) OR&#xA;                      (InstallMode=&quot;Change&quot;)">
+            <Control Id="StartVBoxCheckBox" Type="CheckBox" X="135" Y="115" Width="200" Height="17" Property="VBOX_START" CheckBoxValue="1" Default="no" 
+                     HideCondition="(InstallMode=&quot;Repair&quot;) OR (InstallMode=&quot;Remove&quot;) OR (InstallMode=&quot;Change&quot;)">
                 <Text Value="!(loc.ExitDlg_StartVBox)" />
 
@@ -1234 +1235 @@
             <!-- 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. -->
-            <Custom Action="ca_IsPythonInstalled" After="CostFinalize" Condition="1" />
-            <Custom Action="ca_ArePythonAPIDepsInstalled" After="CostFinalize" Condition="1" />
+            <Custom Action="ca_IsPythonInstalled" After="CostFinalize" />
+            <Custom Action="ca_ArePythonAPIDepsInstalled" After="CostFinalize" />
 <?endif?>
-            <FindRelatedProducts Suppress="no" Condition="1" />
+            <FindRelatedProducts Suppress="no" />
 
             <Show Dialog="VBoxFatalErrorDlg" OnExit="error" />
@@ -1245 +1246 @@
             <Show Dialog="VBoxResumeDlg" After="VBoxWelcomeDlg" Condition="Installed AND (RESUME OR Preselected)" />
             <Show Dialog="VBoxMaintenanceWelcomeDlg" After="VBoxResumeDlg" Condition="Installed AND (NOT RESUME) AND (NOT Preselected)" />
-            <Show Dialog="VBoxExitDlg" OnExit="success" Condition="1" />
+            <Show Dialog="VBoxExitDlg" OnExit="success" />
             <Show Dialog="VBoxProgressDlg" After="VBoxMaintenanceWelcomeDlg" />