Changeset 51046 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Apr 11, 2014 9:39:15 AM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixed building if VBOX_WITH_QTGUI is not defined.

Location:

trunk/src/VBox/Installer/win

Files:

• UserInterface.wxi (modified) (3 diffs)
• VBoxMergeApp.wxi (modified) (4 diffs)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -294 +294 @@
             </Control>
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
+        <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
                 <Publish Event="NewDialog" Value="VBoxCustomize2Dlg">1</Publish>
+        <?else ?>
+                <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
+        <?endif ?>
                 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
             </Control>
@@ -339 +343 @@
                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>
-
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17"
                 Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)">
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+            <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
                 <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3) AND NOT(!VBoxNetworkFlt=3)]]></Publish>
                 <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&VBoxNetworkFlt<3)]]></Publish>
-<?else ?>
+            <?else ?>
                 <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
-<?endif?>
+            <?endif?>
             </Control>
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17"
@@ -494 +497 @@
             </Control>
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
+        <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
                 <Publish Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[InstallMode = "!(loc.InstallModeCustom)"]]></Publish>
+        <?else ?>
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
+        <?endif ?>
             </Control>
             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">

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

@@ -124 +124 @@
     <!---->
 
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)">
         <Condition>VBOX_REGISTERFILEEXTENSIONS</Condition>
@@ -162 +163 @@
         </ProgId>
     </Component> <!-- RegisterExtensions -->
+<?endif ?>
 
     <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
@@ -267 +269 @@
               Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
 <?endif ?>
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <!-- Qt frontend -->
         <File Id="file_VirtualBox.exe" Name="VirtualBox.exe"
@@ -277 +280 @@
         <File Id="file_QtNetworkVBox4.dll" Name="QtNetworkVBox4.dll"
               Source="$(env.PATH_OUT)\bin\QtNetworkVBox4.dll" />
+<?endif ?>
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
         <File Id="file_VBoxDbg.dll" Name="VBoxDbg.dll"

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

@@ -279 +279 @@
              ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand"
              Absent="disallow" AllowAdvertise="no" >
- <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
         <MergeRef Id="msm_VBoxApp" />
 <?else ?>
@@ -285 +285 @@
         <ComponentRef Id="cp_DesktopShortcut" />
         <ComponentRef Id="cp_QuickLaunchVBox" />
+    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <ComponentRef Id="cp_RegisterExtensions" />
-
+    <?endif ?>
     <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
         <ComponentRef Id="cp_Docs" />