Changeset 94380 in vbox for trunk

Timestamp:

Mar 28, 2022 10:11:20 AM (3 years ago)

Author:

vboxsync

Message:

Installer/win: Only show and handle custom action to start VirtualBox after successful installation if FE/Qt is included. Removed bogus custom actions. bugref:10201

Location:

trunk/src/VBox/Installer/win

Files:

• UserInterface.wxi (modified) (3 diffs)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -531 +531 @@
         <Dialog Id="VBoxExitDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?> <!-- Only expose action to start VirtualBox if we also ship FE/Qt with it. -->
                 <Publish Event="DoAction" Value="ca_StartVBox"><![CDATA[VBOX_START]]></Publish>
+<?endif ?>
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
@@ -547 +549 @@
             </Control>
 
+            <!-- Only show the checkbox to start VirtualBox if we also ship FE/Qt with it. -->
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
             <!-- Note the gray background behind the checkboxes. Unfortunately there's no easy way to
                  fix this, without fixing it in the WiX source code. Because the control's background
@@ -562 +566 @@
                 </Condition>
             </Control>
-
+<?endif ?>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -234 +234 @@
     </Condition>-->
 
-    <!-- Note: When we don't include FE/Qt, we just start *something* (e.g. Windows' calc.exe) to see if the custom action works. -->
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
-    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-        <CustomAction Id="ca_StartVBox" FileKey="file_VirtualBox.exe" ExeCommand="" Return="asyncNoWait" Impersonate="yes" />
-    <?else ?>
-        <CustomAction Id="ca_StartVBox" Directory="INSTALLDIR" ExeCommand='"[INSTALLDIR]\VBoxBugReport.exe"' Return="asyncNoWait" Impersonate="yes" />
-    <?endif ?>
-<?else ?>
-    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-        <CustomAction Id="ca_StartVBox" Directory="file_VBoxBugReport.exe" ExeCommand="" Return="asyncNoWait" Impersonate="yes" />
-    <?else ?>
-        <CustomAction Id="ca_StartVBox" Directory="INSTALLDIR" ExeCommand='"[INSTALLDIR]\VBoxBugReport.exe"' Return="asyncNoWait" Impersonate="yes" />
-    <?endif ?>
+    <!-- Note: Only if we include FE/Qt, we offer to start VirtualBox at the end of a successful installation. -->
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
+    <CustomAction Id="ca_StartVBox" FileKey="file_VirtualBox.exe" ExeCommand="" Return="asyncNoWait" Impersonate="yes" />
 <?endif ?>