Changeset 53605 in vbox

Timestamp:

Dec 26, 2014 5:07:12 PM (10 years ago)

Author:

vboxsync

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

97373

Message:

Config.kmk: Ditched the VBOX_SIGNING_MODE 'development' in favor of 'test'.

File:

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

trunk/Config.kmk

@@ -2630 +2630 @@
 # Code Signing.
 #
+# There are two signing modes; 'test' and 'release'.
+#  - The 'test' mode is tailored local development, where typically test
+#    certificates are involved. Only the bar minimum of files are signed and
+#    nothing is timestamped (if we can control timestamping) in order to reduce
+#    build time and to allow working offline.
+#  - The 'release' mode is tailored for creating builds that are give to other
+#    people, like the ones the build servers create.  As much as possible is
+#    signed and timestamped.
+#
 ifdef VBOX_SIGNING_MODE
+ VBOX_SIGNING_MODE := $(strip $(VBOX_SIGNING_MODE))
+ ifn1of ($(VBOX_SIGNING_MODE), test release)
+  $(error VBOX_SIGNING_MODE must be either 'test' or 'release'. The value '$(VBOX_SIGNING_MODE)' is not recognized.)
+ endif
+
  ifeq ($(KBUILD_HOST),win)
   #
@@ -2646 +2660 @@
   VBOX_INF2CAT  ?= $(VBOX_PATH_SELFSIGN)/Inf2Cat.exe
 
-  # There are three signing modes; 'test', 'development' and 'release'.
-  ifeq ($(strip $(VBOX_SIGNING_MODE)),test)
+  ifeq ($(VBOX_SIGNING_MODE),test)
    VBOX_CERTIFICATE_SUBJECT_NAME ?= MyTestCertificate
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)"
-  else if1of ($(VBOX_SIGNING_MODE), release development)
+  else # release
    VBOX_CERTIFICATE_SUBJECT_NAME ?= Oracle Corporation
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" /a
@@ -2662 +2675 @@
    VBOX_TSA_URL ?= http://timestamp.verisign.com/scripts/timestamp.dll
    VBOX_TSA_URL_ARGS ?= /t "$(VBOX_TSA_URL)"
-  else
-   $(error VBox: Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
   endif
   VBOX_CERTIFICATE_STORE ?= my
@@ -2705 +2716 @@
 
   # Go nuts, sign everything.
-  if "$(strip $(VBOX_SIGNING_MODE))" == "release" || defined(VBOX_WITH_HARDENING)
+  if "$(VBOX_SIGNING_MODE)" == "release" || defined(VBOX_WITH_HARDENING)
    ## Commands for signing an executable or a dll image after link.
    VBOX_SIGN_IMAGE_CMDS  ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_IMAGE_FN,$(out)))
@@ -2719 +2730 @@
   # (Installer package signing is done elsewhere (VBOX_MACOSX_INSTALLER_SIGN).)
   #
-  ifeq ($(strip $(VBOX_SIGNING_MODE)),test)
+  ifeq ($(VBOX_SIGNING_MODE),test)
    VBOX_CERTIFICATE_SUBJECT_NAME ?= $(error You need to set VBOX_CERTIFICATE_SUBJECT_NAME in LocalConfig.kmk.)
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= --sign "$(VBOX_CERTIFICATE_SUBJECT_NAME)"
-  else if1of ($(VBOX_SIGNING_MODE), release development)
+  else
    VBOX_CERTIFICATE_SUBJECT_NAME ?= Developer ID Application: Oracle America, Inc.
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= --sign "$(VBOX_CERTIFICATE_SUBJECT_NAME)"
-  else
-   $(error VBox: Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
   endif
 
@@ -2779 +2788 @@
   # @note      This is only for the 'test' signing mode, we skip this in
   #             'release' signing mode as to not waste time on the build boxes.
-  ifeq ($(VBOX_SIGNING_MODE),test)
+  ifeq ($(VBOX_SIGNING_MODE),test) ## @todo when kBuild is updated to r2742+, this should be enabled for both modes.
    define VBOX_TEST_SIGN_KEXT
   $1_INSTTYPE.darwin = none
@@ -2812 +2821 @@
   #
 
-  # There are three signing modes; 'test', 'development' and 'release'.
-  ifeq ($(strip $(VBOX_SIGNING_MODE)),test)
+  ifeq ($(VBOX_SIGNING_MODE),test)
    VBOX_CERTIFICATE_FILE  ?= $(error You need to set VBOX_CERTIFICATE_FILE in LocalConfig.kmk.)
    VBOX_TOKEN_NAME        ?= $(error You need to set VBOX_TOKEN_NAME in LocalConfig.kmk.)
    VBOX_PIN_FILE          ?= $(error You need to set VBOX_PIN_FILE in LocalConfig.kmk.)
-  else if1of ($(VBOX_SIGNING_MODE), release development)
+  else
    VBOX_CERTIFICATE_FILE  ?= $(PATH_ROOT)/oracle.pem
    VBOX_TOKEN_NAME        ?= "Sun Software PKCS\#11 softtoken"
    VBOX_PIN_FILE          ?= $(PATH_ROOT)/oracle.pin
-  else
-   $(error VBox: Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
   endif
   VBOX_CERTIFICATE_FILE_ARGS ?= -c $(VBOX_CERTIFICATE_FILE)