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

Timestamp:

Aug 26, 2010 6:23:16 PM (14 years ago)

Author:

vboxsync

Message:

Installer: unify Qt4 module handling

File:

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

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

@@ -546 +546 @@
 # The VirtualBox Application.
 #
-VBOX_DI_VBAPP_QTMODS = \
-        QtCore QtGui QtNetwork
-
-ifdef VBOX_GUI_USE_QGL
- VBOX_DI_VBAPP_QTMODS += QtOpenGL
-endif
 
 VBOX_DI_VBAPP_DYLIBS = \
-        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)) \
+        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/$(qtmod)) \
         MacOS/VBoxDD.dylib \
         MacOS/VBoxDD2.dylib \
@@ -693 +687 @@
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
         Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \
-        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/$(qtmod)$(VBOX_QT4_INFIX)=>Versions/4/$(qtmod)$(VBOX_QT4_INFIX))
+        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
 ifdef VBOX_WITH_COCOA_QT
 VBOX_DI_VBAPP_SYMLINKS += \
@@ -895 +889 @@
 if 1
         @# 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_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 qtmod, $(VBOX_QT4_MOD_NAMES) \
+                ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod)$(NLTAB) )
         $(foreach f, \
                 $(VBOX_DI_VBAPP_DYLIBS) \
@@ -909 +903 @@
                         ) \
                 ,install_name_tool \
-                        $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), \
-                                -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              $(VBOX_PATH_QT4)/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                          $(PATH_SDK_QT4)/$(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) \
+                        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), \
+                                -change           @executable_path/../Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                                -change              $(VBOX_PATH_QT4)/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                                -change                          $(PATH_SDK_QT4)/$(qtmod).framework/Versions/4/$(qtmod) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
+                                -change                                          $(qtmod).framework/Versions/4/$(qtmod) \
+                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
                                 ) \
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) )