- Timestamp:
- Aug 25, 2010 6:12:00 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
Config.kmk (modified) (2 diffs)
-
Makefile.kmk (modified) (1 diff)
-
src/VBox/Installer/darwin/Makefile.kmk (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r31911 r31967 3429 3429 endif 3430 3430 3431 ifdef VBOX_WITH_QT4_SUN 3432 VBOX_QT4_INFIX=VBox 3433 endif 3434 3431 3435 # 3432 3436 # Handmade configuration of qt4 - very annoying, this needs to … … 3481 3485 TEMPLATE_VBOXQT4GUIEXE_LRCTOOL = QT4 3482 3486 TEMPLATE_VBOXQT4GUIEXE_SDKS = QT4 3483 ifdef VBOX_WITH_QT4_SUN 3484 TEMPLATE_VBOXQT4GUIEXE_QT_INFIX = VBox 3485 endif 3487 TEMPLATE_VBOXQT4GUIEXE_QT_INFIX = $(VBOX_QT4_INFIX) 3486 3488 TEMPLATE_VBOXQT4GUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) 3487 3489 TEMPLATE_VBOXQT4GUIEXE_RCDEFS = $(TEMPLATE_VBOXR3EXE_RCDEFS) -
trunk/Makefile.kmk
r31889 r31967 183 183 184 184 185 ifdef VBOX_WITH_QT4_SUN186 185 # 187 186 # Install our Qt DLLs / Shared Objects / Frameworks. 188 187 # Note: The installer fixes the darwin .dylibs when hardening is enabled. 189 188 # 189 ifeq ($(KBUILD_TARGET),darwin) 190 190 INSTALLS += qt4-bin 191 191 qt4-bin_MODE = 755 192 ifeq ($(KBUILD_TARGET),darwin)193 qt4-bin_INST = $(INST_VIRTUALBOX)Contents/194 qt4-bin_SOURCES = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \195 ,$(VBOX_PATH_QT4)/Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox=>Frameworks/$(qtmod)VBox.framework/Versions/4/$(qtmod)VBox)196 ifdef VBOX_WITH_COCOA_QT197 qt4-bin_SOURCES +=\198 $(VBOX_PATH_QT4)/Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/classes.nib=>Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/classes.nib \199 $(VBOX_PATH_QT4)/Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/info.nib=>Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/info.nib \200 $(VBOX_PATH_QT4)/Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib=>Frameworks/QtGuiVBox.framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib201 endif192 qt4-bin_INST = $(INST_VIRTUALBOX)Contents/ 193 qt4-bin_SOURCES = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \ 194 ,$(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)) 195 ifdef VBOX_WITH_COCOA_QT 196 qt4-bin_SOURCES += \ 197 $(PATH_SDK_QT4_LIB)/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/classes.nib \ 198 $(PATH_SDK_QT4_LIB)/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/info.nib \ 199 $(PATH_SDK_QT4_LIB)/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 200 endif 201 ifneq ($(wildcard $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib),) 202 202 qt4-bin_SOURCES += \ 203 203 $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib 204 qt4-bin_SYMLINKS = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \ 205 ,Frameworks/$(qtmod)VBox.framework/$(qtmod)VBox=>Versions/4/$(qtmod)VBox) 206 ifdef VBOX_WITH_COCOA_QT 207 qt4-bin_SYMLINKS += \ 208 Frameworks/QtGuiVBox.framework/Resources=>Versions/4/Resources/ 204 endif 205 qt4-bin_SYMLINKS = $(foreach qtmod, QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL), QtOpenGL,) \ 206 ,Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/$(qtmod)$(VBOX_QT4_INFIX)=>Versions/4/$(qtmod)$(VBOX_QT4_INFIX)) 207 ifdef VBOX_WITH_COCOA_QT 208 qt4-bin_SYMLINKS += \ 209 Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/ 210 endif 211 else 212 ifdef VBOX_WITH_QT4_SUN 213 ifeq ($(KBUILD_TARGET),win) 214 INSTALLS += qt4-bin 215 qt4-bin_MODE = 755 216 qt4-bin_INST = $(INST_BIN) 217 qt4-bin_SOURCES = \ 218 $(VBOX_PATH_QT4_LIB)/QtCoreVBox4.dll \ 219 $(VBOX_PATH_QT4_LIB)/QtGuiVBox4.dll \ 220 $(VBOX_PATH_QT4_LIB)/QtNetworkVBox4.dll \ 221 $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/QtOpenGLVBox4.dll,) \ 222 $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll 223 else 224 INSTALLS += qt4-bin 225 qt4-bin_MODE = 755 226 qt4-bin_INST = $(INST_BIN) 227 qt4-bin_SOURCES = \ 228 $(VBOX_PATH_QT4_LIB)/libQtCoreVBox.so.4 \ 229 $(VBOX_PATH_QT4_LIB)/libQtGuiVBox.so.4 \ 230 $(VBOX_PATH_QT4_LIB)/libQtNetworkVBox.so.4 \ 231 $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/libQtOpenGLVBox.so.4,) \ 232 $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL) 209 233 endif 210 else ifeq ($(KBUILD_TARGET),win) 211 qt4-bin_INST = $(INST_BIN) 212 qt4-bin_SOURCES = \ 213 $(VBOX_PATH_QT4_LIB)/QtCoreVBox4.dll \ 214 $(VBOX_PATH_QT4_LIB)/QtGuiVBox4.dll \ 215 $(VBOX_PATH_QT4_LIB)/QtNetworkVBox4.dll \ 216 $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/QtOpenGLVBox4.dll,) \ 217 $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll 218 else 219 qt4-bin_INST = $(INST_BIN) 220 qt4-bin_SOURCES = \ 221 $(VBOX_PATH_QT4_LIB)/libQtCoreVBox.so.4 \ 222 $(VBOX_PATH_QT4_LIB)/libQtGuiVBox.so.4 \ 223 $(VBOX_PATH_QT4_LIB)/libQtNetworkVBox.so.4 \ 224 $(if $(VBOX_GUI_USE_QGL), $(VBOX_PATH_QT4_LIB)/libQtOpenGLVBox.so.4,) \ 225 $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL) 226 endif 227 endif # VBOX_WITH_QT4_SUN 234 endif # VBOX_WITH_QT4_SUN 235 endif 228 236 229 237 -
trunk/src/VBox/Installer/darwin/Makefile.kmk
r31940 r31967 554 554 555 555 VBOX_DI_VBAPP_DYLIBS = \ 556 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox) \556 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)) \ 557 557 MacOS/VBoxDD.dylib \ 558 558 MacOS/VBoxDD2.dylib \ … … 680 680 ifdef VBOX_WITH_COCOA_QT 681 681 VBOX_DI_VBAPP_MISC_FILES += \ 682 Frameworks/QtGui VBox.framework/Versions/4/Resources/qt_menu.nib/classes.nib \683 Frameworks/QtGui VBox.framework/Versions/4/Resources/qt_menu.nib/info.nib \684 Frameworks/QtGui VBox.framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib682 Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib \ 683 Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib \ 684 Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib 685 685 endif 686 686 … … 688 688 Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \ 689 689 Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \ 690 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod) VBox.framework/$(qtmod)VBox=>Versions/4/$(qtmod)VBox)690 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/$(qtmod)$(VBOX_QT4_INFIX)=>Versions/4/$(qtmod)$(VBOX_QT4_INFIX)) 691 691 ifdef VBOX_WITH_COCOA_QT 692 692 VBOX_DI_VBAPP_SYMLINKS += \ 693 Frameworks/QtGui VBox.framework/Resources=>Versions/4/Resources/693 Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/ 694 694 endif 695 695 … … 741 741 $(if-expr defined(VBOX_WITH_PYTHON), $(addprefix $(VBOX_PATH_DIST)/, $(VBOX_DI_VBAPP_PYTHON_FILES)),) \ 742 742 $(if-expr defined(VBOX_WITH_JXPCOM), $(addprefix $(VBOX_PATH_DIST)/, sdk/bindings/xpcom/java/vboxjxpcom.jar),) \ 743 743 $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist,) \ 744 744 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 745 745 $(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. 892 892 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS) \ 893 ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox\894 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox$(NLTAB) )893 ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \ 894 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX)$(NLTAB) ) 895 895 $(foreach f, \ 896 896 $(VBOX_DI_VBAPP_DYLIBS) \ … … 905 905 ,install_name_tool \ 906 906 $(foreach qtmod, $(VBOX_DI_VBAPP_QTMODS), \ 907 -change @executable_path/../Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox\908 /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox\909 -change $(qtmod) VBox.framework/Versions/4/$(qtmod)VBox\910 /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod) VBox.framework/Versions/4/$(qtmod)VBox\907 -change @executable_path/../Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \ 908 /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \ 909 -change $(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \ 910 /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod)$(VBOX_QT4_INFIX).framework/Versions/4/$(qtmod)$(VBOX_QT4_INFIX) \ 911 911 ) \ 912 912 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) )
Note:
See TracChangeset
for help on using the changeset viewer.
