Changeset 2951 in vbox for trunk

Timestamp:

May 31, 2007 12:27:48 AM (18 years ago)

Author:

vboxsync

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

21633

Message:

simplifications.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -922 +922 @@
    VBOX_TSA_URL ?= http://timestamp.verisign.com/scripts/timestamp.dll
    VBOX_TSA_URL_ARGS ?= /t "$(VBOX_TSA_URL)"
-   VBOX_SIGN_DRIVER_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_SIGNTOOL) sign \
-                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-                $(VBOX_CERTIFICATE_STORE_ARGS) \
-                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-                $(VBOX_TSA_URL_ARGS) \
-                $(out))
-   VBOX_SIGN_IMAGE_CMDS  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_SIGNTOOL) sign \
-                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-                $(VBOX_CERTIFICATE_STORE_ARGS) \
-                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-                $(VBOX_TSA_URL_ARGS) \
-                $(out))
+   ## Commands for signing a driver image after link.
+   VBOX_SIGN_DRIVER_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_FILE_FN,$(out))
+   ## Commands for signing an executable or a dll image after link.
+   VBOX_SIGN_IMAGE_CMDS  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_FILE_FN,$(out)))
    ## Sign a file.
-   # @param 1  The msi to sign.
+   # @param 1  The file to sign.
    VBOX_SIGN_FILE_FN      = $(VBOX_SIGNTOOL) sign \
                 $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
@@ -950 +942 @@
                 $(NL)$(TAB)$(VBOX_INF2CAT) /driver:$(strip $(1)) /os:$(strip $(subst ;,$(COMMA),$(3))) /verbose \
                 $(NL)$(TAB)$(MV) $(2) $(2) \
-                $(NL)$(TAB)$(VBOX_SIGNTOOL) sign /v \
-                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-                $(VBOX_CERTIFICATE_STORE_ARGS) \
-                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-                $(VBOX_TSA_URL_ARGS) \
-                $(2)
+                $(NL)$(TAB)$(call VBOX_SIGN_FILE_FN,$(2))
    VBOX_MAKE_CAT64_FN   = $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),XP_X64;Server2003_X64;Vista_X64)
    VBOX_MAKE_CAT32_FN   = $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),2000;XP_X86;Server2003_X86;Vista_X86)