Changeset 31967 in vbox for trunk/src

Timestamp:

Aug 25, 2010 6:12:00 PM (14 years ago)

Author:

vboxsync

Message:

Installer-OSX: use current Qt version in the installer

File:

• trunk/src/VBox/Installer/darwin/Makefile.kmk (modified) (6 diffs)

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

@@ -554 +554 @@
 
 VBOX_DI_VBAPP_DYLIBS = \
-        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox) \
+        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)) \
         MacOS/VBoxDD.dylib \
         MacOS/VBoxDD2.dylib \
@@ -680 +680 @@
 ifdef VBOX_WITH_COCOA_QT
 VBOX_DI_VBAPP_MISC_FILES += \
-        Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/classes.nib \
-        Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/info.nib \
-        Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib
+        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
 endif
 
@@ -688 +688 @@
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
         Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \
-        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)VBox.framework/$(qtmod)VBox=>Versions/4/$(qtmod)VBox)
+        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/$(qtmod)$(VBOX_QT4_INFIX)=>Versions/4/$(qtmod)$(VBOX_QT4_INFIX))
 ifdef VBOX_WITH_COCOA_QT
 VBOX_DI_VBAPP_SYMLINKS += \
-        Frameworks/QtGuiVBox.framework/Resources=>Versions/4/Resources/
+        Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
 endif
 
@@ -741 +741 @@
                 $(if-expr defined(VBOX_WITH_PYTHON), $(addprefix $(VBOX_PATH_DIST)/, $(VBOX_DI_VBAPP_PYTHON_FILES)),) \
                 $(if-expr defined(VBOX_WITH_JXPCOM), $(addprefix $(VBOX_PATH_DIST)/, sdk/bindings/xpcom/java/vboxjxpcom.jar),) \
-                $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist,) \
+        $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist,) \
                 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
         $(call MSG_TOOL,PackageMaker,,,$@)
@@ -891 +891 @@
         @# We cannot use @executable_path together with setuid binaries, dyld gets upset about it. So, fix Qt libs and users.
         $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS) \
-                ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox \
-                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox$(NLTAB) )
+                ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \
+                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)$(NLTAB) )
         $(foreach f, \
                 $(VBOX_DI_VBAPP_DYLIBS) \
@@ -905 +905 @@
                 ,install_name_tool \
                         $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), \
-                                -change           @executable_path/../Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox \
-                                -change                                          $(qtmod)VBox.framework/Versions/4/$(qtmod)VBox \
-                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox \
+                                -change           @executable_path/../Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \
+                                -change                                          $(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \
                                 ) \
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) )