Changeset 77766 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Mar 18, 2019 5:38:34 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk: Change VBOX_WITH_CORP_CODE_SIGNING to be a set of platforms (or "all") on which corp code signing should be enabled. This way it can be controlled selectively with the complicated staged builds (additions etc.) with a single LocalConfig.kmk.

File:

• trunk/src/VBox/Installer/win/Stub/Makefile.kmk (modified) (1 diff)

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

@@ -63 +63 @@
         $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert0 "[email protected]" $@
         $(APPEND) "[email protected]" "    { g_abVBoxStubTrustedCert0, sizeof(g_abVBoxStubTrustedCert0) }, "
-  if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && (!defined(VBOX_WITH_CORP_CODE_SIGNING) || "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all")
+  if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) || $(intersects win all,$(VBOX_WITH_CORP_CODE_SIGNING))
         $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --signature-index 1 --exe "$(PATH_STAGE_SYS)/VBoxDrv.sys" --output "[email protected]" --der
         $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert1 "[email protected]" $@
         $(APPEND) "[email protected]" "    { g_abVBoxStubTrustedCert1, sizeof(g_abVBoxStubTrustedCert1) }, "
   endif
-  if defined(VBOX_WITH_CORP_CODE_SIGNING) && "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all" && "$(VBOX_SIGNING_MODE)" == "release"
+  if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
         $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --signature-index 1 --exe "$(VBOX_RTSIGNTOOL)" --output "[email protected]" --der
         $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert2 "[email protected]" $@