Changeset 53983 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 27, 2015 9:35:39 PM (10 years ago)

Author:

vboxsync

Message:

Checked in bison and flex output for VBoxDTrace so we can build on systems that doesn't have these tools..

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• Config.kmk (deleted)
• Makefile.kmk (modified) (6 diffs)
• generated (added)
• generated/dt_grammar.c (added)
• generated/dt_grammar.h (added)
• generated/dt_lex.c (added)

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

@@ -29 +29 @@
 VBOX_PATH_EXTPACK_VBOXDTRACE = $(PATH_STAGE)/$(INST_EXTPACK)$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)
 INST_EXTPACK_VBOXDTRACE = $(INST_EXTPACK)$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/
+
+VBOXDT_PATH                := $(PATH_ROOT)/src/VBox/ExtPacks/VBoxDTrace
+VBOXDT_PATH_ONNV           := $(VBOXDT_PATH)/onnv
+VBOXDT_PATH_UTS            := $(VBOXDT_PATH_ONNV)/uts
+VBOXDT_PATH_CMD            := $(VBOXDT_PATH_ONNV)/cmd
+VBOXDT_PATH_LIBCTF         := $(VBOXDT_PATH_ONNV)/lib/libctf
+VBOXDT_PATH_CMN_CTF        := $(VBOXDT_PATH_ONNV)/common/ctf
+VBOXDT_PATH_LIBDTRACE      := $(VBOXDT_PATH_ONNV)/lib/libdtrace
+VBOXDT_PATH_CMN_DTRACE     := $(VBOXDT_PATH_ONNV)/common/dtrace
 
 
@@ -151 +160 @@
         $(VBOXDT_PATH_LIBCTF)/common/ctf_lib.c
 
- if 1
+ ifdef VBOX_HAVE_BISON
   USES                   += yacc
   VBoxDTraceCmd_USES     += yacc
@@ -160 +169 @@
   VBoxDTraceCmd_INCS     += $(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
  else
-  # TODO: generate these.
- endif
-
- if 1
+  VBoxDTraceCmd_SOURCES  += \
+        $(VBOXDT_PATH)/generated/dt_grammar.c
+  VBoxDTraceCmd_INCS     += \
+        $(VBOXDT_PATH)/generated/
+ endif
+
+ ifdef VBOX_HAVE_FLEX
   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
-  # TODO: generate this.
- endif
+  VBoxDTraceCmd_SOURCES  += \
+        $(VBOXDT_PATH)/generated/dt_lex.c
+ endif
+ VBoxDTraceCmd_DEFS      += USING_FLEX
 
  VBoxDTraceCmd_LIBS = \
@@ -194 +207 @@
         $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed --output $@ $<
 
-
  #
  # Source not used or wanted: \
@@ -201 +213 @@
  #
 
+ #
+ # Updates the sources generated by flex and biosn.
+ # The SED processing removes the paths the from #line statements.
+ #
+ vboxdtrace-update-generated-sources: \
+                $$(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_grammar.c \
+                $$(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_grammar.h \
+                $$(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.c
+        $(foreach file,dt_grammar.c dt_grammar.h dt_lex.c \
+                ,$(NLTAB)$(SED)  -e 's,$(VBOXDT_PATH_LIBDTRACE)/common/,,g'\
+                -e 's,$(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/,,g' \
+                --output $(VBOXDT_PATH)/generated/$(file) \
+                $(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/$(file))
 
  #
@@ -313 +338 @@
 endif # VBOX_WITH_EXTPACK_VBOXDTRACE
 
+
 include $(FILE_KBUILD_SUB_FOOTER)