Changeset 107016 in vbox

Timestamp:

Nov 15, 2024 1:25:36 PM (2 months ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Use 'wix msi transform' to create the language transformation files instaed of MsiTran.exe from the SDK. jiraref:VBP-1442

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (5 diffs)

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

@@ -967 +967 @@
 # We also don't need waste time to compress anything here.
 #
+# See also https://github.com/wixtoolset/issues/issues/7544 which requests a
+# simpler way of doing this.
+#
 define def_vbox_create_mst
  $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \
@@ -979 +982 @@
                 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \
                 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/
+        $(RM) -f -- "$$@"
         $(call MSG_L1,Creating language diff for $(lang))
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
@@ -991 +995 @@
                 -pdbtype none \
                 -out $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi
-        $(REDIRECT) -C $$(@D) -- $$(VBOX_PATH_MSITRAN) -g $$< $(PACKAGE_NAME_LANG)_$(lang).msi $(lang).mst
+        $(VBOX_TOOLS_WIN_WIX_BIN) msi transform -t language -intermediateFolder "$$(@D)/wix-temp/" \
+                "$$<" "$$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi" -out "$$@"
         $(CP) -f -- "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst" "$(VBOX_WIN_INST_REPACK_DIR)/$(lang).mst"
-        $(RM) -Rf -- $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi \
-                $$(@D)/wix-temp/ \
-                $$(@D)/common.cab
+        $(RM) -Rf -- "$$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi" \
+                "$$(@D)/wix-temp/" \
+                "$$(@D)/common.cab"
 
 endef
@@ -1021 +1026 @@
                 $(wildcard $(@D)/$(PACKAGE_BASE)-r*.msi $(VBOX_WIN_INST_REPACK_DIR)/2-multilingual-$(PACKAGE_BASE)-r*.cmd )
         $(CP) -f -- "$<" "$@"
-
+# Add non-english languages.
         $(foreach lang,$(filter-out en_US,$(VBOX_INSTALLER_LANGUAGES)), \
-                $(NLTAB)$(REDIRECT) -C $(@D)/$(lang) -- $(VBOX_PATH_MSIDB) -d $@ -r $(lang).mst \
-                $(NLTAB)$(REDIRECT) -C $(@D)/$(lang) -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $@ $(lang).mst $(VBOX_BRAND_$(lang)_LANG_ID) )
-
+                $(NLTAB)$(REDIRECT) -C "$(@D)/$(lang)" -- $(VBOX_PATH_MSIDB) -d "$@" -r "$(lang).mst" \
+                $(NLTAB)$(REDIRECT) -C "$(@D)/$(lang)" -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $@ $(lang).mst $(VBOX_BRAND_$(lang)_LANG_ID) )
+# Display MSI details.
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $(@F)
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@
+# Update the list of language IDs (starts with platform/arch).
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@ $(VBOX_INS_PROD_LANG)
+# Display updated MSI details.
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@
+# Finally, sign it.
         $(call VBOX_SIGN_MSI_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
-
 # Create repack script for this step.
         $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/2-multilingual-$(PACKAGE_NAME_LANG).cmd" \
@@ -1047 +1054 @@
                 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
                 '@echo Created multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
+# Validation.  Currently there is a list of grievances, we ignore it. (TODO: Fix errors.)
         $(call MSG_L1,Start validation of "$@" - errors will be ignored)
         -$(REDIRECT) -- $(VBOX_TOOLS_WIN_WIX_BIN) msi validate "$@"