Changeset 12948 in vbox for trunk

Timestamp:

Oct 2, 2008 4:48:50 PM (16 years ago)

Author:

vboxsync

Message:

VirtualBox4: moving VirtualBox4-accessible too the root makefile (qt4-bin).

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -161 +161 @@
 # Install our Qt DLLs / Shared Objects / Frameworks.
 #
-## @todo move to the root Makefile.kmk, and remove qt4-bin from INSTALLS below.
  INSTALLS += qt4-bin
- qt4-bin_MODE = 644
+ qt4-bin_MODE = 755
  ifeq ($(KBUILD_TARGET),darwin)
-  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/Frameworks/
+  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
   qt4-bin_SOURCES = \
-        $(VBOX_PATH_QT4)/Frameworks/QtCore.framework/Versions/4/QtCore=>QtCore.framework/Versions/4/QtCore \
-        $(VBOX_PATH_QT4)/Frameworks/QtGui.framework/Versions/4/QtGui=>QtGui.framework/Versions/4/QtGui
+        $(VBOX_PATH_QT4)/Frameworks/QtCore.framework/Versions/4/QtCore=>Frameworks/QtCore.framework/Versions/4/QtCore \
+        $(VBOX_PATH_QT4)/Frameworks/QtGui.framework/Versions/4/QtGui=>Frameworks/QtGui.framework/Versions/4/QtGui \
+        $(PATH_qt4-bin)/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
+  ## @todo r=bird: does this magic actually work for the hardended builds too? or is that handled in the installer???
+  qt4-bin_CLEAN = $(PATH_qt4-bin)/libqtaccessiblewidgets.dylib
+$$(PATH_qt4-bin)/libqtaccessiblewidgets.dylib: $$(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib | $$(dir $$@)
+        $(call MSG_TOOL,install_name_tool,accessible,$<,$@)
+        $(QUIET)$(INSTALL) $< $@
+        $(QUIET)install_name_tool \
+                -change                         QtCore.framework/Versions/4/QtCore \
+                 @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
+                -change                         QtGui.framework/Versions/4/QtGui \
+                 @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui \
+                $@
+
  else ifeq ($(KBUILD_TARGET),win)
   qt4-bin_INST = $(INST_BIN)
   qt4-bin_SOURCES = \
         $(VBOX_PATH_QT4_LIB)/VBoxQtCore4.dll \
-        $(VBOX_PATH_QT4_LIB)/VBoxQtGui4.dll
+        $(VBOX_PATH_QT4_LIB)/VBoxQtGui4.dll \
+        $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll
+
  else
   qt4-bin_INST = $(INST_BIN)
   qt4-bin_SOURCES = \
         $(VBOX_PATH_QT4_LIB)/libVBoxQtCore.so.4 \
-        $(VBOX_PATH_QT4_LIB)/libVBoxQtGui.so.4
+        $(VBOX_PATH_QT4_LIB)/libVBoxQtGui.so.4 \
+        $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets4$(SUFF_DLL)=>accessible/libqtaccessiblewidgets4$(SUFF_DLL)
  endif
 endif # VBOX_WITH_QT4_SUN

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -481 +481 @@
 
 
-if1of ($(KBUILD_TARGET), darwin win)
- #
- # Install the Qt accessible plugin.
- #
- ## @todo solaris, all linux distros where we distribute Qt4 on our own
- ## @todo r=bird: Does this really have to be in <appdir>/accessible? Why can
- #                it be put together with the other Qt files? That way it will
- #                be more generic wrt to places where we don't install Qt. It also
- #                means this installing should be moved and doesn't belong in qt4.kmk.
- INSTALLS += VirtualBox4-accessible
- VirtualBox4-accessible_INST = $(INST_BIN)accessible/
- VirtualBox4-accessible_INST.darwin = $(INST_VIRTUALBOX)Contents/MacOS/accessible/
- VirtualBox4-accessible_MODE = 0755
- ifeq ($(KBUILD_TARGET),win)
-  VirtualBox4-accessible_SOURCES = $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll
- else ifneq ($(KBUILD_TARGET,darwin))
-  VirtualBox4-accessible_SOURCES = $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets4$(SUFF_DLL)
-  $(error fixme)
- else
-  # We need to fix the dep lib paths here, so a bit extra work.
-  ## @todo r=bird: does this magic actually work for the hardended builds too? or is that handled in the installer???
-  VirtualBox4-accessible_SOURCES = $(VBOX_VIRTUALBOX4_OUT_DIR)/accessible/libqtaccessiblewidgets.dylib
-  VirtualBox4-accessible_CLEAN   = $(VirtualBox4-accessible_SOURCES)
-  VirtualBox4-accessible_BLDDIRS = $(dir $(VirtualBox4-accessible_SOURCES))
-$(VirtualBox4-accessible_SOURCES): $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib | $$(dir $$@)
-        $(call MSG_TOOL,install_name_tool,accessible,$<,$@)
-        $(QUIET)$(INSTALL) $< $@
-        $(QUIET)install_name_tool \
-                -change                         QtCore.framework/Versions/4/QtCore \
-                 @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
-                -change                         QtGui.framework/Versions/4/QtGui \
-                 @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui \
-                $@
- endif
-endif
-
 ifeq ($(KBUILD_TARGET),darwin)
 #