VirtualBox

Changeset 107361 in vbox for trunk


Ignore:
Timestamp:
Dec 18, 2024 2:52:42 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
166399
Message:

Windows host installer: Removed the component "cp_RegisterExtensions", as the stuff in there needs to be a part of the "cp_MainBinaries" component. This otherwise will break validation, as "cp_RegisterExtensions" referenced files (file_VBoxRes.dll) from "cp_MainBinaries".

Moved the debugger UI (VBOX_WITH_DEBUGGER_GUI) into the VBOX_WITH_QTGUI block, as it makes no sense to ship the debugger UI files w/o the actual main UI. bugref:10828

Location:
trunk/src/VBox/Installer/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r107139 r107361  
    145145<?endif?>
    146146
    147     <!---->
    148 
    149 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    150     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Bitness="$(var.Property_Bitness)" KeyPath="yes"
    151                Condition="(VBOX_REGISTERFILEEXTENSIONS=&quot;1&quot;)">
    152         <!-- Register file extensions. Note: Extension IDs *must not* be changed! These specify the actual
    153              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
    154              Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h" -->
    155         <ProgId Id="progId_VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="file_VBoxRes.dll" IconIndex="-201">
    156             <Extension Id="vbox" ContentType="application/x-virtualbox-vbox">
    157                 <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
    158             </Extension>
    159         </ProgId>
    160         <ProgId Id="progId_VirtualBox.Shell.vbox-extpack" Description="VirtualBox Extension Pack" Icon="file_VBoxRes.dll" IconIndex="-202">
    161             <Extension Id="vbox-extpack" ContentType="application/x-virtualbox-vbox-extpack">
    162                 <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
    163             </Extension>
    164         </ProgId>
    165         <ProgId Id="progId_VirtualBox.Shell.ovf" Description="Open Virtualization Format" Icon="file_VBoxRes.dll" IconIndex="-301">
    166             <Extension Id="ovf" ContentType="application/x-virtualbox-ovf">
    167                 <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
    168             </Extension>
    169         </ProgId>
    170         <ProgId Id="progId_VirtualBox.Shell.ova" Description="Open Virtualization Format Archive" Icon="file_VBoxRes.dll" IconIndex="-302">
    171             <Extension Id="ova" ContentType="application/x-virtualbox-ova">
    172                 <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
    173             </Extension>
    174         </ProgId>
    175         <ProgId Id="progId_VirtualBox.Shell.vdi" Description="Virtual Disk Image" Icon="file_VBoxRes.dll" IconIndex="-303">
    176             <Extension Id="vdi" ContentType="application/x-virtualbox-vdi" />
    177         </ProgId>
    178         <ProgId Id="progId_VirtualBox.Shell.vmdk" Description="Virtual Machine Disk Format" Icon="file_VBoxRes.dll" IconIndex="-304">
    179             <Extension Id="vmdk" ContentType="application/x-virtualbox-vmdk" />
    180         </ProgId>
    181         <ProgId Id="progId_VirtualBox.Shell.vhd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-305">
    182             <Extension Id="vhd" ContentType="application/x-virtualbox-vhd" />
    183         </ProgId>
    184         <ProgId Id="progId_VirtualBox.Shell.hdd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-306">
    185             <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
    186         </ProgId>
    187     </Component> <!-- cp_RegisterExtensions -->
    188 <?endif?>
    189 
    190147    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
    191148         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated -->
    … …  
    291248<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    292249        <!-- Qt frontend -->
    293         <File Id="file_VirtualBox.exe" Name="VirtualBox.exe" Source="$(env.PATH_OUT)\bin\VirtualBox.exe">
    294         </File>
    295         <File Id="file_VirtualBoxVM.exe" Name="VirtualBoxVM.exe" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.exe">
    296         </File>
    297         <File Id="file_UICommon.dll" Name="UICommon.dll" Source="$(env.PATH_OUT)\bin\UICommon.dll">
    298         </File>
     250        <File Id="file_VirtualBox.exe" Name="VirtualBox.exe" Source="$(env.PATH_OUT)\bin\VirtualBox.exe" />
     251        <File Id="file_VirtualBoxVM.exe" Name="VirtualBoxVM.exe" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.exe" />
     252        <File Id="file_UICommon.dll" Name="UICommon.dll" Source="$(env.PATH_OUT)\bin\UICommon.dll" />
    299253    <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
    300         <File Id="file_VirtualBoxVM.dll" Name="VirtualBoxVM.dll" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.dll">
    301         </File>
     254        <File Id="file_VirtualBoxVM.dll" Name="VirtualBoxVM.dll" Source="$(env.PATH_OUT)\bin\VirtualBoxVM.dll" />
    302255    <?endif?>
    303256    <?if $(env.VBOX_WITH_ORACLE_QT) = "yes" ?>
    … …  
    314267        <File Id="file_VirtualBox_70px.png" Name="VirtualBox_70px.png" Source="$(env.PATH_OUT)\bin\VirtualBox_70px.png" />
    315268        <File Id="file_VirtualBox_150px.png" Name="VirtualBox_150px.png" Source="$(env.PATH_OUT)\bin\VirtualBox_150px.png" />
    316 <?endif?>
    317 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
     269    <!-- Register file extensions. Note: Extension IDs *must not* be changed! These specify the actual
     270         file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
     271         Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h"
     272
     273         Note! Registering the file extensions must be done in the same component where the binaries of FE/Qt live.
     274               Otherwise the MSI validation will fail.  -->
     275    <ProgId Id="progId_VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="file_VBoxRes.dll" IconIndex="-201">
     276        <Extension Id="vbox" ContentType="application/x-virtualbox-vbox">
     277            <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
     278        </Extension>
     279    </ProgId>
     280    <ProgId Id="progId_VirtualBox.Shell.vbox-extpack" Description="VirtualBox Extension Pack" Icon="file_VBoxRes.dll" IconIndex="-202">
     281        <Extension Id="vbox-extpack" ContentType="application/x-virtualbox-vbox-extpack">
     282            <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
     283        </Extension>
     284    </ProgId>
     285    <ProgId Id="progId_VirtualBox.Shell.ovf" Description="Open Virtualization Format" Icon="file_VBoxRes.dll" IconIndex="-301">
     286        <Extension Id="ovf" ContentType="application/x-virtualbox-ovf">
     287            <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
     288        </Extension>
     289    </ProgId>
     290    <ProgId Id="progId_VirtualBox.Shell.ova" Description="Open Virtualization Format Archive" Icon="file_VBoxRes.dll" IconIndex="-302">
     291        <Extension Id="ova" ContentType="application/x-virtualbox-ova">
     292            <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
     293        </Extension>
     294    </ProgId>
     295    <ProgId Id="progId_VirtualBox.Shell.vdi" Description="Virtual Disk Image" Icon="file_VBoxRes.dll" IconIndex="-303">
     296        <Extension Id="vdi" ContentType="application/x-virtualbox-vdi" />
     297    </ProgId>
     298    <ProgId Id="progId_VirtualBox.Shell.vmdk" Description="Virtual Machine Disk Format" Icon="file_VBoxRes.dll" IconIndex="-304">
     299        <Extension Id="vmdk" ContentType="application/x-virtualbox-vmdk" />
     300    </ProgId>
     301    <ProgId Id="progId_VirtualBox.Shell.vhd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-305">
     302        <Extension Id="vhd" ContentType="application/x-virtualbox-vhd" />
     303    </ProgId>
     304    <ProgId Id="progId_VirtualBox.Shell.hdd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-306">
     305        <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
     306    </ProgId>
     307    <!-- Debugger UI. -->
     308    <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
    318309        <File Id="file_VBoxDbg.dll" Name="VBoxDbg.dll" Source="$(env.PATH_OUT)\bin\VBoxDbg.dll" />
    319310        <File Id="file_DbgPlugInDiggers.dll" Name="DbgPlugInDiggers.dll" Source="$(env.PATH_OUT)\bin\DbgPlugInDiggers.dll" />
    320 <?endif?>
     311    <?endif?>
     312<?endif?> <!-- $(env.VBOX_WITH_QTGUI) = "yes" -->
    321313
    322314<?if $(env.VBOX_WITH_CRT_PACKING) = "yes" ?>

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

    r107324 r107361  
    261261         the required ACLs for our files / folders. -->
    262262        <ComponentRef Id="cp_Permissions" />
    263     <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    264         <ComponentRef Id="cp_RegisterExtensions" />
    265     <?endif?>
    266263    <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
    267264        <ComponentRef Id="cp_Docs" />
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette