Changeset 104517 in vbox

Timestamp:

May 4, 2024 7:43:17 PM (7 months ago)

Author:

vboxsync

Message:

Windows host installer: Use -intermediatefolder so that WIX doesn't clog up randomized temporary directories. bugref:10644

File:

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

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

@@ -569 +569 @@
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
@@ -600 +601 @@
 
  endif
+        $(RM) -Rf -- $$(@D)/wix-temp/
 endef
 
@@ -627 +629 @@
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
@@ -632 +635 @@
                 -pdbtype none \
                 -out $$@
-        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
+        $(RM) -Rf -- \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst \
+                $$(@D)/wix-temp/
         $(call VBOX_SIGN_MSM_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
  # Create repack script for this step.
@@ -787 +792 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
+                        -intermediatefolder $$(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
                         -outputtype library \
@@ -796 +802 @@
 
  endif
-
+        $(RM) -Rf -- $$(@D)/wix-temp/
 
  $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))
@@ -899 +905 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
+                        -intermediatefolder $$(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
                         -outputtype library \
                         -out $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixlib
+        $(RM) -Rf -- $$(@D)/wix-temp/
  ifeq ($(lang),en_US)
   # Copy over the .wixlib into the repack directory, so that it can be used later when
@@ -908 +916 @@
         $(MKDIR) -p -- "$(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/"
  endif
-
  $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)))
 endef
@@ -1042 +1049 @@
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
@@ -1051 +1059 @@
         $(REDIRECT) -C $$(@D) -- $$(VBOX_PATH_MSITRAN) -g $$< $(PACKAGE_NAME_LANG)_$(lang).msi $(lang).mst
         $(CP) -f -- "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst" "$(VBOX_WIN_INST_REPACK_DIR)/$(lang).mst"
-        $(RM) -f -- $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi \
-                $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \
+        $(RM) -Rf -- $$(@D)/$(PACKAGE_NAME_LANG)_$(lang).msi \
+                $$(@D)/wix-temp/ \
                 $$(@D)/common.cab