Changeset 96572 in vbox for trunk/src/VBox/Installer/win/Makefile.kmk

Timestamp:

Sep 1, 2022 8:36:22 PM (2 years ago)

Author:

vboxsync

Message:

HostDrives,Installer/win: Reworked the windows installer related code for no-CRT mode, where applicable, and changed the XxxxInstall.exe/XxxxUninstall.exe utilities to link against VBoxRT.dll instead of being statically linked. Lot's of cleanup. The change is uncomfortably large, but difficult to detangle these things. bugref:10261

File:

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

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

@@ -103 +103 @@
 endif
 
+# Aliases for VBOX_SIGN_FILE_FN that allows better control of the MSI and MSM signing.
+VBOX_SIGN_MSI_FN ?= $(VBOX_SIGN_FILE_FN)
+VBOX_SIGN_MSM_FN ?= $(VBOX_SIGN_FILE_FN)
+VBOX_SIGN_CAB_FN ?= $(VBOX_SIGN_FILE_FN)
 
 #
@@ -569 +573 @@
                 $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
-        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
+        $(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.
         $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-VBoxMerge$(module)_$(lang).cmd" \
@@ -1127 +1131 @@
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $(@F)
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@ $(VBOX_INS_PROD_LANG)
-        $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
+        $(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.
@@ -1168 +1172 @@
                 $@ \
                 $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd ) )
-        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
+        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_CAB_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
         $(REDIRECT) -C $(@D) -- \
                 $(VBoxStubBld_1_TARGET) -out $@ \