Changeset 17642 in vbox

Timestamp:

Mar 10, 2009 4:30:54 PM (16 years ago)

Author:

vboxsync

Message:

tools: Qt 4.4.3 for solaris

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -3015 +3015 @@
  TEMPLATE_VBOXQT4GUIEXE_SDKS = QT4
  ifdef VBOX_WITH_QT4_SUN
-  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.amd64 darwin.x86 linux.amd64 linux.x86)
+  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86)
    TEMPLATE_VBOXQT4GUIEXE_QT_INFIX = VBox
   else ifneq ($(KBUILD_TARGET),darwin) ## @todo convert all builds to 'VBox' lib infix!

trunk/Makefile.kmk

@@ -194 +194 @@
         $(VBOX_PATH_QT4_LIB)/VBoxQtNetwork4.dll \
         $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll
-
- else ifeq ($(KBUILD_TARGET),linux)
+ else if1of ($(KBUILD_TARGET),linux solaris)
   qt4-bin_INST = $(INST_BIN)
   qt4-bin_SOURCES = \

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

@@ -63 +63 @@
 endif
 SOL_OBJCOPY            := /usr/sfw/bin/gobjcopy --strip-unneeded -R .comment
+
+
+# Figure out the paths to the two platform specific Qt4 directories
+SOLARIS_PATH_QT_32 = $(subst solaris.$(KBUILD_TARGET_ARCH),solaris.x86,$(VBOX_PATH_QT4))
+SOLARIS_PATH_QT_64 = $(subst solaris.$(KBUILD_TARGET_ARCH),solaris.amd64,$(VBOX_PATH_QT4))
 
 # Base package
@@ -151 +156 @@
         $(if $(VBOX_WITH_QTGUI),\
           VBoxKeyboard.so \
-          libVBoxQtCore.so.4 \
-          libVBoxQtGui.so.4 \
+          libQtCoreVBox.so.4 \
+          libQtGuiVBox.so.4 \
+          libQtNetworkVBox.so.4 \
           accessible/libqtaccessiblewidgets.so,) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so,) \
@@ -221 +227 @@
 # These extra Qt libs are purely for running VBoxQtconfig
 ifdef VBOX_WITH_QTGUI
- SOLARIS_QTLIBS = libVBoxQtNetwork.so.4 \
-        libVBoxQtXml.so.4 \
-        libVBoxQtSql.so.4 \
-        libVBoxQt3Support.so.4
+ SOLARIS_QTLIBS = \
+        libQtXmlVBox.so.4 \
+        libQtSqlVBox.so.4 \
+        libQt3SupportVBox.so.4
 endif
 
@@ -414 +420 @@
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_32)/VBoxPython.so    $(SOLARIS_INST_DIR_32)/VBoxPython.so,)
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_INST_DIR_64)/$(VBOX_SOL_PYTHON_DIR_64)/VBoxPython.so,)
-        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/bin/qtconfig            $(SOLARIS_INST_DIR_32)/VBoxQtconfig,)
-        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.amd64/qt/v4.3.3-r1/bin/qtconfig          $(SOLARIS_INST_DIR_64)/VBoxQtconfig,)
+        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_32)/bin/qtconfig                                $(SOLARIS_INST_DIR_32)/VBoxQtconfig,)
+        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_64)/bin/qtconfig                                $(SOLARIS_INST_DIR_64)/VBoxQtconfig,)
         $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN_32)/VBoxISAExec                                                         $(SOLARIS_INST_DIR)/VBoxISAExec
 else
@@ -424 +430 @@
         $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN)/VBoxPython.so       $(SOLARIS_INST_DIR_ISA)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,)VBoxPython.so
  endif
-        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/bin/qtconfig                    $(SOLARIS_INST_DIR_ISA)/VBoxQtconfig,)
+        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(VBOX_PATH_QT4)/bin/qtconfig                                     $(SOLARIS_INST_DIR_ISA)/VBoxQtconfig,)
         $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN)/VBoxISAExec                                                            $(SOLARIS_INST_DIR)/VBoxISAExec
 endif
@@ -491 +497 @@
 
 $(addprefix $(SOLARIS_INST_DIR_32)/,$(SOLARIS_QTLIBS)): \
-                $(SOLARIS_INST_DIR_32)/% : $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/lib/% | $$(dir $$@)
+                $(SOLARIS_INST_DIR_32)/% : $(SOLARIS_PATH_QT_32)/lib/% | $$(dir $$@)
         $(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s,) $< $@
 
@@ -518 +524 @@
 
 $(addprefix $(SOLARIS_INST_DIR_64)/,$(SOLARIS_QTLIBS)): \
-                $(SOLARIS_INST_DIR_64)/% : $(PATH_DEVTOOLS)/solaris.amd64/qt/v4.3.3-r1/lib/% | $$(dir $$@)
+                $(SOLARIS_INST_DIR_64)/% : $(SOLARIS_PATH_QT_64)/lib/% | $$(dir $$@)
         $(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s,) $< $@