VirtualBox

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


Ignore:
Timestamp:
May 9, 2014 1:08:07 PM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
93643
Message:

Windows host installer: Fixes for non-MSM builds.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r51221 r51225  
    6060#
    6161ifneq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
     62 VBOX_WITH_MSM_INSTALL := 1
     63 VBOX_INSTALLER_LANGUAGES = en_US
     64endif
     65
     66ifeq ($(USERNAME),andy)
    6267 VBOX_WITH_MSM_INSTALL := 1
    6368 VBOX_INSTALLER_LANGUAGES = en_US
    … …  
    642647                -E 'VBOX_WITH_VRDP=$(if-expr defined(VBOX_WITH_VRDP) && !defined(VBOX_WITH_EXTPACK_PUEL),yes,no)' \
    643648                -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
     649                -E 'VBOX_WITH_MSM_INSTALL=$(if $(VBOX_WITH_MSM_INSTALL),yes,no)' \
    644650                -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
    645651                -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \

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

    r51009 r51225  
    22    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="Version" Value="%VER%" Type="string" />
    33    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="VersionExt" Value="%VER_EXT%" Type="string" />
    4     <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[MergeRedirectFolder]" Type="string" />
     4    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[INSTALLDIR]" Type="string" />
    55</Include>

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

    r51144 r51225  
    137137        <!-- Set required environment variables -->
    138138        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_MSI_INSTALL_PATH"
    139                      System="yes" Part="last" Permanent="no" Value="[MergeRedirectFolder]" />
     139                     System="yes" Part="last" Permanent="no" Value="[msm_VBoxApplicationFolder]" />
    140140
    141141        <!-- Files -->

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

    r51043 r51225  
    5151        <!-- Here comes the file/directory list -->
    5252        <Directory Id="TARGETDIR" Name="SourceDir">
    53             <Directory Id="MergeRedirectFolder" FileSource=".">
     53            <Directory Id="msm_VBoxApplicationFolder" FileSource=".">
    5454
    5555                <?include VBoxMergeApp.wxi ?>
    5656
    57             </Directory> <!-- MergeRedirectFolder directory -->
     57            </Directory> <!-- msm_VBoxApplicationFolder directory -->
    5858        </Directory> <!-- TARGETDIR -->
    5959

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

    r51060 r51225  
    3636        <!-- Here comes the file/directory list -->
    3737        <Directory Id="TARGETDIR" Name="SourceDir">
    38             <Directory Id="MergeRedirectFolder" FileSource=".">
     38            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
    3939
    4040                <?include VBoxMergeNetAdp.wxi ?>
    4141
    42             </Directory> <!-- MergeRedirectFolder -->
     42            </Directory> <!-- msm_VBoxNetworkAdpFolder -->
    4343        </Directory> <!-- TARGETDIR -->
    4444

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

    r51050 r51225  
    1818
    1919    <CustomAction Id="ca_CreateHostOnlyInterface" BinaryKey="VBoxInstallHelper" DllEntry="CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no"/>
    20     <CustomAction Id="ca_CreateHostOnlyInterfaceArgs" Property="ca_CreateHostOnlyInterface" Value="[MergeRedirectFolder]" Execute="immediate"/>
     20    <CustomAction Id="ca_CreateHostOnlyInterfaceArgs" Property="ca_CreateHostOnlyInterface" Value="[msm_VBoxNetworkAdpFolder]" Execute="immediate"/>
    2121    <CustomAction Id="ca_RemoveHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
    2222    <CustomAction Id="ca_StopHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="StopHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
     23    <CustomAction Id="ca_UpdateHostOnlyInterfacesArgs" Property="ca_UpdateHostOnlyInterfaces" Value="[msm_VBoxNetworkAdpFolder]" Execute="immediate"/>
    2324    <CustomAction Id="ca_UpdateHostOnlyInterfaces" BinaryKey="VBoxInstallHelper" DllEntry="UpdateHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
    24     <CustomAction Id="ca_UpdateHostOnlyInterfacesArgs" Property="ca_UpdateHostOnlyInterfaces" Value="[MergeRedirectFolder]" Execute="immediate"/>
    2525
    2626</Include>

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

    r51120 r51225  
    1919<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    2020    <!-- Create host-only interfaces on first-time install -->
    21     <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[NOT Installed]]></Custom>
    22     <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[NOT Installed]]></Custom>
     21    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" >
     22        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     23            <![CDATA[NOT Installed]]>
     24        <?else ?>
     25            <![CDATA[&VBoxNetworkAdp=3]]>
     26        <?endif ?>
     27    </Custom>
     28    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" >
     29        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     30            <![CDATA[NOT Installed]]>
     31        <?else ?>
     32            <![CDATA[&VBoxNetworkAdp=3]]>
     33        <?endif ?>
     34    </Custom>
    2335    <!-- Don't remove the host-only interfaces on update, only on uninstall -->
    2436    <Custom Action="ca_RemoveHostOnlyInterfaces" Before="InstallFinalize" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>

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

    r51060 r51225  
    3636        <!-- Here comes the file/directory list -->
    3737        <Directory Id="TARGETDIR" Name="SourceDir">
    38             <Directory Id="MergeRedirectFolder" FileSource=".">
     38            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
    3939
    4040                <?include VBoxMergeNetFlt.wxi ?>
    4141
    42             </Directory> <!-- MergeRedirectFolder -->
     42            </Directory> <!-- msm_VBoxNetworkFltFolder -->
    4343        </Directory> <!-- TARGETDIR -->
    4444

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

    r51050 r51225  
    1919<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    2020    <CustomAction Id="ca_InstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
    21     <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
     21    <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
    2222
    2323    <CustomAction Id="ca_RollbackInstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no"/>
    24     <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
     24    <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
    2525
    2626    <CustomAction Id="ca_UninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
    27     <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
     27    <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
    2828
    2929    <CustomAction Id="ca_RollbackUninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no"/>
    30     <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
     30    <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
    3131<?endif ?>
    3232

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

    r51127 r51225  
    1818
    1919<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    20     <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom>
    21     <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom>
    22     <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom>
    23     <Custom Action="ca_InstallNetFlt" Before="InstallFinalize" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom>
    24 
    25     <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]></Custom>
    26     <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]></Custom>
    27     <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]></Custom>
    28     <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]></Custom>
    29 <?endif?>
     20    <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" >
     21        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     22            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
     23        <?else ?>
     24            <![CDATA[&VBoxNetworkFlt=3]]>
     25        <?endif ?>
     26    </Custom>
     27    <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" >
     28        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     29            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
     30        <?else ?>
     31            <![CDATA[&VBoxNetworkFlt=3]]>
     32        <?endif ?>
     33    </Custom>
     34    <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" >
     35        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     36            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
     37        <?else ?>
     38            <![CDATA[&VBoxNetworkFlt=3]]>
     39        <?endif ?>
     40    </Custom>
     41    <Custom Action="ca_InstallNetFlt" Before="InstallFinalize" >
     42        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     43            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
     44        <?else ?>
     45            <![CDATA[&VBoxNetworkFlt=3]]>
     46        <?endif ?>
     47    </Custom>
     48    <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" >
     49        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     50            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     51        <?else ?>
     52            <![CDATA[&VBoxNetworkFlt=2]]>
     53        <?endif ?>
     54    </Custom>
     55    <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" >
     56        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     57            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     58        <?else ?>
     59            <![CDATA[&VBoxNetworkFlt=2]]>
     60        <?endif ?>
     61    </Custom>
     62    <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" >
     63        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     64            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     65        <?else ?>
     66            <![CDATA[&VBoxNetworkFlt=2]]>
     67        <?endif ?>
     68    </Custom>
     69    <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" >
     70        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     71            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     72        <?else ?>
     73            <![CDATA[&VBoxNetworkFlt=2]]>
     74        <?endif ?>
     75    </Custom>
     76<?endif?> <!-- VBOX_WITH_NETFLT -->
    3077
    3178</Include>

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

    r51060 r51225  
    3636        <!-- Here comes the file/directory list -->
    3737        <Directory Id="TARGETDIR" Name="SourceDir">
    38             <Directory Id="MergeRedirectFolder" FileSource=".">
     38            <Directory Id="msm_VBoxPythonFolder" FileSource=".">
    3939
    4040                <?include VBoxMergePython.wxi ?>
    4141
    42             </Directory> <!-- MergeRedirectFolder -->
     42            </Directory> <!-- msm_VBoxPythonFolder -->
    4343        </Directory> <!-- TARGETDIR -->
    4444

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

    r51050 r51225  
    1818
    1919    <CustomAction Id="ca_InstallPythonAPI" BinaryKey="VBoxInstallHelper" DllEntry="InstallPythonAPI" Execute="deferred" Return="check" Impersonate="no"/>
    20     <CustomAction Id="ca_InstallPythonAPIArgs" Property="ca_InstallPythonAPI" Value="[MergeRedirectFolder]" Execute="immediate"/>
     20    <CustomAction Id="ca_InstallPythonAPIArgs" Property="ca_InstallPythonAPI" Value="[msm_VBoxPythonFolder]" Execute="immediate"/>
    2121
    2222</Include>

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

    r51050 r51225  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[1]]></Custom>
    20     <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[1]]></Custom>
     19    <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" >
     20        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     21            <![CDATA[1]]>
     22        <?else ?>
     23            <![CDATA[&VBoxPython=3]]>
     24        <?endif ?>
     25    </Custom>
     26    <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" >
     27        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     28            <![CDATA[1]]>
     29        <?else ?>
     30            <![CDATA[&VBoxPython=3]]>
     31        <?endif ?>
     32    </Custom>
    2133
    2234</Include>

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

    r51023 r51225  
    3636        <!-- Here comes the file/directory list -->
    3737        <Directory Id="TARGETDIR" Name="SourceDir">
    38             <Directory Id="MergeRedirectFolder" FileSource=".">
     38            <Directory Id="msm_VBoxUSBFolder" FileSource=".">
    3939
    4040                <?include VBoxMergeUSB.wxi ?>
    4141
    42             </Directory> <!-- MergeRedirectFolder -->
     42            </Directory> <!-- msm_VBoxUSBFolder -->
    4343        </Directory> <!-- TARGETDIR -->
    4444

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

    r51144 r51225  
    196196    <?endif ?>
    197197<?else ?>
    198                 <?include VBoxMergeApp.wxi ?>
     198                <Directory Id="msm_VBoxApplicationFolder" FileSource=".">
     199                    <?include VBoxMergeApp.wxi ?>
    199200    <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
    200                 <?include VBoxMergeCOM32On64.wxi ?>
     201                    <?include VBoxMergeCOM32On64.wxi ?>
     202                </Directory>
    201203    <?endif ?>
    202204<?endif ?>
    … …  
    206208                        <Merge Id="msm_VBoxUSB" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeUSB)" DiskId="1" />
    207209<?else ?>
    208                         <?include VBoxMergeUSB.wxi ?>
     210                        <Directory Id="msm_VBoxUSBFolder" FileSource=".">
     211                            <?include VBoxMergeUSB.wxi ?>
     212                        </Directory>
    209213<?endif ?>
    210214                    </Directory>
    … …  
    215219                            <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1" />
    216220    <?else ?>
    217                             <?include VBoxMergeNetFlt.wxi ?>
     221                            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
     222                                <?include VBoxMergeNetFlt.wxi ?>
     223                            </Directory>
    218224    <?endif ?>
    219225                        </Directory>
    … …  
    223229                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1" />
    224230<?else ?>
    225                             <?include VBoxMergeNetAdp.wxi ?>
     231                            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
     232                                <?include VBoxMergeNetAdp.wxi ?>
     233                            </Directory>
    226234<?endif ?>
    227235                        </Directory>
    … …  
    234242                        <Merge Id="msm_VBoxPython" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergePython)" DiskId="1" />
    235243    <?else ?>
    236                         <?include VBoxMergePython.wxi ?>
     244                        <Directory Id="msm_VBoxPythonFolder" FileSource=".">
     245                            <?include VBoxMergePython.wxi ?>
     246                        </Directory>
    237247    <?endif ?>
    238248                    </Directory>
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