Changeset 53974 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

Timestamp:

Jan 27, 2015 5:50:17 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Morphing it into an extension pack, adding a wrapper binary, VBoxDTrace, that calls dtrace or the extension pack depending on what it finds. Build fixes for recent linux.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (moved) (moved from trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTrace/Makefile.kmk ) (6 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-makefile for VBoxDTraceR0.
+# Sub-makefile for VBoxDTrace.
 #
 # Contributed by: bird
@@ -18 +18 @@
 #
 
-SUB_DEPTH = ../../../../../
+SUB_DEPTH = ../../../../
 include $(KBUILD_PATH)/subheader.kmk
 
+
+#
+# The generic wrapper that selects native or extpack dtrace cmd and adds our
+# library path to the command line.
+#
+# Note! This is not installed as part of the extension pack, but always shipped
+#       with the base VBox installation.
+#
 PROGRAMS += VBoxDTrace
-VBoxDTrace_TEMPLATE = VBOXR3NPEXE
-VBoxDTrace_DEFS = RTMEM_WRAP_TO_EF_APIS
-#VBoxDTrace_DEFS += YYDEBUG
-VBoxDTrace_SDKS = VBOX_ZLIB
+VBoxDTrace_TEMPLATE := VBOXR3EXE
+VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
+VBoxDTrace_LIBS = $(LIB_RUNTIME)
+
+
+#
+# Install the description.
+#
+INSTALLS += VBoxDTraceIns
+VBoxDTraceIns_TEMPLATE = VBoxInsExtPackDTrace
+VBoxDTraceIns_SOURCES = \
+        $(VBoxDTraceIns_0_OUTDIR)/ExtPack.xml \
+        COPYING=>ExtPack-SourceCodeLicense.txt
+$(call VBOX_EDIT_VERSION_RULE_FN,VBoxDTraceIns,ExtPack.xml)
+
+
+#
+# The ring-3 VBoxDTrace command implementation (library).
+#
+DLLS += VBoxDTraceCmd
+VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
+VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS
+#VBoxDTraceCmd_DEFS += YYDEBUG
+VBoxDTraceCmd_SDKS = VBOX_ZLIB
 ifn1of ($(KBUILD_TARGET), win)
- VBoxDTrace_CFLAGS = -Wno-format
+ VBoxDTraceCmd_CFLAGS = -Wno-format -Wno-overlength-strings -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
 endif
-VBoxDTrace_INCS = \
-        ../include \
+VBoxDTraceCmd_INCS = \
+        include \
         $(VBOXDT_PATH_UTS)/common \
         $(VBOXDT_PATH_LIBCTF)/common \
         $(VBOXDT_PATH_LIBDTRACE)/common \
         $(VBOXDT_PATH_CMN_CTF)
-VBoxDTrace_SOURCES = \
+VBoxDTraceCmd_SOURCES = \
         $(VBOXDT_PATH_CMD)/dtrace/dtrace.c \
         \
@@ -70 +98 @@
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_xlator.c \
         \
-        $(VBoxDTrace_0_OUTDIR)/dt_errtags.c \
-        $(VBoxDTrace_0_OUTDIR)/dt_names.c \
+        $(VBoxDTraceCmd_0_OUTDIR)/dt_errtags.c \
+        $(VBoxDTraceCmd_0_OUTDIR)/dt_names.c \
         \
         $(VBOXDT_PATH_CMN_CTF)/ctf_create.c \
@@ -87 +115 @@
 
 if 1
- USES                += yacc
- VBoxDTrace_USES     += yacc
- VBoxDTrace_YACCTOOL  = BISON
- VBoxDTrace_YACCFLAGS = -d -y
- VBoxDTrace_SOURCES  += \
+ USES                   += yacc
+ VBoxDTraceCmd_USES     += yacc
+ VBoxDTraceCmd_YACCTOOL  = BISON
+ VBoxDTraceCmd_YACCFLAGS = -d -y
+ VBoxDTraceCmd_SOURCES  += \
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_grammar.y
- VBoxDTrace_INCS     += $(VBoxDTrace_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
+ VBoxDTraceCmd_INCS     += $(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
 else
  # TODO: generate these.
@@ -99 +127 @@
 
 if 1
- USES                += lex
- VBoxDTrace_USES     += lex
- VBoxDTrace_LEXTOOL   = FLEX
- VBoxDTrace_LEXFLAGS  = -l -B #-d -T
- VBoxDTrace_DEFS     += USING_FLEX
- VBoxDTrace_SOURCES  += \
+ USES                   += lex
+ VBoxDTraceCmd_USES     += lex
+ VBoxDTraceCmd_LEXTOOL   = FLEX
+ VBoxDTraceCmd_LEXFLAGS  = -l -B #-d -T
+ VBoxDTraceCmd_DEFS     += USING_FLEX
+ VBoxDTraceCmd_SOURCES  += \
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_lex.l
 else
@@ -110 +138 @@
 endif
 
-VBoxDTrace_LIBS = \
+VBoxDTraceCmd_LIBS = \
         $(LIB_RUNTIME)
 
 
 # Generate sources
-$$(VBoxDTrace_0_OUTDIR)/dt_errtags.c: \
+$$(VBoxDTraceCmd_0_OUTDIR)/dt_errtags.c: \
                 $(VBOXDT_PATH_LIBDTRACE)/common/dt_errtags.h \
                 $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed \
                 | $$(dir $$@)
-        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(MSG_GENERATE,VBoxDTraceCmd,$@,$<)
         $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed --output $@ $<
 
-$$(VBoxDTrace_0_OUTDIR)/dt_names.c: \
+$$(VBoxDTraceCmd_0_OUTDIR)/dt_names.c: \
                 $(VBOXDT_PATH_UTS)/common/sys/dtrace.h \
                 $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed \
                 | $$(dir $$@)
-        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(MSG_GENERATE,VBoxDTraceCmd,$@,$<)
         $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed --output $@ $<
 
 
 #
-# Sournce not used or wanted: \
+# Source not used or wanted: \
 #       $(VBOXDT_PATH_LIBDTRACE)/common/dt_link.c
 #       $(VBOXDT_PATH_LIBDTRACE)/common/dt_pid.c
 #
 
+
+#
+# The ring-0 part of VBoxDTrace.
+#
+SYSMODS += VBoxDTraceR0
+VBoxDTraceR0_TEMPLATE = VBoxR0ExtPackDTrace
+VBoxDTraceR0_DEFS = IN_VBOXDTRACE_R0 IN_RT_R0
+ifeq ($(VBOX_LDR_FMT),elf)
+ VBoxDTraceR0_LDFLAGS = -e ModuleInit
+endif
+VBoxDTraceR0_INCS = \
+        include \
+        $(VBOXDT_PATH_UTS)/common
+VBoxDTraceR0_SOURCES = \
+        VBoxDTraceR0.cpp \
+        VBoxDTraceR0A.asm \
+        $(VBOXDT_PATH_UTS)/common/dtrace/dtrace.c
+VBoxDTraceR0_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
+ VBoxDTraceR0_LIBS += \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
+endif
+
+
 include $(FILE_KBUILD_SUB_FOOTER)