Changeset 59708 in vbox for trunk

Timestamp:

Feb 16, 2016 7:39:26 PM (9 years ago)

Author:

vboxsync

Message:

Config.kmk,Installer/win/Makefile.kmk: Disable dual signing for MSIs as they don't appear to support it.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -2835 +2835 @@
   # @param 3  Additional parameters. Optional.
   # @param 4  Set to 2 if the expression will be expanded twice before chopped into commands (for _CMDS).
+  # @param 5  Disables dual signing if non-empty.
   ifndef VBOX_SIGN_FILE_FN
    ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
@@ -2847 +2848 @@
         $(3) \
         $(1) \
+        $(if-expr "$5" == "",\
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(VBOX_SIGNTOOL) \
         sign /as /fd sha256 \
@@ -2856 +2858 @@
         $(if $(strip $(2)),/d "$(strip $(2))",) \
         $(3) \
-        $(1)
+        $(1),)
    else
     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) sign \

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

@@ -411 +411 @@
                         $(VBOX_PATH_WIX)/difxapp_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)))
+        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 endef
 
@@ -445 +445 @@
                         $(VBOX_PATH_WIX)/difxapp_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)))
+        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 endef
 
@@ -753 +753 @@
                 wscript.exe $(VBOX_PATH_WISUMINFO) $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $(VBOX_INS_PROD_LANG)
         $(CP) -f $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $@
-        $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV))
+        $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV),,,disable-dual-signing)