Changeset 2949 in vbox for trunk/Config.kmk

Timestamp:

May 31, 2007 12:21:26 AM (18 years ago)

Author:

vboxsync

Message:

Make it possible to override the /s my arguments with /sm (additions built from linux). Drop signing of testcases.

File:

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

trunk/Config.kmk

@@ -915 +915 @@
   else ifeq ($(strip $(VBOX_SIGNING_MODE)),release)
    VBOX_CROSS_CERTIFICATE_FILE ?= $(VBOX_PATH_SELFSIGN)/MSCV-GlobalSign.cer
+   VBOX_CROSS_CERTIFICATE_FILE_ARGS ?= /ac "$(VBOX_CROSS_CERTIFICATE_FILE)"
    VBOX_CERTIFICATE_SUBJECT_NAME ?= InnoTek Systemberatung GmbH
+   VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)"
    VBOX_CERTIFICATE_STORE ?= my
+   VBOX_CERTIFICATE_STORE_ARGS ?= /s "$(VBOX_CERTIFICATE_STORE)"
    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 \
-                /ac "$(VBOX_CROSS_CERTIFICATE_FILE)" \
-                /s "$(VBOX_CERTIFICATE_STORE)" \
-                /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" \
-                /t "$(VBOX_TSA_URL)" \
+                $(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 \
-                /ac "$(VBOX_CROSS_CERTIFICATE_FILE)" \
-                /s "$(VBOX_CERTIFICATE_STORE)" \
-                /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" \
+                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+                $(VBOX_CERTIFICATE_STORE_ARGS) \
+                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+                $(VBOX_TSA_URL_ARGS) \
                 $(out))
    ## Sign an MSI.
    # @param 1  The msi to sign.
    VBOX_SIGN_MSI_FN      = $(VBOX_SIGNTOOL) sign \
-                /ac "$(VBOX_CROSS_CERTIFICATE_FILE)" \
-                /s "$(VBOX_CERTIFICATE_STORE)" \
-                /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" \
+                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+                $(VBOX_CERTIFICATE_STORE_ARGS) \
+                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+                $(VBOX_TSA_URL_ARGS) \
                 $(1)
    ## Create a security catalog file.
@@ -945 +951 @@
                 $(NL)$(TAB)$(MV) $(2) $(2) \
                 $(NL)$(TAB)$(VBOX_SIGNTOOL) sign /v \
-                /ac "$(VBOX_CROSS_CERTIFICATE_FILE)" \
-                /s "$(VBOX_CERTIFICATE_STORE)" \
-                /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" \
-                /t "$(VBOX_TSA_URL)" \
+                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+                $(VBOX_CERTIFICATE_STORE_ARGS) \
+                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+                $(VBOX_TSA_URL_ARGS) \
                 $(2)
    VBOX_MAKE_CAT64_FN   = $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),XP_X64;Server2003_X64;Vista_X64)
@@ -1522 +1528 @@
 TEMPLATE_VBOXR3TSTEXE_INST    = $(INST_TESTCASE)
 TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS)
+ifeq ($(BUILD_TARGET),win)
+ ifdef VBOX_SIGNING_MODE
+  TEMPLATE_VBOXR3TSTEXE_POST_CMDS =
+ endif
+endif
 
 #