VirtualBox

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


Ignore:
Timestamp:
Nov 15, 2024 12:46:54 AM (2 months ago)
Author:
vboxsync
Message:

Installer/win/Makefile.kmk: Is the MSI CPU name case sensitive? Try 'Arm64'. Reduced the the wixlib rules to just the one we need (lang=en_US). jiraref:VBP-1442

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r107007 r107008  
    719719# For combined packages we always use the .ISO from the amd64 build.
    720720#
     721## @todo these are applied to the wrong step at the moment...
    721722ifdef VBOX_WITH_COMBINED_PACKAGE
    722723 VBOX_MSI_DEPENDENCIES := \
    … …  
    727728endif
    728729
    729 #
    730 # A few manual dependencies to make sure everything is rebuilt when they should.
    731 #
    732 VBOX_VIRTUALBOX_WXS_DEPENDENCIES := \
    733         $(PATH_SUB_CURRENT)/CommonProperties.wxi \
    734         $(PATH_SUB_CURRENT)/Defines.wxi \
    735         $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi \
    736         $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
    737         $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \
    738         $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
    739         $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
    740         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
    741         $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
    742         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
    743         $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi
    744730
    745731#
    … …  
    747733# We've separated the final building from the WIX library building for repacking reasons.
    748734#
    749 ## @todo Proper dependencies: unzip -p VirtualBox_$(lang).wixlib | sed -e "s/\([,{]\)/\1\n/g" bar.json | sed -n -e "s/,$//" -e "s/]}$//" -e "s/}}$//" -e 's/"file"://p' -e 's/"path"://p' | sort |uniq
    750 define def_vbox_build_wixlib
    751  includedep $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixlib.dep
    752  $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib \
    753  $(if-expr "$(lang)" != "en_US",, \
    754         + $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wixlib $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files ): \
     735## @todo Proper dependencies: unzip -p VirtualBox_en_US.wixlib | sed -e "s/\([,{]\)/\1\n/g" bar.json | sed -n -e "s/,$//" -e "s/]}$//" -e "s/}}$//" -e 's/"file"://p' -e 's/"path"://p' | sort |uniq
     736$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_en_US.wixlib)
     737$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_en_US.wixlib \
     738+ $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_en_US.wixlib \
     739+ $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_en_US.files: \
    755740                $(PATH_SUB_CURRENT)/VirtualBox.wxs \
    756741                $(PATH_SUB_CURRENT)/UserInterface.wxi \
    757                 $(VBOX_VIRTUALBOX_WXS_DEPENDENCIES) \
     742                $(PATH_SUB_CURRENT)/CommonProperties.wxi \
     743                $(PATH_SUB_CURRENT)/Defines.wxi \
     744                $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi \
     745                $(PATH_SUB_CURRENT)/VBoxMergeAppCA.wxi \
     746                $(PATH_SUB_CURRENT)/VBoxMergeAppSeq.wxi \
     747                $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
     748                $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \
     749                $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
     750                $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
     751                $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
     752                $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
     753                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
     754                $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
    758755                $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
    759756                        $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
    760                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm) \
     757                                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_en_US_$(KBUILD_TARGET_ARCH).msm) \
    761758                        , \
    762759                        $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
    … …  
    770767                        $(VBOX_MSI_DEPENDENCIES)) \
    771768                $(VBOX_VERSION_STAMP) \
    772                 | $$$$(dir $$$$@) $(if-expr "$(lang)" != "en_US",, \
    773                         $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )
    774         $(QUIET)$(RM) -f -- "$$@"  "$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wixlib"
     769                | $$(dir $$@) \
     770                $(VBOX_WIN_INST_REPACK_DIR)/ \
     771                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_en_US/
     772        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
     773        $(QUIET)$(RM) -f -- "$@"  "$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_en_US.wixlib" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_en_US.wixlib"
    775774        $(REDIRECT) \
    776775                $(VBOX_WIN_INST_ENV) \
    777776                -- \
    778                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
    779                         -defaultcompressionlevel $(if-expr "$(lang)" == "en_US",high,none) \
    780                         -intermediatefolder $$(@D)/wix-temp/ \
     777                $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$<) \
     778                        -defaultcompressionlevel high \
     779                        -intermediatefolder $(@D)/wix-temp/ \
    781780                        $(VBOX_TOOLS_WIN_WIX_EXT) \
    782781                        -outputtype library \
    783                         -out $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib
    784  ifeq ($(lang),en_US)
    785   # Copy over the .wixlib into the repack directory, so that it can be used later when
    786   # doing the repacking via the shell scripts.
    787         $(CP) $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib $(VBOX_WIN_INST_REPACK_DIR)/
    788  endif
    789         $(RM) -Rf -- $$(@D)/wix-temp/
    790 
    791  $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))
    792 endef
    793 
    794 ## @todo We generate rules for all the languages here, but only the en_US one is actually used.
    795 ## This used to mess up the compression optimizations, since the compression level used to be
    796 ## part of the Media tag in the VirtualBox_en_US.wixlib file. Omitting it and using the command
    797 ## line option -defaultcompressionlevel for controlling it works around this.
    798 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES),\
    799         $(eval $(def_vbox_build_wixlib)))
     782                        -out $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_en_US.wixlib
     783# Copy over the .wixlib into the repack directory, so that it can be used later when
     784# doing the repacking via the shell scripts.
     785        $(CP) $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_en_US.wixlib $(VBOX_WIN_INST_REPACK_DIR)/
     786        $(RM) -Rf -- $(@D)/wix-temp/
     787
     788## @todo r=bird: what is this supposed to be doing these days? OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_en_US)
     789
    800790
    801791#
    … …  
    1002992# Create WISUMINFO argument.
    1003993VBOX_INS_PROD_ARCH.amd64 = x64
    1004 VBOX_INS_PROD_ARCH.arm64 = arm64
     994VBOX_INS_PROD_ARCH.arm64 = Arm64
    1005995VBOX_INS_PROD_ARCH.x86   = Intel
    1006996VBOX_INS_PROD_ARCH := $(VBOX_INS_PROD_ARCH.$(KBUILD_TARGET_ARCH))
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