Changeset 38756 in vbox for trunk/src/VBox/Installer

Timestamp:

Sep 15, 2011 8:39:39 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74035

Message:

Installer/win/Makefile.kmk: Try sign the .msi with a description to avoid the UAC prompt with cryptic a random .msi filename.

File:

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

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

@@ -289 +289 @@
                 $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
                 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \
+                $(VBOX_SVN_REV_KMK) \
                 $(MAKEFILE_CURRENT) \
                 | $$$$(dir $$$$@)
@@ -305 +306 @@
                         $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst
-        $(call VBOX_SIGN_FILE_FN,$$@)
+        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) v$(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)))
 endef
 
@@ -550 +551 @@
                 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
                 $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \
+                $(VBOX_SVN_REV_KMK) \
                 | $$(dir $$@)
         $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/$(PACKAGE_BASE)-r*.msi)
@@ -555 +557 @@
                 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,$@)
+        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) v$(VBOX_VERSION_STRING)r$(VBOX_SVN_REV))
 
 
@@ -567 +569 @@
                 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
                 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64)
-                $(call MSG_L1,Building Windows combined package)
-                $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB))
+        $(call MSG_L1,Building Windows combined package)
+        $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB))
         $(REDIRECT) -C $(@D) -- \
                 VBoxStubBld -out $@ \