Changeset 79701 in vbox

Timestamp:

Jul 11, 2019 6:31:18 PM (6 years ago)

Author:

vboxsync

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

132045

Message:

Installer/win: need to place the result of EV signing correctly (defaults placed it in the current directory)

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -3572 +3572 @@
   ## EV sign a file (generic).
   # @param 1  The file to sign.
+  # @param 2  The directory to put the signed file in. Defaults to $(dir $1).
   ifndef VBOX_SIGN_EV_FILE_FN
    if $(intersects win_ev all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
-    VBOX_SIGN_EV_FILE_FN  = $(call VBOX_CCS_SIGN_CMD,microsoftev,$1,$(dir $1))
+    VBOX_SIGN_EV_FILE_FN  = $(call VBOX_CCS_SIGN_CMD,microsoftev,$1,$(if $2,$2,$(dir $1)))
    else ifdef VBOX_CERTIFICATE_EV_SUBJECT_NAME
     VBOX_SIGN_EV_FILE_FN  = $(VBOX_SIGNTOOL) \

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

@@ -1110 +1110 @@
                 'if ".%1" == "." (echo No .cab file specified & exit /b 1)' \
                 $(subst $(KBUILD_BIN_PATH),%KBUILD_BIN_PATH%,$(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%, \
-                '( $(call VBOX_SIGN_EV_FILE_FN,%1) ) || exit /b1' \
+                '( $(call VBOX_SIGN_EV_FILE_FN,%1,%~dp1) ) || exit /b1' \
                 ) )