Changeset 54680 in vbox

Timestamp:

Mar 7, 2015 5:51:01 AM (10 years ago)

Author:

vboxsync

Message:

Installer/darwin: Corrected frameworks so they're signable on 10.10 with xcode 6.1.1.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -2760 +2760 @@
         --force \
         --file-list - \
+       $(3) \
         $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
         $(1) $(if $(2),--identifier "$(2)",)
@@ -2839 +2840 @@
         $(MKDIR) -p -- "$$($1.kext_0_OUTDIR)/Contents/MacOS/"
         $(INSTALL) -m 644 $$($1_1_TARGET) $$($1.kext_0_OUTDIR)/Contents/MacOS/$1
-        $(call VBOX_SIGN_BUNDLE_FN,$$($1.kext_0_OUTDIR),org.virtualbox.app.kext.$1)
+        $(call VBOX_SIGN_BUNDLE_FN,$$($1.kext_0_OUTDIR),org.virtualbox.app.kext.$1,)
    endef
   else

trunk/Makefile.kmk

@@ -143 +143 @@
 # Install our Qt DLLs / Shared Objects / Frameworks.
 # Note: The installer fixes the darwin .dylibs when hardening is enabled.
+# Note: Contents/Info.plist is where it's in 4.7.x, not sure if the location is kosher... According to
+#       https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
+#       the Info.plist file goes into Resources.
 #
 ifeq ($(KBUILD_TARGET),darwin)
@@ -149 +152 @@
  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
  qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \
-        ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod))
+        ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+         $(PATH_SDK_QT4_LIB)/$(qtmod).framework/Contents/Info.plist=>Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist \
+        )
  ifdef VBOX_WITH_COCOA_QT
   qt4-bin_SOURCES += \
@@ -161 +166 @@
  endif
  qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
-                ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
- ifdef VBOX_WITH_COCOA_QT
-  qt4-bin_SYMLINKS += \
-        Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
- endif
+                ,Frameworks/$(qtmod).framework/Versions/Current=>4 \
+                 Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
+                 Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources \)
 else
  if defined(VBOX_WITH_QT4_SUN) || defined(VBOX_WITH_QT4_PAYLOAD)

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

@@ -498 +498 @@
         Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib \
         Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib \
-        Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib
+        Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib \
+        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist)
 
 VBOX_DI_VBAPP_SYMLINKS = \
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod)) \
-        Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
+        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        ,Frameworks/$(qtmod).framework/Versions/Current=>4 )
+ifndef VBOX_NOT_OSX_105
+VBOX_DI_VBAPP_SYMLINKS += $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
+         Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources/ )
+endif
 
 ifdef VBOX_WITH_PYTHON
@@ -695 +701 @@
         $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
                 ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod),org.virtualbox.app.frameworks.$(qtmod)) )
+        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+                ,$(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/4,org.virtualbox.app.frameworks.$(qtmod)) )
         $(foreach dylib, \
                 $(VBOX_DI_VBAPP_DYLIBS) \
@@ -721 +729 @@
                 , $(NLTAB)$(call VBOX_SIGN_FILE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(file),org.virtualbox.app.$(tolower $(subst $(SP),,$(subst /,.,$(file))))) )
 
+        $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app,,)
+        $(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) \
@@ -727 +738 @@
                 , $(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(bin),org.virtualbox.app.macos.$(notdir $(bin))) )
  endif
- ifdef VBOX_NOT_OSX_105 # requires codesign+framworks from Lion or later. Snow Leopard codesign says object file format invalid or unsuitable.
-        $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app,)
-        $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/vmstarter.app,)
-        $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP),)
- endif
 endif
         @# Set the correct owner and set the set-user-ID-on-execution bit on the relevant executables.
@@ -740 +746 @@
                         $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/$(bin))
 endif
+        exit 1
         @# Do keyword replacement in the package info and description files.
         $(SED) \