Changeset 12174 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2008 4:40:37 AM (16 years ago)

Author:

vboxsync

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

36140

Message:

Debugger: Use the qt3 unit.

File:

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

trunk/src/VBox/Debugger/Makefile.kmk

@@ -83 +83 @@
 # Debugger GUI component.
 #
+USES += qt3
 VBoxDbg_TEMPLATE = VBOXQTGUI
+VBoxDbg_USES = qt3
+VBoxDbg_QTTOOL = QT3
 VBoxDbg_DEFS = IN_DBG_R3
+VBoxDbg_INCS = .
 VBoxDbg_CXXFLAGS.linux = $(TEMPLATE_VBOXQTGUI_CXXFLAGS.linux) -O2
-VBoxDbg_INCS = \
-        . \
-        $(PATH_VBoxDbg)/ui \
-        $(PATH_VBoxDbg)/moc \
-        $(PATH_VBoxDbg)/include
-
-# QDesigner UI sources
-VBoxDbg_QT_UISRCS =
-
-# Headers containing definitions of classes that use the Q_OBJECT macro
-VBoxDbg_QT_MOCHDRS := \
-        $(PATH_SUB_CURRENT)/VBoxDbgConsole.h \
-        $(PATH_SUB_CURRENT)/VBoxDbgStats.h \
-        $(PATH_SUB_CURRENT)/VBoxDbgGui.h
-
-# UI headers (ui.h) containing local definitions of classes that use the Q_OBJECT macro
-VBoxDbg_QT_MOCUIHDRS =
-
-VBoxDbg_GENSRCS = \
-        $(foreach moc,$(notdir $(basename $(VBoxDbg_QT_MOCHDRS))), $(PATH_VBoxDbg)/moc/moc_$(moc).cpp) \
-        $(foreach ui,$(notdir $(basename $(VBoxDbg_QT_UISRCS))), $(PATH_VBoxDbg)/ui/$(ui).cpp $(PATH_VBoxDbg)/moc/moc_$(ui).cpp)
-
-VBoxDbg_GENHDRS = \
-        $(foreach mocui,$(basename $(VBoxDbg_QT_MOCUIHDRS)), $(PATH_VBoxDbg)/moc/$(mocui).moc) \
-        $(foreach moc,$(basename $(VBoxDbg_QT_MOCSRCS)), $(PATH_VBoxDbg)/moc/$(moc).moc) \
-        $(foreach ui,$(basename $(VBoxDbg_QT_UISRCS)), $(PATH_VBoxDbg)/$(ui).h)
-
+VBoxDbg_QT_MOCHDRS = \
+        VBoxDbgConsole.h \
+        VBoxDbgStats.h \
+        VBoxDbgGui.h
 VBoxDbg_SOURCES = \
-        $(VBoxDbg_GENSRCS) \
         VBoxDbg.cpp \
         VBoxDbgGui.cpp \
@@ -120 +100 @@
         VBoxDbgConsole.cpp \
         VBoxDbgStats.cpp
-
-VBoxDbg_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDbg.dylib
-
 VBoxDbg_LIBS = \
         $(LIB_VMM)
-
-# generated files we need to clean manually
-VBoxDbg_CLEAN += \
-        $(VBoxDbg_GENSRCS) \
-        $(VBoxDbg_GENHDRS)
+VBoxDbg_LDFLAGS.darwin = \
+        -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDbg.dylib
 
 
@@ -136 +110 @@
 #
 tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
+tstVBoxDbg_USES         = qt3
+tstVBoxDbg_QTTOOL       = QT3
 tstVBoxDbg_SOURCES      = testcase/tstVBoxDbg.cpp
 tstVBoxDbg_LIBS         = \
@@ -159 +135 @@
 include $(KBUILD_PATH)/subfooter.kmk
 
-
-#
-# Source file generation rules
-#
-
-##  Generate a rule to create a MOC source file from a header containing
-#   classes that use the Q_OBJECT macro.
-#   @param  $mochdr     the header file with Q_OBJECT
-define def_qt_gen_src_moc
-$(eval mocsrc := $(PATH_$(target))/moc/moc_$(notdir $(basename $(mochdr))).cpp)
-$$(mocsrc): $(mochdr)
-        $(call MSG_TOOL,moc,$(target),$(mocsrc),$(mochdr))
-        $(QUIET)$(MKDIR) -p $(basename $(mocsrc))
-        $(QUIET)$(VBOX_MOC) $(mochdr) -o $(mocsrc)
-
-endef
-
-##  Generate a rule to create a MOC include file from a source containing
-#   local classes that use the Q_OBJECT macro. This include is then included
-#   by that source, so it must be generated before the source gets compiled.
-#   @param  $mocsrc     the source file with Q_OBJECT
-define def_qt_gen_inc_moc
-$(eval mocobj := $(PATH_$(target)_$(mocsrc))/$(notdir $(basename $(mocsrc)))$(VBOX_SUFF_OBJ))
-$(eval mocinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocsrc))).moc)
-$$(mocobj): $(mocinc)
-$$(mocinc): $(mocsrc)
-        $(call MSG_TOOL,moc,$(target),$(mocsrc),$(mocinc))
-        $(QUIET)$(MKDIR) -p $(basename $(mocinc))
-        $(QUIET)$(VBOX_MOC) -i $(mocsrc) -o $(mocinc)
-
-endef
-
-##  Generate a rule to create a MOC include file from a UI header (ui.h) containing
-#   local classes that use the Q_OBJECT macro. This include is then included
-#   by that header, so it must be generated before the UI source gets compiled.
-#   @param  $mocuihdr     the UI header file with Q_OBJECT
-define def_qt_gen_inc_mocuihdr
-$(eval uisrc    := $(PATH_$(target))/ui/$(notdir $(basename $(basename $(mocuihdr)))).cpp)
-$(eval uiobj    := $(PATH_$(target)_$(uisrc))/$(notdir $(basename $(uisrc)))$(VBOX_SUFF_OBJ))
-$(eval mocuiinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocuihdr))).moc)
-$$(uisrc): $(mocuiinc)
-$$(mocuiinc): $(mocuihdr)
-        $(call MSG_TOOL,moc,$(target),$(mocuihdr),$(mocuiinc))
-        $(QUIET)$(MKDIR) -p $(basename $(mocuiinc))
-        $(QUIET)$(VBOX_MOC) -i $(mocuihdr) -o $(mocuiinc)
-
-endef
-
-define def_qt_gen_src_ui
-$(eval uisrc  := $(PATH_$(target))/ui/$(notdir $(basename $(uifile))).cpp)
-$(eval uihdr  := $(PATH_$(target))/ui/$(notdir $(basename $(uifile))).h)
-$(eval mocsrc := $(PATH_$(target))/moc/moc_$(notdir $(basename $(uifile))).cpp)
-
-$$(uihdr): $(uifile) | $(call DIRDEP,$(dir $(uihdr)))
-        $(call MSG_TOOL,uic,$(target),$(uifile),$(uihdr))
-        $(QUIET)$(VBOX_UIC) $(uifile) -o $(uihdr)
-
-$$(uisrc): $(uihdr) $(uifile) $(wildcard $(uifile).h) | $(call DIRDEP,$(dir $(uisrc)))
-        $(call MSG_TOOL,uic,$(target),$(uihdr),$(uisrc))
-        $(QUIET)$(VBOX_UIC) $(uifile) -i $(uihdr) -o $(uisrc)
-
-$$(mocsrc): $(uihdr) | $(call DIRDEP,$(dir $(mocsrc)))
-        $(call MSG_TOOL,uic,$(target),$(uihdr),$(mocsrc))
-        $(QUIET)$(VBOX_MOC) $(uihdr) -o $(mocsrc)
-
-endef
-
-## Generate rules for generating the Qt source for a target.
-# @param   $target  Target name.
-define def_qt_gen_src
-# moc srcs from hdrs with Q_OBJECT
-$(foreach mochdr,$($(target)_QT_MOCHDRS),$(eval $(def_qt_gen_src_moc)))
-# moc includes from srcs with Q_OBJECT
-$(foreach mocsrc,$($(target)_QT_MOCSRCS),$(eval $(def_qt_gen_inc_moc)))
-# moc includes from UI headers with Q_OBJECT
-$(foreach mocuihdr,$($(target)_QT_MOCUIHDRS),$(eval $(def_qt_gen_inc_mocuihdr)))
-# ui
-$(foreach uifile,$($(target)_QT_UISRCS)  ,$(eval $(def_qt_gen_src_ui)))
-# dirs
-$(call DIRDEP,$(PATH_$(target))/ui/) $(call DIRDEP,$(PATH_$(target))/moc/):
-        $(call MSG_MKDIR,$$@)
-        $(QUIET)$(MKDIR) -p $$@
-
-endef
-
-# Generate Qt sources.
-$(foreach target,VBoxDbg,$(eval $(def_qt_gen_src)))
-
-
-$(call DIRDEP,$(PATH_VBoxDbg)/include/):
-        $(call MSG_MKDIR,$@)
-        $(QUIET)$(MKDIR) -p $@
-
-
-#
-# Translation stuff
-#
-
-VBoxDbg_TRANSLATIONS = \
-        nls/VBoxDbg_de.ts
-
-updatenls:
-        $(VBOX_LUPDATE) $(VBoxDbg_SOURCES) $(VBoxDbg_QT_MOCHDRS) $(VBoxDbg_GENHDRS) -ts $(VBoxDbg_TRANSLATIONS)
-
-
-#
-# Hand made dependencies go here
-#
-$(PATH_VBoxDbg)/gen/ui/VBoxNewVMWzd$(VBOX_SUFF_OBJ):        $(PATH_VBoxDbg)/ui/VBoxNewVMWzd.h $(PATH_VBoxDbg)/ui/VBoxDiskImageMgrDlg.h
-$(PATH_VBoxDbg)/gen/ui/VBoxDiskImageMgrDlg$(VBOX_SUFF_OBJ): ui/VBoxDiskImageMgrDlg.ui $(PATH_VBoxDbg)/ui/VBoxNewHDWzd.h
-$(PATH_VBoxDbg)/gen/ui/VBoxCloseVMDlg$(VBOX_SUFF_OBJ):      $(PATH_VBoxDbg)/ui/VBoxCloseVMDlg.h
-
-
-test:
-        echo $(VBoxDbg_GENSRCS) | sed -e "s/ /\n/g"
-
-testwrappers: $(WRAPPERSFILE)
-