Changeset 53658 in vbox for trunk

Timestamp:

Jan 2, 2015 12:31:02 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Generated dt_names.c and dt_errtags.c. (r35)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTrace/Makefile.kmk (modified) (4 diffs)
• onnv/lib/libdtrace/common/mkerrtags.sed (added)
• onnv/lib/libdtrace/common/mkerrtags.sh (modified) (3 diffs)
• onnv/lib/libdtrace/common/mknames.sed (added)

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

@@ -76 +76 @@
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_xlator.c \
         \
+        $(VBoxDTrace_0_OUTDIR)/dt_errtags.c \
+        $(VBoxDTrace_0_OUTDIR)/dt_names.c \
+        \
         $(VBOXDT_PATH_CMN_CTF)/ctf_create.c \
         $(VBOXDT_PATH_CMN_CTF)/ctf_error.c \
@@ -110 +113 @@
  VBoxDTrace_INCS     += $(VBoxDTrace_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
 else
- # fixme later
+ # TODO: generate these.
 endif
 
 if 1
- USES                 = lex
- VBoxDTrace_USES      = lex
+ USES                += lex
+ VBoxDTrace_USES     += lex
  VBoxDTrace_LEXTOOL   = FLEX
  VBoxDTrace_LEXFLAGS  = -l
@@ -122 +125 @@
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_lex.l
 else
- VBoxDTrace_SOURCES  += \
-        generated/dt_lex.c
- VBoxDTrace_INCS.win  += \
-        generated/hdrhacks
+ # TODO: generate this.
 endif
 
@@ -131 +131 @@
         $(LIB_RUNTIME)
 
+
+# Generate sources
+$$(VBoxDTrace_0_OUTDIR)/dt_errtags.c: \
+                $(VBOXDT_PATH_LIBDTRACE)/common/dt_errtags.h \
+                $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed \
+                | $$(dir $$@)
+        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed --output $@ $<
+
+$$(VBoxDTrace_0_OUTDIR)/dt_names.c: \
+                $(VBOXDT_PATH_UTS)/common/sys/dtrace.h \
+                $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed \
+                | $$(dir $$@)
+        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed --output $@ $<
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/mkerrtags.sh

@@ -1 @@
-#!/bin/sh
+#!/usr/bin/env kmk_ash
 #
 # CDDL HEADER START
@@ -27 +27 @@
 #ident  "%Z%%M% %I%     %E% SMI"
 
+
 echo "\
 /*\n\
@@ -39 +40 @@
 static const char *const _dt_errtags[] = {"
 
-pattern='^      \(D_[A-Z0-9_]*\),*'
-replace='       "\1",'
-
-sed -n "s/$pattern/$replace/p" || exit 1
+# WARNING: Tabs in expressions.
+#pattern='^     \(D_[A-Z0-9_]*\),*'
+#replace='      "\1",'
+#
+#sed -n "s/$pattern/$replace/p" || exit 1
+set -x
+kmk_sed --lang_c -n 's/^[[:space:]]*\(D_[A-Z0-9_]*\),*/ "\1",/p' $1 || exit 1
 
 echo "\