VirtualBox

Changeset 98429 in vbox for trunk/src/VBox/Installer/darwin


Ignore:
Timestamp:
Feb 2, 2023 12:03:46 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155676
Message:

Installer/*.kmk: Automatic scm cleanups. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r98103 r98429  
    167167                $(if $(VBOX_ADD_MANUAL_de_DE),$(INSTALL) -m 644 $(VBOX_ADD_MANUAL_de_DE) "$(VBOX_PATH_PACK_TMP)/DiskImage/$(VBOX_BRAND_de_DE_MANUAL_NAME).pdf"$(NLTAB)) \
    168168                $(if $(VBOX_ADD_MANUAL_fr_FR),$(INSTALL) -m 644 $(VBOX_ADD_MANUAL_fr_FR) "$(VBOX_PATH_PACK_TMP)/DiskImage/$(VBOX_BRAND_fr_FR_MANUAL_NAME).pdf"$(NLTAB)))
    169     # Rename the main package
     169  # Rename the main package
    170170 else
    171171        $(if $(VBOX_WITH_DOCS_PACKING), $(INSTALL) $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/UserManual.pdf $(VBOX_PATH_PACK_TMP)/DiskImage/)
    … …  
    202202                $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg \
    203203                $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg \
    204                 $$(wildcard $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/* \
    205                             $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \
     204                $$(wildcard \
     205                        $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/* \
     206                        $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \
    206207                $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)) \
    207208                $(if $(VBOX_WITH_FUSE_PACKING), $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg) \
    … …  
    287288
    288289ifdef VBOX_WITH_VBOXDRV
    289 #
    290 # The VirtualBox Kernel extensions.
    291 #
    292 VBOX_DI_KEXTS_UNIVERSAL = VBoxDrv VBoxNetFlt VBoxNetAdp
    293 VBOX_DI_KEXTS = $(VBOX_DI_KEXTS_UNIVERSAL)
    294 
    295 $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg: \
    296                 $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
    297                 $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist) \
    298                 $$(wildcard $(VBOX_PATH_DI_SRC)/VBoxKEXTs/* \
    299                             $(VBOX_PATH_DI_SRC)/VBoxKEXTs/*.lproj/*) \
    300                 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
    301                         $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \
    302                         $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \
    303                         $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
    304                 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
     290 #
     291 # The VirtualBox Kernel extensions.
     292 #
     293 VBOX_DI_KEXTS_UNIVERSAL = VBoxDrv VBoxNetFlt VBoxNetAdp
     294 VBOX_DI_KEXTS = $(VBOX_DI_KEXTS_UNIVERSAL)
     295
     296 $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg: \
     297                $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
     298                $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist) \
     299                $$(wildcard \
     300                        $(VBOX_PATH_DI_SRC)/VBoxKEXTs/* \
     301                        $(VBOX_PATH_DI_SRC)/VBoxKEXTs/*.lproj/*) \
     302                $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
     303                        $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \
     304                        $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \
     305                        $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
     306                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    305307        $(call MSG_TOOL,pkgbuild,,,$@)
    306308        @# Cleanup any previously failed attempts.
    … …  
    333335                $(NLTAB)$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/$(kext).kext/Contents/MacOS/$(kext) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/)
    334336        @# Sign the kext bundles.
    335 ifdef VBOX_SIGNING_MODE
     337 ifdef VBOX_SIGNING_MODE
    336338        $(foreach kext,$(VBOX_DI_KEXTS) \
    337339                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/$(kext),org.virtualbox.app.kext.$(kext)) )
    338         $(foreach kext,$(VBOX_DI_KEXTS), \
    339                 $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext,org.virtualbox.app.kext.$(kext)) )
    340 ## @TODO check why this fails on the build box: $(foreach kext,$(VBOX_DI_KEXTS), $(NLTAB)codesign --verify --verbose=1 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext )
    341 endif
     340        $(foreach kext,$(VBOX_DI_KEXTS) \
     341                ,$(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext,org.virtualbox.app.kext.$(kext)) )
     342  ## @TODO check why this fails on the build box:       $(foreach kext,$(VBOX_DI_KEXTS), $(NLTAB)codesign --verify --verbose=1 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext )
     343 endif
    342344        @# Set the correct owners.
    343345        sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/
    … …  
    366368                $(if-expr defined(VBOX_MACOSX_INSTALLER_SIGN) && $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING)) == "",--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
    367369                $@
    368 ifdef VBOX_SIGNING_MODE
    369  if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
     370 ifdef VBOX_SIGNING_MODE
     371  if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
    370372        @# Sign the created pkg.
    371373        $(call VBOX_SIGN_PKG_FN,$@,org.virtualbox.pkg.vboxkexts)
    372  endif
    373 endif
     374  endif
     375 endif
    374376        @# Cleanup
    375377        sudo chown -R "$(shell whoami)" \
    … …  
    448450ifdef VBOX_WITH_QTGUI
    449451 VBOX_DI_VBAPP_DYLIBS += \
    450         MacOS/UICommon.dylib
     452        MacOS/UICommon.dylib
    451453 ifneq ($(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/accessible/libqtaccessiblewidgets.dylib),)
    452454  VBOX_DI_VBAPP_DYLIBS += \
    … …  
    460462ifdef VBOX_WITH_DEBUGGER
    461463 VBOX_DI_VBAPP_DYLIBS += \
    462         MacOS/DbgPlugInDiggers.dylib
     464        MacOS/DbgPlugInDiggers.dylib
    463465 if defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_DEBUGGER_GUI)
    464466  VBOX_DI_VBAPP_DYLIBS += \
    … …  
    507509 $(error Conflict.$(NLTAB)VBOX_DI_VBAPP_DYLIBS.amd64=$(VBOX_DI_VBAPP_DYLIBS.amd64)$(NLTAB)VBOX_DI_VBAPP_DYLIBS.x86  =$(VBOX_DI_VBAPP_DYLIBS.x86))
    508510endif
    509 if1of ($(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_DYLIBS.x86),$(VBOX_DI_VBAPP_DYLIBS))
     511if1of ($(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_DYLIBS.x86), $(VBOX_DI_VBAPP_DYLIBS))
    510512 $(error Conflict.$(NLTAB)VBOX_DI_VBAPP_DYLIBS.amd64=$(VBOX_DI_VBAPP_DYLIBS.amd64)$(NLTAB)VBOX_DI_VBAPP_DYLIBS.x86  =$(VBOX_DI_VBAPP_DYLIBS.x86)$(NLTAB)VBOX_DI_VBAPP_DYLIBS=$(VBOX_DI_VBAPP_DYLIBS))
    511513endif
    … …  
    567569 ifdef VBOX_WITH_DOCS_QHELP_PACKING
    568570  VBOX_DI_VBAPP_MISC_FILES += \
    569         MacOS/UserManual.qch \
    570         MacOS/UserManual.qhc
     571        MacOS/UserManual.qch \
     572        MacOS/UserManual.qhc
    571573 endif
    572574endif
    573575ifdef VBOX_WITH_ADDITIONS_PACKING
    574576 ifneq ($(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso),)
    575  VBOX_DI_VBAPP_MISC_FILES += \
    576         MacOS/VBoxGuestAdditions.iso
     577  VBOX_DI_VBAPP_MISC_FILES += \
     578        MacOS/VBoxGuestAdditions.iso
    577579 endif
    578580endif
    … …  
    626628# @param    4   Team ID.
    627629define def_vbox_entitlement_add_app_and_team_id =
    628 $(2): $(1) $$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) | $$$$(dir $$$$@)
     630 $(2): $(1) $$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) | $$$$(dir $$$$@)
    629631        $$(QUIET)$$(SED) \
    630632                -e '/^<dict>$$$$/a \    <key>com.apple.application-identifier</key>\n    <string>$(strip $(4)).$(strip $(3))</string>\n    <key>com.apple.developer.team-identifier</key>\n    <string>$(strip $(4))</string>' \
    … …  
    635637 ifdef VBOX_VIRTUALBOX_APP_ID
    636638  VBOX_VIRTUALBOX_APP_ENTITLEMENTS := $(VBOX_PATH_PACK_TMP)/SUPR3HardenedEntitlements.plist
    637 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlements.plist,$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOX_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))
     639  $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlements.plist,$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOX_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))
    638640 endif
    639641
    640642 ifdef VBOX_VIRTUALBOXVM_APP_ID
    641643  VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS := $(VBOX_PATH_PACK_TMP)/SUPR3HardenedEntitlementsVM.plist
    642 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlementsVM.plist,$(VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOXVM_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))
     644  $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlementsVM.plist,$(VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOXVM_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))
    643645 endif
    644646endif
    … …  
    651653                        $(VBOX_DI_VBAPP_OTHER_BINS) $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_PROGS_HARDENED) $(VBOX_DI_VBAPP_MISC_FILES) \
    652654                        ,$(call VBOX_DI_FN_DEP_BOTH,VirtualBox.app/Contents/$(f)) ) \
    653                 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.x86) $(VBOX_DI_VBAPP_MISC_FILES.x86)\
     655                $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.x86) $(VBOX_DI_VBAPP_MISC_FILES.x86) \
    654656                        ,$(call VBOX_DI_FN_DEP_32,VirtualBox.app/Contents/$(f)) ) \
    655                 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_MISC_FILES.amd64)\
     657                $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_MISC_FILES.amd64) \
    656658                        ,$(call VBOX_DI_FN_DEP_64,VirtualBox.app/Contents/$(f)) ) \
    657659                \
    … …  
    796798                ,$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/$(prog)                   $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(prog)$(NLTAB))
    797799ifdef VBOX_UNATTENDED_TEMPLATES
    798 # Unattended installation template scripts.
     800 # Unattended installation template scripts.
    799801        $(MKDIR) -p -m 0755 -- $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/UnattendedTemplates
    800802        $(foreach file, $(VBOX_UNATTENDED_TEMPLATES) \
    … …  
    803805endif
    804806ifdef VBOX_WITH_DTRACE
    805 # DTrace library, testcases and scripts.
     807 # DTrace library, testcases and scripts.
    806808        $(MKDIR) -p -m 0755 -- \
    807809                $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/dtrace/lib/$(KBUILD_TARGET_ARCH)/ \
    … …  
    815817endif
    816818ifndef VBOX_WITH_QTGUI
    817 # Hack alert! Just something to make pkgbuild happy.
     819 # Hack alert! Just something to make pkgbuild happy.
    818820        $(APPEND) -tn "$(VBOX_PATH_VBOX_APP_TMP)/Contents/PkgInfo" "APPLVBOX"
    819821        $(APPEND) -tn "$(VBOX_PATH_VBOX_APP_TMP)/Contents/Info.plist" \
    … …  
    868870                , $(NLTAB)$(call VBOX_SIGN_FILE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(file),org.virtualbox.app.$(tolower $(subst $(SP),,$(subst /,.,$(file))))) )
    869871
    870 ifdef VBOX_PROVISIONPROFILE_TEAM_ID
    871 #       $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/$(VBOX_PROVISIONPROFILE_TEAM_ID).provisionprofile     $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app/Contents/embedded.provisionprofile
    872 endif
     872 ifdef VBOX_PROVISIONPROFILE_TEAM_ID
     873  #     $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/$(VBOX_PROVISIONPROFILE_TEAM_ID).provisionprofile     $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app/Contents/embedded.provisionprofile
     874 endif
    873875        $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app,,$(if-expr defined(VBOX_WITH_MACOS_HARDENED_RUNTIME)\
    874876                ,--entitlements="$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS)",))
    … …  
    956958#
    957959$(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg: \
    958                 $$(wildcard $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/* \
    959                             $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/*.lproj/*) \
     960                $$(wildcard \
     961                        $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/* \
     962                        $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/*.lproj/*) \
    960963                $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \
    961964                        ,$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)) \
    … …  
    10421045
    10431046ifdef VBOX_WITH_FUSE_PACKING
    1044 #
    1045 # The FUSE for macOS core package.
    1046 #
    1047 VBOX_PATH_FUSE_CORE_PKG ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg
    1048 $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg: \
    1049                 $(VBOX_PATH_FUSE_CORE_PKG)
     1047 #
     1048 # The FUSE for macOS core package.
     1049 #
     1050 VBOX_PATH_FUSE_CORE_PKG ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg
     1051 $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg: \
     1052                $(VBOX_PATH_FUSE_CORE_PKG)
    10501053        $(call MSG_TOOL,Preparing FUSE for macOS core package,,,$@)
    10511054        @# Cleanup any previously failed attempts.
    … …  
    10591062# Aliases.
    10601063#
    1061 VBoxKEXTs.pkg:        $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg
    1062 VirtualBoxCLI.pkg:    $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg
    1063 VirtualBox.pkg:       $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg
    1064 VirtualBox.mpkg:      $(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox.pkg
    1065 VirtualBox.dmg:       $(VBOX_PATH_DIST)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).dmg
     1064VBoxKEXTs.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg
     1065VirtualBoxCLI.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg
     1066VirtualBox.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg
     1067VirtualBox.mpkg: $(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox.pkg
     1068VirtualBox.dmg: $(VBOX_PATH_DIST)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).dmg
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette