Changeset 51127 in vbox for trunk/src/VBox/Installer
- Timestamp:
- Apr 23, 2014 3:22:43 PM (11 years ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 7 edited
- 6 copied
-
Makefile.kmk (modified) (3 diffs)
-
Properties.wxi (modified) (1 diff)
-
VBoxMergeApp.wxi (modified) (9 diffs)
-
VBoxMergeAppCA.wxi (modified) (1 diff)
-
VBoxMergeCOM32On64.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi ) (1 diff)
-
VBoxMergeCOM32On64.wxs (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeUSB.wxs ) (2 diffs)
-
VBoxMergeCOM32On64CA.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi ) (1 diff)
-
VBoxMergeCOM32On64Seq.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi ) (1 diff)
-
VBoxMergeNetFltSeq.wxi (modified) (1 diff)
-
VBoxMergePython.wxi (modified) (1 diff)
-
VBoxMergeUSBCA.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi ) (1 diff)
-
VBoxMergeUSBSeq.wxi (copied) (copied from trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi ) (1 diff)
-
VirtualBox.wxs (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/Makefile.kmk
r51119 r51127 68 68 # 69 69 VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt Python 70 ifeq ($(KBUILD_TARGET_ARCH),amd64) 71 VBOX_INSTALLER_MERGE_MODULES += COM32On64 72 endif 73 70 74 # We only ship the merge modules in locale en_US for the moment. 71 75 VBOX_INSTALLER_MERGE_LANGUAGES = $(VBOX_INSTALLER_LANGUAGES) … … 189 193 190 194 # 191 # Su rpress/skip the following ICE (internal consistency evaluators):195 # Suppress/skip the following ICE (Internal Consistency Evaluators): 192 196 # - ICE64: Checks that new directories in the user profile are removed correctly in roaming scenarios. 193 197 # -> We don't want to remove system folders (like "Microsoft/Internet Explorer/Quick Launch"). 198 # - ICE69: Checks if file references are within the same component. 199 # -> We reference to files within different components, but these components are installed using 200 # the same feature, so that's fine. 194 201 # 195 202 VBOX_MSI_ICE_IGNORE := \ 196 -ice:64 203 -ice:64 \ 204 -ice:69 197 205 198 206 # … … 579 587 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj: \ 580 588 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \ 589 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxi \ 590 $(PATH_SUB_CURRENT)/VBoxMerge$(module)CA.wxi \ 591 $(PATH_SUB_CURRENT)/VBoxMerge$(module)Seq.wxi \ 581 592 $(PATH_SUB_CURRENT)/UserInterface.wxi \ 582 593 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \ -
trunk/src/VBox/Installer/win/Properties.wxi
r51023 r51127 35 35 <?endif ?> 36 36 37 38 39 40 37 <?else ?> 38 <?define Property_ProgramFiles = "ProgramFilesFolder" ?> 39 <?define Property_Platform = "x86" ?> 40 <?define Property_Win64 = "no" ?> 41 41 42 42 <?if $(env.VBOX_SIGNING_MODE) != none ?> 43 <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->43 <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) --> 44 44 <?define Property_DriverLegacy = "yes" ?> 45 45 <?else ?> -
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r51063 r51127 20 20 <!-- The documentation is a separate component. This allows to split the install process 21 21 into pieces if ever necessary. Maintenance is easier, too. The following component 22 will be installed in the "doc" folder .-->22 will be installed in the "doc" folder --> 23 23 <Component Id="cp_Docs" Guid="40BD12C5-89A8-4B81-8A5E-5EEE2C2763C4"> 24 24 <?include $(env.PATH_TARGET)\Files_Doc.wxi ?> … … 54 54 <?endif ?> 55 55 56 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>57 <Directory Id="dir_VBoxAppX86" Name="x86">58 <!-- The 32-bit client COM component (see also cp_MainCom below). -->59 <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">60 <!-- Note: This file ID *must not* be changed because of our typelib template generation file! -->61 <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"62 Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes"63 DiskId="$(var.Property_DiskIdCommon)">64 </File>65 <File Id="file_VBoxRT_x86" Name="VBoxRT-x86.dll"66 Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll"67 DiskId="$(var.Property_DiskIdCommon)">68 </File>69 <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>70 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>71 <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->72 <File Id="file_msvcr100_x86" Name="msvcr100.dll"73 Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"74 DiskId="$(var.Property_DiskIdCommon)" />75 <File Id="file_msvcp100_x86" Name="msvcp100.dll"76 Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"77 DiskId="$(var.Property_DiskIdCommon)" />78 <?endif?>79 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>80 <!-- MS C/C++ v11.0 Runtime DLL files. -->81 <File Id="file_msvcr110_x86" Name="msvcr110.dll"82 Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"83 DiskId="$(var.Property_DiskIdCommon)" />84 <File Id="file_msvcp110_x86" Name="msvcp110.dll"85 Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"86 DiskId="$(var.Property_DiskIdCommon)" />87 <?endif?>88 </Component>89 </Directory>90 <?endif?>91 92 56 <!-- COM components have a separate entry mainly because of the KeyPath attribute (that hints the 93 TypeLib element where to take the TLB resource from) may appear only once per Component.-->57 TypeLib element where to take the TLB resource from) may appear only once per component --> 94 58 <Component Id="cp_MainCOM" Guid="CD4A3C6C-C2D5-428D-90A1-B6DA3D0777D6" Win64="$(var.Property_Win64)"> 95 59 … … 125 89 126 90 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?> 127 <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)"> 91 <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" 92 Win64="$(var.Property_Win64)" KeyPath="yes"> 128 93 <Condition>VBOX_REGISTERFILEEXTENSIONS</Condition> 129 <!-- Register file extensions. Note: Extension I d's *must not* be changed! These specify the actual94 <!-- Register file extensions. Note: Extension IDs *must not* be changed! These specify the actual 130 95 file extension to handle. Also, here would be the place to add more fancy DDE stuff later. 131 Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h" .-->96 Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h" --> 132 97 <ProgId Id="progId_VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="file_VBoxRes.dll" IconIndex="-201"> 133 98 <Extension Id="vbox" ContentType="application/x-virtualbox-vbox"> … … 162 127 <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" /> 163 128 </ProgId> 164 </Component> <!-- RegisterExtensions -->129 </Component> <!-- cp_RegisterExtensions --> 165 130 <?endif ?> 166 131 167 132 <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional 168 binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated .-->133 binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated --> 169 134 <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)"> 170 135 171 <!-- Set required environment variables .-->136 <!-- Set required environment variables --> 172 137 <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_MSI_INSTALL_PATH" 173 138 System="yes" Part="last" Permanent="no" Value="[MergeRedirectFolder]" /> … … 175 140 <!-- Files --> 176 141 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?> 177 <!-- Include all user manual .CHM files (file is generated by makefile) .-->142 <!-- Include all user manual .CHM files (file is generated by makefile) --> 178 143 <?include $(env.PATH_TARGET)\Files_Main.wxi ?> 179 144 <?endif ?> 180 <!-- Include all license files (file is generated by makefile) .-->145 <!-- Include all license files (file is generated by makefile) --> 181 146 <?include $(env.PATH_TARGET)\Files_License.wxi ?> 182 147 … … 291 256 292 257 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?> 293 <!-- MS C/C++ v10.0 Runtime DLL files .-->258 <!-- MS C/C++ v10.0 Runtime DLL files --> 294 259 <File Id="file_msvcr100.dll" Name="msvcr100.dll" 295 260 Source="$(env.PATH_OUT)\bin\msvcr100.dll" /> … … 298 263 <?endif?> 299 264 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?> 300 <!-- MS C/C++ v11.0 Runtime DLL files .-->265 <!-- MS C/C++ v11.0 Runtime DLL files --> 301 266 <File Id="file_msvcr110.dll" Name="msvcr110.dll" 302 267 Source="$(env.PATH_OUT)\bin\msvcr110.dll" /> … … 351 316 <?endif?> 352 317 <!-- SDL plugins --> 353 <Component Id="cp_VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4" Win64="$(var.Property_Win64)"> 318 <Component Id="cp_VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4" 319 Win64="$(var.Property_Win64)"> 354 320 <File Id="file_VBoxSDL.exe" Name="VBoxSDL.exe" 355 321 Source="$(env.PATH_OUT)\bin\VBoxSDL.exe" /> … … 370 336 <?endif?> 371 337 <!-- C API (glue) bindings --> 372 <Component Id="cp_VBoxCAPI" Guid="097F7F53-7111-467F-8E0C-257D9926FDA0"> 338 <Component Id="cp_VBoxCAPI" Guid="097F7F53-7111-467F-8E0C-257D9926FDA0" 339 Win64="$(var.Property_Win64)"> 373 340 <File Id="file_VBoxCAPI.dll" Name="VBoxCAPI.dll" 374 341 Source="$(env.PATH_OUT)\bin\VBoxCAPI.dll" /> -
trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi
r51043 r51127 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 20 06-2014 Oracle Corporation5 Copyright (C) 2014 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi
r51120 r51127 17 17 xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension"> 18 18 19 <Directory Id="dir_VBoxUSBFilter" Name="filter"> 20 <Component Id="cp_USBFilterDriver" Guid="B7D782D2-96DF-4775-A0E1-A76CF7B04B65" Win64="$(var.Property_Win64)"> 21 <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes" 22 Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/> 23 <File Id="file_VBoxUSBMon.sys" Name="VBoxUSBMon.sys" 24 Source="$(env.PATH_OUT)\bin\VBoxUSBMon.sys" /> 25 <File Id="file_VBoxUSBMon.inf" Name="VBoxUSBMon.inf" 26 Source="$(env.PATH_OUT)\bin\VBoxUSBMon.inf" /> 27 <?if $(env.VBOX_SIGNING_MODE) != none ?> 28 <File Id="file_VBoxUSBMon.cat" Name="VBoxUSBMon.cat" 29 Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" /> 30 <?endif ?> 19 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 20 <Directory Id="dir_VBoxCOM32On64X86" Name="x86"> 21 <!-- The 32-bit client COM component (see also cp_MainCom below) --> 22 <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no"> 23 <!-- Note: This file ID *must not* be changed because of our typelib template generation file! --> 24 <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll" 25 Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes" 26 DiskId="$(var.Property_DiskIdCommon)"> 27 </File> 28 <File Id="file_VBoxRT_x86" Name="VBoxRT-x86.dll" 29 Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll" 30 DiskId="$(var.Property_DiskIdCommon)"> 31 </File> 32 <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?> 33 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?> 34 <!-- MS C/C++ v10.0 32 bit Runtime DLL files --> 35 <File Id="file_msvcr100_x86" Name="msvcr100.dll" 36 Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" 37 DiskId="$(var.Property_DiskIdCommon)" /> 38 <File Id="file_msvcp100_x86" Name="msvcp100.dll" 39 Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" 40 DiskId="$(var.Property_DiskIdCommon)" /> 41 <?endif?> 42 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?> 43 <!-- MS C/C++ v11.0 Runtime DLL files --> 44 <File Id="file_msvcr110_x86" Name="msvcr110.dll" 45 Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" 46 DiskId="$(var.Property_DiskIdCommon)" /> 47 <File Id="file_msvcp110_x86" Name="msvcp110.dll" 48 Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" 49 DiskId="$(var.Property_DiskIdCommon)" /> 50 <?endif?> 31 51 </Component> 32 52 </Directory> 33 34 <Directory Id="dir_VBoxUSBDevice" Name="device"> 35 <Component Id="cp_USBDeviceDriver" Guid="010FE46A-E358-43E2-8BDC-38BC8BEC82E0" Win64="$(var.Property_Win64)"> 36 <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes" 37 Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/> 38 <File Id="file_VBoxUSB.sys" Name="VBoxUSB.sys" 39 Source="$(env.PATH_OUT)\bin\VBoxUSB.sys" /> 40 <File Id="file_VBoxUSB.inf" Name="VBoxUSB.inf" 41 Source="$(env.PATH_OUT)\bin\VBoxUSB.inf" /> 42 <?if $(env.VBOX_SIGNING_MODE) != none ?> 43 <File Id="file_VBoxUSB.cat" Name="VBoxUSB.cat" 44 Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" /> 45 <?endif ?> 46 </Component> 47 </Directory> 53 <?endif?> 48 54 49 55 </Include> -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
r51120 r51127 19 19 xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension"> 20 20 21 <Module Id="msm_VBox USB"21 <Module Id="msm_VBoxCOM32On64" 22 22 Language="!(loc.LANG)" 23 23 Version="$(var.Property_Version)"> 24 24 25 <Package Id=" b8f1b6f4-2e92-40a6-b819-782e523b20ab"25 <Package Id="606c7efe-3f49-43a4-a4e4-d98688460647" 26 26 Keywords="Installer, Setup" 27 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) USB driversinstallation package"28 Comments="$(env.VBOX_PRODUCT) USB driversinstallation package"27 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) COM32On64 installation package" 28 Comments="$(env.VBOX_PRODUCT) COM32On64 installation package" 29 29 Manufacturer="$(env.VBOX_VENDOR)" 30 30 InstallerVersion="200" … … 38 38 <Directory Id="MergeRedirectFolder" FileSource="."> 39 39 40 <?include VBoxMerge USB.wxi ?>40 <?include VBoxMergeCOM32On64.wxi ?> 41 41 42 42 </Directory> <!-- MergeRedirectFolder --> -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi
r51120 r51127 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 20 06-2014 Oracle Corporation5 Copyright (C) 2014 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi
r51120 r51127 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 20 06-2014 Oracle Corporation5 Copyright (C) 2014 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi
r51120 r51127 21 21 <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom> 22 22 <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom> 23 <Custom Action="ca_InstallNetFlt" After="ca_UninstallNetFlt" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom>23 <Custom Action="ca_InstallNetFlt" Before="InstallFinalize" ><![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]></Custom> 24 24 25 25 <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]></Custom> -
trunk/src/VBox/Installer/win/VBoxMergePython.wxi
r51023 r51127 34 34 </Directory> 35 35 <?endif?> 36 <Component Id="cp_VBoxPythonBinding" Guid="293D7E11-78DA-4C31-AEED-AE2FE42F6881"> 36 <Component Id="cp_VBoxPythonBinding" KeyPath="yes" 37 Guid="293D7E11-78DA-4C31-AEED-AE2FE42F6881" Win64="$(var.Property_Win64)"> 37 38 <Condition>VBOX_PYTHON_IS_INSTALLED</Condition> 38 39 </Component> -
trunk/src/VBox/Installer/win/VBoxMergeUSBCA.wxi
r51120 r51127 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 20 06-2014 Oracle Corporation5 Copyright (C) 2014 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/Installer/win/VBoxMergeUSBSeq.wxi
r51120 r51127 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 20 06-2014 Oracle Corporation5 Copyright (C) 2014 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r51097 r51127 22 22 <!-- The merge module file names --> 23 23 <?define Property_VBoxMergeApp = "$(env.VBOX_WIN_INST_MERGE_APP)" ?> 24 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 25 <?define Property_VBoxMergeCOM32On64 = "$(env.VBOX_WIN_INST_MERGE_COM32ON64)" ?> 26 <?endif ?> 24 27 <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?> 25 26 28 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 27 29 <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?> 28 30 <?endif ?> 29 30 31 <?define Property_VBoxMergeNetworkAdp = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?> 31 32 32 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?> 33 33 <?define Property_VBoxMergePython = "$(env.VBOX_WIN_INST_MERGE_PYTHON)" ?> … … 174 174 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?> 175 175 <?include VBoxMergeAppCA.wxi ?> 176 <?include VBoxMergeNetFltCA.wxi ?> 177 <?include VBoxMergePythonCA.wxi ?> 176 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 177 <?include VBoxMergeCOM32On64CA.wxi ?> 178 <?endif ?> 179 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 180 <?include VBoxMergeNetFltCA.wxi ?> 181 <?endif ?> 182 <?include VBoxMergeNetAdpCA.wxi ?> 183 <?include VBoxMergeUSBCA.wxi ?> 184 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?> 185 <?include VBoxMergePythonCA.wxi ?> 186 <?endif ?> 178 187 <?endif ?> 179 188 … … 183 192 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 184 193 <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1" /> 194 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 195 <Merge Id="msm_VBoxCOM32On64" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeCOM32On64)" DiskId="1" /> 196 <?endif ?> 185 197 <?else ?> 186 198 <?include VBoxMergeApp.wxi ?> 199 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 200 <?include VBoxMergeCOM32On64.wxi ?> 201 <?endif ?> 187 202 <?endif ?> 188 203 <Directory Id="dir_Drivers" Name="drivers"> … … 287 302 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 288 303 <MergeRef Id="msm_VBoxApp" /> 304 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?> 305 <MergeRef Id="msm_VBoxCOM32On64" /> 306 <?endif ?> 289 307 <?else ?> 290 308 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?> … … 433 451 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?> 434 452 <?include VBoxMergeAppSeq.wxi ?> 435 <?include VBoxMergeNetFltSeq.wxi ?> 436 <?include VBoxMergePythonSeq.wxi ?> 453 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 454 <?include VBoxMergeNetFltSeq.wxi ?> 455 <?endif ?> 456 <?include VBoxMergeNetAdpSeq.wxi ?> 457 <?include VBoxMergeUSBSeq.wxi ?> 458 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?> 459 <?include VBoxMergePythonSeq.wxi ?> 460 <?endif ?> 437 461 <?endif ?> 438 462
Note:
See TracChangeset
for help on using the changeset viewer.
