Changeset 81184 in vbox for trunk/src/VBox/Installer/win
- Timestamp:
- Oct 9, 2019 1:29:43 PM (5 years ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/Makefile.kmk
r81159 r81184 433 433 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 434 434 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 435 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 435 436 $(if-expr defined(VBOX_WITH_MSI_HACK),-ext $(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \ 436 437 $(VBOX_MSI_ICE_IGNORE) \ … … 453 454 ' -ext $(VBOX_PATH_WIX)/WixUIExtension.dll ^' \ 454 455 ' -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \ 456 ' -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll ^' \ 455 457 $(if-expr defined(VBOX_WITH_MSI_HACK),'-ext $(MsiHack_0_OUTDIR)/MsiHackExtension.dll ^',) \ 456 458 ' $(VBOX_MSI_ICE_IGNORE) ^' \ … … 490 492 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \ 491 493 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 494 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 492 495 $(VBOX_MSI_ICE_IGNORE) \ 493 496 -out $$@ \ … … 504 507 ' -loc files-VirtualBox_$(lang)/License_$(lang).wxl ^' \ 505 508 ' -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \ 509 ' -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll ^' \ 506 510 ' $(VBOX_MSI_ICE_IGNORE) ^' \ 507 511 ' -out $$(@F) ^' \ … … 640 644 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 641 645 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 646 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 642 647 -p$(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix 643 648 $(VBOX_PATH_WIX)/candle.exe $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \ 644 649 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 645 650 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 651 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 646 652 -out $$@ 647 653 ifeq ($(lang),en_US) … … 679 685 ' -ext $(VBOX_PATH_WIX)/WixUIExtension.dll ^' \ 680 686 ' -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \ 687 ' -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll ^' \ 681 688 ' -out $$(@F) || exit /b1' \ 682 689 ) \ … … 784 791 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 785 792 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 793 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 786 794 -p$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix 787 795 $(VBOX_PATH_WIX)/candle.exe $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix \ 788 796 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 789 797 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 798 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 790 799 -out $$@ 791 800 ifeq ($(lang),en_US) … … 823 832 ' -ext $(VBOX_PATH_WIX)/WixUIExtension.dll ^'\ 824 833 ' -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \ 834 ' -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll ^' \ 825 835 ' -out $$(@F) || exit /b1' \ 826 836 ) \ … … 936 946 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \ 937 947 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \ 948 -ext $(VBOX_PATH_WIX)/WixUtilExtension.dll \ 938 949 $(if-expr defined(VBOX_WITH_MSI_HACK),-ext $(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \ 939 950 $(VBOX_MSI_ICE_IGNORE) \ -
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r81159 r81184 2 2 VirtualBox Windows Installation Script (WiX) 3 3 4 Copyright (C) 2006-201 6Oracle Corporation4 Copyright (C) 2006-2019 Oracle Corporation 5 5 6 6 This file is part of VirtualBox Open Source Edition (OSE), as … … 21 21 <?define VBOX_QT_INFIX="" ?> 22 22 <?endif?> 23 24 <Component Id="cp_Permissions" Guid="9F6E9729-6490-4FBB-9EA1-03234E68907A" Win64="$(var.Property_Win64)" > 25 <?include Permissions.wxi ?> 26 </Component> 23 27 24 28 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?> -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r80360 r81184 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 2014-201 6Oracle Corporation5 Copyright (C) 2014-2019 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as … … 15 15 16 16 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 17 xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension"> 17 xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension" 18 xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> 18 19 19 20 <?include Defines.wxi ?> … … 76 77 <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both" Value="{}"> 77 78 <![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]> 78 </SetProperty> 79 79 </SetProperty> 80 80 81 81 <!-- Install the product for all users on the system --> … … 417 417 <?endif ?> 418 418 <?else ?> 419 <!-- Make sure to reference the permissions component, which takes care of setting 420 the required ACLs for our files / folders. --> 421 <ComponentRef Id="cp_Permissions" /> 419 422 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?> 420 423 <ComponentRef Id="cp_RegisterExtensions" />
Note:
See TracChangeset
for help on using the changeset viewer.