Changeset 61929 in vbox

Timestamp:

Jun 29, 2016 12:22:39 PM (9 years ago)

Author:

vboxsync

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

108368

Message:

Config.kmk,installer/darwin: Drop the VBOX_NOT_OSX_105 define. We won't be building trunk against 10.5 area codesign and pkgbuild anymore.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -3120 +3120 @@
   # @param 1  The bundle to sign.
   # @param 2  Identifier, optional.
-  ifdef VBOX_NOT_OSX_105
   VBOX_SIGN_VMM_MOD_FN = $(VBOX_SIGN_MACHO_FN)
-  else
-  VBOX_SIGN_VMM_MOD_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        --file-list - \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(1) -D $(1).codesign \
-        $(if $(2),--identifier "$(2)",)
-  endif
 
   ## Sign a non-executable file.
   # @param 1  The bundle to sign.
   # @param 2  Identifier, optional.
-  ifdef VBOX_NOT_OSX_105
   VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
         --verbose=9 \
@@ -3143 +3132 @@
         $(1) \
         $(if $(2),--identifier "$(2)",)
-  else
-  VBOX_SIGN_FILE_FN =
-  endif
-
 
   ## @def VBOX_TEST_SIGN_KEXT

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

@@ -136 +136 @@
         @# Populate the image with uninstaller, readme, picture, and .VolumeIcon.icns. (TODO)
         $(INSTALL) $(VBOX_PATH_DI_SRC)/DiskImage/VirtualBox_Uninstall.tool  $(VBOX_PATH_PACK_TMP)/DiskImage/
-if defined(VBOX_SIGNING_MODE) && defined(VBOX_NOT_OSX_105)
+ifdef VBOX_SIGNING_MODE
         $(call VBOX_SIGN_FILE_FN,$(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox_Uninstall.tool,org.virtualbox.dmg.uninstaller)
 endif
@@ -538 +538 @@
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
         ,Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_VERSION_MAJOR) )
-ifndef VBOX_NOT_OSX_105
-VBOX_DI_VBAPP_SYMLINKS += $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
-        ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_VERSION_MAJOR)/$(qtmod) \
-         Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/ )
-endif
 
 ifdef VBOX_WITH_PYTHON
@@ -747 +742 @@
         $(foreach bin, $(VBOX_DI_VBAPP_UNIVERSAL_PROGS) \
                 , $(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(bin),org.virtualbox.app.macos.$(notdir $(bin))) )
- ifdef VBOX_NOT_OSX_105 ## @todo Move as much stuff out of MacOS/ as possible!!
         $(foreach other, $(VBOX_DI_VBAPP_OTHER_UNIVERSAL_BINS) $(VBOX_DI_VBAPP_OTHER_BINS)\
                 , $(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(other),org.virtualbox.app.macos.$(notdir $(other))) )
@@ -770 +764 @@
         $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/vmstarter.app,,)
         $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP),,--deep)
- else
-        $(foreach other, $(VBOX_DI_VBAPP_OTHER_UNIVERSAL_BINS) $(VBOX_DI_VBAPP_OTHER_BINS) \
-                , $(NLTAB)$(call VBOX_SIGN_VMM_MOD_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(other),org.virtualbox.app.macos.$(notdir $(other))) )
-        $(foreach bin, $(VBOX_DI_VBAPP_PROGS) \
-                , $(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(bin),org.virtualbox.app.macos.$(notdir $(bin))) )
- endif
 endif
         @# Set the correct owner and set the set-user-ID-on-execution bit on the relevant executables.
@@ -813 +801 @@
                 --install-location /Applications/ \
                 --ownership preserve \
-                $(if-expr defined(VBOX_NOT_OSX_105),--preserve-xattr,) \
+                --preserve-xattr \
                 $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
                 $@