VirtualBox

Changeset 51043 in vbox


Ignore:
Timestamp:
Apr 11, 2014 8:15:36 AM (11 years ago)
Author:
vboxsync
Message:

Windows host installer: Bugfixes.

Location:
trunk/src/VBox/Installer/win
Files:
7 edited
3 copied

Legend:

Unmodified
Added
Removed

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

    r51028 r51043  
    5858        </Directory> <!-- TARGETDIR -->
    5959
     60        <!-- Custom actions -->
     61        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    6062        <?include VBoxMergeAppCA.wxi ?>
     63
     64        <InstallExecuteSequence>
     65            <?include VBoxMergeAppSeq.wxi ?>
     66        </InstallExecuteSequence>
    6167
    6268    </Module>

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

    r51023 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    21 
    2219</Include>

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

    r51023 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    21 
    2219</Include>

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

    r51028 r51043  
    4343        </Directory> <!-- TARGETDIR -->
    4444
     45        <!-- Custom actions -->
     46        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    4547        <?include VBoxMergeNetFltCA.wxi ?>
     48
     49        <InstallExecuteSequence>
     50            <?include VBoxMergeNetFltSeq.wxi ?>
     51        </InstallExecuteSequence>
    4652
    4753    </Module>

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

    r51023 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    2119<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    2220    <CustomAction Id="ca_CreateHostOnlyInterface" BinaryKey="VBoxInstallHelper" DllEntry="CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no"/>
    … …  
    4240<?endif ?>
    4341
    44     <InstallExecuteSequence>
    45 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    46         <!-- Create host-only interfaces on first-time install. -->
    47         <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
    48         <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
    49         <!-- Don't remove the host-only interfaces on update, only on uninstall. -->
    50         <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>
    51         <!-- First stop the existing host-only interfaces on update ... -->
    52         <Custom Action="ca_StopHostOnlyInterfaces" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[UPGRADINGPRODUCTCODE]]></Custom>
    53         <!-- ... then do the actual driver update. -->
    54         <Custom Action="ca_UpdateHostOnlyInterfacesArgs" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
    55         <Custom Action="ca_UpdateHostOnlyInterfaces" Before="InstallFiles" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
    56 
    57         <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    58         <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    59         <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    60         <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    61 
    62         <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    63         <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    64         <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    65         <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    66 <?endif?>
    67     </InstallExecuteSequence>
    68 
    6942</Include>

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

    r51023 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    2119<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    22     <CustomAction Id="ca_CreateHostOnlyInterface" BinaryKey="VBoxInstallHelper" DllEntry="CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no"/>
    23     <CustomAction Id="ca_CreateHostOnlyInterfaceArgs" Property="ca_CreateHostOnlyInterface" Value="[INSTALLDIR]" Execute="immediate"/>
     20    <!-- Create host-only interfaces on first-time install. -->
     21    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
     22    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
     23    <!-- Don't remove the host-only interfaces on update, only on uninstall. -->
     24    <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>
     25    <!-- First stop the existing host-only interfaces on update ... -->
     26    <Custom Action="ca_StopHostOnlyInterfaces" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[UPGRADINGPRODUCTCODE]]></Custom>
     27    <!-- ... then do the actual driver update. -->
     28    <Custom Action="ca_UpdateHostOnlyInterfacesArgs" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
     29    <Custom Action="ca_UpdateHostOnlyInterfaces" Before="InstallFiles" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
    2430
    25     <CustomAction Id="ca_RemoveHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
    26     <CustomAction Id="ca_StopHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="StopHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
     31    <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
     32    <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
     33    <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
     34    <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    2735
    28     <CustomAction Id="ca_UpdateHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="UpdateHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
    29     <CustomAction Id="ca_UpdateHostOnlyInterfacesArgs" Property="ca_UpdateHostOnlyInterfaces" Value="[INSTALLDIR]" Execute="immediate"/>
    30 
    31     <CustomAction Id="ca_InstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
    32     <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
    33 
    34     <CustomAction Id="ca_RollbackInstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no"/>
    35     <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
    36 
    37     <CustomAction Id="ca_UninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
    38     <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
    39 
    40     <CustomAction Id="ca_RollbackUninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no"/>
    41     <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
    42 <?endif ?>
    43 
    44     <InstallExecuteSequence>
    45 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    46         <!-- Create host-only interfaces on first-time install. -->
    47         <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
    48         <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
    49         <!-- Don't remove the host-only interfaces on update, only on uninstall. -->
    50         <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>
    51         <!-- First stop the existing host-only interfaces on update ... -->
    52         <Custom Action="ca_StopHostOnlyInterfaces" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[UPGRADINGPRODUCTCODE]]></Custom>
    53         <!-- ... then do the actual driver update. -->
    54         <Custom Action="ca_UpdateHostOnlyInterfacesArgs" Before="ca_UpdateHostOnlyInterfaces" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
    55         <Custom Action="ca_UpdateHostOnlyInterfaces" Before="InstallFiles" ><![CDATA[Installed AND UPGRADINGPRODUCTCODE]]></Custom>
    56 
    57         <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    58         <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    59         <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    60         <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
    61 
    62         <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    63         <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    64         <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    65         <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
     36    <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
     37    <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
     38    <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
     39    <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
    6640<?endif?>
    67     </InstallExecuteSequence>
    6841
    6942</Include>

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

    r51028 r51043  
    4343        </Directory> <!-- TARGETDIR -->
    4444
     45        <!-- Custom actions -->
     46        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    4547        <?include VBoxMergePythonCA.wxi ?>
     48
     49        <InstallExecuteSequence>
     50            <?include VBoxMergePythonSeq.wxi ?>
     51        </InstallExecuteSequence>
    4652
    4753    </Module>

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

    r51028 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    2119    <CustomAction Id="ca_InstallPythonAPI" BinaryKey="VBoxInstallHelper" DllEntry="InstallPythonAPI" Execute="deferred" Return="check" Impersonate="no"/>
    2220    <CustomAction Id="ca_InstallPythonAPIArgs" Property="ca_InstallPythonAPI" Value="[INSTALLDIR]" Execute="immediate"/>
    2321
    24     <InstallExecuteSequence>
    25 
    26         <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[&VBoxPython=3]]></Custom>
    27         <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&VBoxPython=3]]></Custom>
    28 
    29     </InstallExecuteSequence>
    30 
    3122</Include>

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

    r51028 r51043  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <!-- Custom actions -->
    20     <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    21     <CustomAction Id="ca_InstallPythonAPI" BinaryKey="VBoxInstallHelper" DllEntry="InstallPythonAPI" Execute="deferred" Return="check" Impersonate="no"/>
    22     <CustomAction Id="ca_InstallPythonAPIArgs" Property="ca_InstallPythonAPI" Value="[INSTALLDIR]" Execute="immediate"/>
    23 
    24     <InstallExecuteSequence>
    25 
    26         <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[&VBoxPython=3]]></Custom>
    27         <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&VBoxPython=3]]></Custom>
    28 
    29     </InstallExecuteSequence>
     19    <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[&VBoxPython=3]]></Custom>
     20    <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&VBoxPython=3]]></Custom>
    3021
    3122</Include>

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

    r51023 r51043  
    172172    <CustomAction Id="ca_UninstallBranding" BinaryKey="VBoxInstallHelper" DllEntry="UninstallBranding" Execute="deferred" Return="check" Impersonate="no"/>
    173173    <CustomAction Id="ca_UninstallBrandingArgs" Property="ca_UninstallBranding" Value="[INSTALLDIR]" Execute="immediate"/>
     174<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     175    <?include VBoxMergeAppCA.wxi ?>
     176    <?include VBoxMergeNetFltCA.wxi ?>
     177    <?include VBoxMergePythonCA.wxi ?>
     178<?endif ?>
    174179
    175180    <Directory Id="TARGETDIR" Name="SourceDir">
    … …  
    283288
    284289    <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
    285             <ComponentRef Id="cp_Docs" />
    286     <?endif?>
    287             <ComponentRef Id="cp_NLS" />
     290        <ComponentRef Id="cp_Docs" />
     291    <?endif ?>
     292        <ComponentRef Id="cp_NLS" />
    288293    <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
    289             <ComponentRef Id="cp_MainCOM_x86" />
    290     <?endif?>
    291             <ComponentRef Id="cp_MainCOM" />
    292             <ComponentRef Id="cp_MainBinaries" />
     294        <ComponentRef Id="cp_MainCOM_x86" />
     295    <?endif ?>
     296        <ComponentRef Id="cp_MainCOM" />
     297        <ComponentRef Id="cp_MainBinaries" />
    293298    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    294             <ComponentRef Id="cp_QtAccessible" />
    295     <?endif?>
     299        <ComponentRef Id="cp_QtAccessible" />
     300    <?endif ?>
    296301    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    297             <ComponentRef Id="cp_VBoxPyInst" />
    298             <ComponentRef Id="cp_VBoxPyMod" />
    299     <?endif?>
     302        <ComponentRef Id="cp_VBoxPyInst" />
     303        <ComponentRef Id="cp_VBoxPyMod" />
     304    <?endif ?>
    300305
    301306    <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
    302             <ComponentRef Id="cp_VBoxCROpenGL" />
    303     <?endif?>
    304             <ComponentRef Id="cp_VBoxSDLBinaries" />
     307        <ComponentRef Id="cp_VBoxCROpenGL" />
     308    <?endif ?>
     309        <ComponentRef Id="cp_VBoxSDLBinaries" />
    305310    <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
    306             <ComponentRef Id="cp_VBoxWebService" />
    307     <?endif?>
    308             <ComponentRef Id="cp_VBoxDrv" />
     311        <ComponentRef Id="cp_VBoxWebService" />
     312    <?endif ?>
     313        <ComponentRef Id="cp_VBoxDrv" />
    309314    <?endif ?>
    310315
    … …  
    347352            </Feature>
    348353        </Feature>
    349 <?endif?>
     354<?endif ?>
    350355
    351356<?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    … …  
    360365    <?endif ?>
    361366        </Feature>
    362 <?endif?>
     367<?endif ?>
    363368    </Feature>
    364369
    … …  
    420425        <Custom Action="ca_UninstallBranding" Before="InstallFinalize" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>
    421426
     427<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     428        <?include VBoxMergeAppSeq.wxi ?>
     429        <?include VBoxMergeNetFltSeq.wxi ?>
     430        <?include VBoxMergePythonSeq.wxi ?>
     431<?endif ?>
     432
    422433    </InstallExecuteSequence>
    423434
Note: See TracChangeset for help on using the changeset viewer.

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