Changeset 32012 in vbox

Timestamp:

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

Author:

vboxsync

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

65259

Message:

Installer: unify Qt4 module handling

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -3433 +3433 @@
  endif
 
+ VBOX_QT4_MOD = QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
+ VBOX_QT4_MOD_NAMES = $(foreach qtmod,$(VBOX_QT4_MOD),$(qtmod)$(VBOX_QT4_INFIX))
+
  #
  # Handmade configuration of qt4 - very annoying, this needs to

trunk/Makefile.kmk

@@ -191 +191 @@
  qt4-bin_MODE = 755
  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
- qt4-bin_SOURCES = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \
-        ,$(PATH_SDK_QT4_LIB)/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)=>Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX))
+ qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \
+        ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod))
  ifdef VBOX_WITH_COCOA_QT
   qt4-bin_SOURCES += \
@@ -203 +203 @@
         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
  endif
- qt4-bin_SYMLINKS = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \
-                ,Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/$(qtmod)$(VBOX_QT4_INFIX)=>Versions/4/$(qtmod)$(VBOX_QT4_INFIX))
+ qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+                ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
  ifdef VBOX_WITH_COCOA_QT
   qt4-bin_SYMLINKS += \
@@ -216 +216 @@
    qt4-bin_INST = $(INST_BIN)
    qt4-bin_SOURCES = \
-        $(VBOX_PATH_QT4_LIB)/QtCoreVBox4.dll \
-        $(VBOX_PATH_QT4_LIB)/QtGuiVBox4.dll \
-        $(VBOX_PATH_QT4_LIB)/QtNetworkVBox4.dll \
-        $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/QtOpenGLVBox4.dll,) \
-        $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll
+        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/$(qtmod)4$(SUFF_DLL))
+        $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL)=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
   else
    INSTALLS += qt4-bin
@@ -226 +223 @@
    qt4-bin_INST = $(INST_BIN)
    qt4-bin_SOURCES = \
-        $(VBOX_PATH_QT4_LIB)/libQtCoreVBox.so.4 \
-        $(VBOX_PATH_QT4_LIB)/libQtGuiVBox.so.4 \
-        $(VBOX_PATH_QT4_LIB)/libQtNetworkVBox.so.4 \
-        $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/libQtOpenGLVBox.so.4,) \
+        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/lib$(qtmod)$(SUFF_DLL).4)
         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
   endif

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) )