VirtualBox

Ignore:
Timestamp:
Sep 3, 2013 9:37:15 PM (11 years ago)
Author:
vboxsync
Message:

OS X Additions: attempt to fix packing.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r48251 r48254  
    2323# Globals
    2424#
    25 VBOX_PATH_DI_SRC := $(PATH_SUB_CURRENT)
    26 VBOX_DI_OUT_DIR  := $(PATH_TARGET)/additions/Installer
    27 BLDDIRS += $(VBOX_DI_OUT_DIR)
     25VBOX_ADD_PATH_DI_SRC := $(PATH_SUB_CURRENT)
     26VBOX_ADD_DI_OUT_DIR  := $(PATH_TARGET)/additions/Installer
     27BLDDIRS += $(VBOX_ADD_DI_OUT_DIR)
    2828
    2929ifdef VBOX_WITH_COMBINED_PACKAGE
    … …  
    6565# Where we do the packing (override this in LocalConfig.kmk if building on smbfs).
    6666ifndef VBOX_PATH_PACK_TMP
    67  VBOX_PATH_PACK_TMP := $(VBOX_DI_OUT_DIR)
     67 VBOX_PATH_PACK_TMP := $(VBOX_ADD_DI_OUT_DIR)
    6868endif
    6969
    … …  
    103103                $(VBOX_BRAND_DARWIN_DISKIMAGE_BG) \
    104104                $(VBOX_BRAND_DARWIN_DISKIMAGE_DS_STORE) \
    105                 $$(wildcard $(VBOX_PATH_DI_SRC)/DiskImage/*) \
    106                 $(VBOX_PATH_DI_SRC)/DiskImage/Uninstall.tool \
     105                $$(wildcard $(VBOX_ADD_PATH_DI_SRC)/DiskImage/*) \
     106                $(VBOX_ADD_PATH_DI_SRC)/DiskImage/Uninstall.tool \
    107107                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    108108        $(call MSG_TOOL,hdiutil,,,$@)
    … …  
    118118        $(QUIET)$(RM) -f $(wildcard $(VBOX_PATH_DIST)/VBoxDarwinAdditions-*-r*.dmg)
    119119        @# Populate the image with uninstaller, readme, picture, and .VolumeIcon.icns. (TODO)
    120         $(INSTALL) $(VBOX_PATH_DI_SRC)/DiskImage/Uninstall.tool  $(VBOX_PATH_PACK_TMP)/DiskImage/
     120        $(INSTALL) $(VBOX_ADD_PATH_DI_SRC)/DiskImage/Uninstall.tool  $(VBOX_PATH_PACK_TMP)/DiskImage/
    121121ifeq (1,1)
    122122        @# Pedantic mode...
    … …  
    140140                $(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsKEXTs.pkg \
    141141                $(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsToolsAndServices.pkg \
    142                 $$(wildcard $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/* \
    143                             $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/*.lproj/*) \
     142                $$(wildcard $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/* \
     143                            $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/*.lproj/*) \
    144144                $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)) \
    145                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Welcome.rtf \
    146                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Conclusion.rtf \
     145                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Welcome.rtf \
     146                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Conclusion.rtf \
    147147                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    148148        $(call MSG_TOOL,productbuild,,,$@)
    … …  
    170170                -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
    171171                --output $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res/English.lproj/Welcome.rtf \
    172                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Welcome.rtf
     172                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Welcome.rtf
    173173        @# Copy the resources.
    174         $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Conclusion.rtf $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res/English.lproj/Conclusion.rtf
     174        $(INSTALL) -m 0644 $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Conclusion.rtf $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res/English.lproj/Conclusion.rtf
    175175       
    176176        $(SED) \
    … …  
    179179                -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
    180180                --output $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res/English.lproj/Localizable.strings \
    181                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Localizable.strings
     181                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/Localizable.strings
    182182        $(INSTALL) -m 0644 $(VBOX_BRAND_DARWIN_INSTALLER_BG)                          $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res/background.tif
    183183       
    … …  
    203203        @# Build the package.
    204204        $(VBOX_PRODUCTBUILD) \
    205                 --distribution $(VBOX_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/distribution.dist \
     205                --distribution $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditions_mpkg/distribution.dist \
    206206                --package-path $(VBOX_PATH_PACK_TMP)/Packages \
    207207                --resources $(VBOX_PATH_PACK_TMP)/VBoxDarwinAdditions.dist.res \
    … …  
    222222# The VirtualBox Kernel extensions.
    223223#
    224 VBOX_DI_KEXTS_UNIVERSAL = VBoxGuest
    225 VBOX_DI_KEXTS = $(VBOX_DI_KEXTS_UNIVERSAL)
     224VBOX_ADD_DI_KEXTS_UNIVERSAL = VBoxGuest
     225VBOX_ADD_DI_KEXTS = $(VBOX_ADD_DI_KEXTS_UNIVERSAL)
    226226
    227227$(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsKEXTs.pkg: \
    228                 $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
    229                 $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/Info.plist) \
    230                 $$(wildcard $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/* \
    231                             $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/*.lproj/*) \
     228                $(foreach kext,$(VBOX_ADD_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
     229                $(foreach kext,$(VBOX_ADD_DI_KEXTS), $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/Info.plist) \
     230                $$(wildcard $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/* \
     231                            $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/*.lproj/*) \
    232232                $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
    233233                        $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \
    234234                        $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \
    235235                        $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
    236                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/postflight \
    237                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/PkgBuildComponent.plist \
     236                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/postflight \
     237                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/PkgBuildComponent.plist \
    238238                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    239239        $(call MSG_TOOL,pkgbuild,,,$@)
    … …  
    253253        $(MKDIR) -p -m 0755 \
    254254                $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions \
    255                 $(foreach kext,$(VBOX_DI_KEXTS), \
     255                $(foreach kext,$(VBOX_ADD_DI_KEXTS), \
    256256                        $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext \
    257257                        $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents \
    258258                        $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS )
    259259        @# Copy the common files (Info.plist).
    260         $(foreach kext,$(VBOX_DI_KEXTS), \
     260        $(foreach kext,$(VBOX_ADD_DI_KEXTS), \
    261261                $(NLTAB)$(INSTALL) -m 0644 $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/Info.plist $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/)
    262262        @# Copy the binaries and invoking lipo.
    263263ifdef VBOX_WITH_COMBINED_PACKAGE
    264         $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), \
     264        $(foreach kext,$(VBOX_ADD_DI_KEXTS_UNIVERSAL), \
    265265                $(NLTAB)$(VBOX_DI_LIPO) -create \
    266266                        $(VBOX_PATH_DIST_32)/additions/$(kext).kext/Contents/MacOS/$(kext) \
    … …  
    268268                        -output $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS/$(kext))
    269269else
    270         $(foreach kext,$(VBOX_DI_KEXTS), \
     270        $(foreach kext,$(VBOX_ADD_DI_KEXTS), \
    271271                $(NLTAB)$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/MacOS/$(kext) $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS/)
    272272endif
    273273        @# Signed the kext bundles.
    274274ifdef VBOX_SIGNING_MODE
    275         $(foreach kext,$(VBOX_DI_KEXTS), \
     275        $(foreach kext,$(VBOX_ADD_DI_KEXTS), \
    276276                $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.root/Library/Extensions/$(kext).kext,) )
    277277endif
    … …  
    281281       
    282282        # Copy package internal files
    283         $(INSTALL) $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/PkgBuildComponent.plist $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.desc/PkgBuildComponent.plist
     283        $(INSTALL) $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/PkgBuildComponent.plist $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.desc/PkgBuildComponent.plist
    284284       
    285285        # Copy installer scripts
    286         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/postflight $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.res
     286        $(INSTALL) -m 0755 $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/postflight $(VBOX_PATH_PACK_TMP)/VBoxGuestAdditionsKEXTs.pkg.res
    287287       
    288288        @# Build the package.
    … …  
    312312                $(foreach f, $(VBOX_DI_VB_GA_BINARIES)\
    313313                        ,$(call VBOX_DI_FN_DEP_BOTH,$(f)) ) \
    314                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxclient.plist \
    315                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxservice.plist \
    316                 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper \
    317                 $(VBOX_PATH_DI_SRC)/DiskImage/Uninstall.tool \
     314                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxclient.plist \
     315                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxservice.plist \
     316                $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper \
     317                $(VBOX_ADD_PATH_DI_SRC)/DiskImage/Uninstall.tool \
    318318                $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
    319319        $(call MSG_TOOL,pkgbuild,,,$@)
    … …  
    354354endif
    355355        # Add Uninstall.tool
    356         $(INSTALL) $(VBOX_PATH_DI_SRC)/DiskImage/Uninstall.tool  "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/" \
     356        $(INSTALL) $(VBOX_ADD_PATH_DI_SRC)/DiskImage/Uninstall.tool  "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/" \
    357357       
    358358        @# Install launchd stuff
    359         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper \
     359        $(INSTALL) -m 0755 $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/VBoxServiceWrapper \
    360360                                                                                 "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/Application Support/VirtualBox Guest Additions/"
    361         $(INSTALL) -m 644 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxclient.plist \
     361        $(INSTALL) -m 644 $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxclient.plist \
    362362                                                                                 "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/LaunchAgents/"
    363         $(INSTALL) -m 644 $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxservice.plist \
     363        $(INSTALL) -m 644 $(VBOX_ADD_PATH_DI_SRC)/VBoxGuestAdditionsToolsAndServices/org.virtualbox.additions.vboxservice.plist \
    364364                                                                                 "$(VBOX_PATH_PACK_TMP)/$(VBOX_GA_PKG).root/Library/LaunchDaemons/"
    365365       
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