VirtualBox

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


Ignore:
Timestamp:
Apr 9, 2014 12:03:42 PM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
93210
Message:

Windows host installer: Use the common.cab for merge modules as well; added a few more files to common.cab for further reducing the overall packet size.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/NLS/de_DE.wxl

    r51009 r51011  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2012 Oracle Corporation
     7            Copyright (C) 2011-2014 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as

  • trunk/src/VBox/Installer/win/NLS/en_US.wxl

    r51009 r51011  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2012 Oracle Corporation
     7            Copyright (C) 2011-2014 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as

  • trunk/src/VBox/Installer/win/NLS/fa_IR.wxl

    r51009 r51011  
    11<?xml version="1.0" encoding="utf-8"?>
    22<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1256" Culture="fa">
     3
    34    <!--
    45            Language Definition Include for VirtualBox WiX script.
    5             Copyright (C) 2011-2012 Oracle Corporation
     6
     7            Copyright (C) 2011-2014 Oracle Corporation
     8
    69            This file is part of VirtualBox Open Source Edition (OSE), as
    710            available from http://www.virtualbox.org. This file is free software;
    … …  
    1215            hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1316    -->
     17
    1418    <String Id="LANG">1065</String>
    1519    <String Id="LangName">Farsi</String>
     20
    1621    <String Id="ButtonText_No">&amp;خير</String>
    1722    <String Id="ButtonText_Yes">&amp;بله</String>

  • trunk/src/VBox/Installer/win/NLS/fr_FR.wxl

    r51009 r51011  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2010-2012 Oracle Corporation
     7            Copyright (C) 2011-2014 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as

  • trunk/src/VBox/Installer/win/NLS/it_IT.wxl

    r51009 r51011  
    11<?xml version="1.0" encoding="utf-8"?>
    22<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252" Culture="en_US">
     3
    34    <!--
    45            Language Definition Include for VirtualBox WiX script.
    5             Copyright (C) 2011-2012 Oracle Corporation
     6
     7            Copyright (C) 2011-2014 Oracle Corporation
     8
    69            This file is part of VirtualBox Open Source Edition (OSE), as
    710            available from http://www.virtualbox.org. This file is free software;
    … …  
    1215            hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1316    -->
     17
    1418    <String Id="LANG">1040</String>
    1519    <String Id="LangName">Italiano</String>
     20
    1621    <String Id="ButtonText_No">&amp;No</String>
    1722    <String Id="ButtonText_Yes">&amp;Sì</String>

  • trunk/src/VBox/Installer/win/NLS/tr_TR.wxl

    r51009 r51011  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2012 Oracle Corporation
     7            Copyright (C) 2011-2014 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as

  • trunk/src/VBox/Installer/win/NLS/zh_TW.wxl

    r51009 r51011  
    22<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="65001" Culture="zh_TW">
    33
    4   <!--
    5           Language Definition Include for VirtualBox WiX script.
    6 
    7           Copyright (C) 2011-2012 Oracle Corporation
    8 
    9           This file is part of VirtualBox Open Source Edition (OSE), as
     4    <!--
     5            Language Definition Include for VirtualBox WiX script.
     6
     7            Copyright (C) 2011-2014 Oracle Corporation
     8
     9            This file is part of VirtualBox Open Source Edition (OSE), as
    1010            available from http://www.virtualbox.org. This file is free software;
    1111            you can redistribute it and/or modify it under the terms of the GNU

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

    r51009 r51011  
    2828      <?define Property_Win64        = "yes" ?>
    2929
    30   <?if $(env.VBOX_SIGNING_MODE) != none ?>
    31       <?define Property_DriverLegacy = "no" ?>
    32   <?else ?>
    33       <?define Property_DriverLegacy = "yes" ?>
    34   <?endif ?>
     30      <?if $(env.VBOX_SIGNING_MODE) != none ?>
     31          <?define Property_DriverLegacy = "no" ?>
     32      <?else ?>
     33          <?define Property_DriverLegacy = "yes" ?>
     34      <?endif ?>
    3535
    36   <?else ?>
    37       <?define Property_ProgramFiles = "ProgramFilesFolder" ?>
    38       <?define Property_Platform     = "x86" ?>
    39       <?define Property_Win64        = "no" ?>
     36      <?else ?>
     37          <?define Property_ProgramFiles = "ProgramFilesFolder" ?>
     38          <?define Property_Platform     = "x86" ?>
     39          <?define Property_Win64        = "no" ?>
    4040
    41   <?if $(env.VBOX_SIGNING_MODE) != none ?>
    42      <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->
    43       <?define Property_DriverLegacy = "yes" ?>
    44   <?else ?>
    45       <?define Property_DriverLegacy = "yes" ?>
    46   <?endif ?>
     41      <?if $(env.VBOX_SIGNING_MODE) != none ?>
     42         <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->
     43          <?define Property_DriverLegacy = "yes" ?>
     44      <?else ?>
     45          <?define Property_DriverLegacy = "yes" ?>
     46      <?endif ?>
    4747
    4848  <?endif ?>

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

    r51009 r51011  
    9797                    <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
    9898                        <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
    99                             Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes">
     99                            Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes"
     100                            DiskId="$(var.Property_DiskIdCommon)">
    100101                        </File>
    101102                        <File Id="VBoxRT_x86" Name="VBoxRT-x86.dll"
    102                             Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll">
     103                            Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll"
     104                            DiskId="$(var.Property_DiskIdCommon)">
    103105                        </File>
    104106                        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
    … …  
    106108                        <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->
    107109                        <File Id="file_msvcr100.dll_x86" Name="msvcr100.dll"
    108                               Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" />
     110                              Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"
     111                              DiskId="$(var.Property_DiskIdCommon)" />
    109112                        <File Id="file_msvcp100.dll_x86" Name="msvcp100.dll"
    110                               Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" />
     113                              Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"
     114                              DiskId="$(var.Property_DiskIdCommon)" />
    111115<?endif?>
    112116<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
    113117                        <!-- MS C/C++ v11.0 Runtime DLL files. -->
    114118                        <File Id="file_msvcr110.dll_x86" Name="msvcr110.dll"
    115                               Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" />
     119                              Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"
     120                              DiskId="$(var.Property_DiskIdCommon)" />
    116121                        <File Id="file_msvcp110.dll_x86" Name="msvcp110.dll"
    117                               Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" />
     122                              Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
     123                              DiskId="$(var.Property_DiskIdCommon)" />
    118124<?endif?>
    119125                    </Component>
    … …  
    342348<?if $(env.VBOX_WITH_ADDITIONS_PACKING) = "yes" ?>
    343349<?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
    344                     <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso" DiskId="$(var.Property_DiskIdCommon)"
    345                           Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso" />
     350                    <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso"
     351                          Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso"
     352                          DiskId="$(var.Property_DiskIdCommon)" />
    346353<?else ?>
    347354                    <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso"

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

    r51009 r51011  
    4646                                <File Id="file_VBoxNetAdp.inf" Name="VBoxNetAdp.inf"
    4747                                      Source="$(env.PATH_OUT)\bin\VBoxNetAdp.inf" />
    48                 <?if $(env.VBOX_SIGNING_MODE) != none ?>
     48<?if $(env.VBOX_SIGNING_MODE) != none ?>
    4949                                <File Id="file_VBoxNetAdp.cat" Name="VBoxNetAdp.cat"
    5050                                      Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
    51                 <?endif ?>
     51<?endif ?>
    5252                            </Component>
    5353                        </Directory>

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

    r51009 r51011  
    4646                <!-- Python bindings -->
    4747                <Component Id="cp_VBoxPyInst" Guid="C9A40306-5102-11DE-A7BA-C3C555D89593" Win64="$(var.Property_Win64)">
    48                      <File Id="file_vboxapisetup.py" Name="vboxapisetup.py" DiskId="$(var.Property_DiskIdCommon)"
    49                            Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapisetup.py" />
     48                     <File Id="file_vboxapisetup.py" Name="vboxapisetup.py"
     49                           Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapisetup.py"
     50                           DiskId="$(var.Property_DiskIdCommon)" />
    5051                </Component>
    5152                <Directory Id="dir_SDKVBoxAPI" Name="vboxapi">
    5253                    <Component Id="cp_VBoxPyMod" Guid="DF19CB76-5102-11DE-943B-13C755D89593" Win64="$(var.Property_Win64)">
    53                         <File Id="file___init__.py" Name="__init__.py" DiskId="$(var.Property_DiskIdCommon)"
    54                               Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\__init__.py" />
    55                         <File Id="file_VirtualBox_constants.py" Name="VirtualBox_constants.py" DiskId="$(var.Property_DiskIdCommon)"
    56                               Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\VirtualBox_constants.py" />
     54                        <File Id="file___init__.py" Name="__init__.py"
     55                              Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\__init__.py"
     56                              DiskId="$(var.Property_DiskIdCommon)" />
     57                        <File Id="file_VirtualBox_constants.py" Name="VirtualBox_constants.py"
     58                              Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\VirtualBox_constants.py"
     59                              DiskId="$(var.Property_DiskIdCommon)" />
    5760                    </Component>
    5861                </Directory>

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

    r51009 r51011  
    9494    </Condition>
    9595
    96     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" DiskPrompt="Installation Media" />
    97     <Property Id="DiskPrompt" Value="Oracle VM VirtualBox Installation" />
    98 <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
    99         <Media Id="2" Cabinet="common.cab" EmbedCab="no" CompressionLevel="high" />
    100 <?endif ?>
    101 
    10296    <!-- *************************** Upgrade packages only ******************************* -->
    10397    <!-- Minimum and Maximum specify the range of versions we are supposed to update with this upgrade.
    … …  
    122116    <Icon Id="IconVirtualBox" SourceFile="$(env.VBOX_WINDOWS_ICON_FILE)" />
    123117
     118    <!-- The media/binary IDs -->
     119    <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
     120<?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
     121        <Media Id="2" Cabinet="common.cab" EmbedCab="no" CompressionLevel="high" />
     122<?endif ?>
    124123    <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    125124
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