Changeset 104826 in vbox

Timestamp:

May 31, 2024 10:20:44 AM (8 months ago)

Author:

vboxsync

Message:

Installer/darwin/Makefile.kmk: Improve robustness against failures to download stapled DMG, because that's non-recoverable when downloading in-place and will just waste a lot of time.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -4225 +4225 @@
  # temporary solution for a $(dir ...) equivalent which assumes that it gets a single path, possibly with spaces.
  VBOX_DIRX = $(subst ?,$(SP),$(dir $(subst $(SP),?,$1)))
+ VBOX_NOTDIRX = $(subst ?,$(SP),$(notdir $(subst $(SP),?,$1)))
  # Corp code signing client.
  VBOX_CCS_CLIENT_JAR := $(firstword $(rsort \

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

@@ -186 +186 @@
   if $(intersects darwin darwin_notarize all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
         @# Notarize the signed dmg (includes stapling).
-        $(call VBOX_NOTARIZE_FILE_FN,$@,org.virtualbox.VirtualBox.$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(VBOX_SVN_REV))
+        $(call VBOX_NOTARIZE_FILE_FN,$@,org.virtualbox.VirtualBox.$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(VBOX_SVN_REV),$(call VBOX_DIRX,$@).tmp)
+        $(MV) -f $(call VBOX_DIRX,$@).tmp/$(call VBOX_NOTDIRX,$@) $@
+        $(RMDIR) $(call VBOX_DIRX,$@).tmp
   endif
  endif