Changeset 2224 for trunk/kBuild

Timestamp:

Jan 8, 2009, 2:19:16 AM (17 years ago)

Author:

bird

Message:

kBuild: Implemented flex and yacc/bison support. Fixes #18.

Location:

trunk/kBuild

Files:

• tools/BISON.kmk (added)
• tools/FLEX.kmk (modified) (2 diffs)
• tools/YACC.kmk (added)
• units/lex.kmk (modified) (4 diffs)
• units/yacc.kmk (added)

trunk/kBuild/tools/FLEX.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2008 knut st. osmundsen <bird-src-spam@anduin.net>
+# Copyright (c) 2008-2009 knut st. osmundsen <bird-src-spam@anduin.net>
 #
 # This file is part of kBuild.
@@ -34 +34 @@
 TOOL_FLEX = flex
 TOOL_FLEX_LEX ?= flex$(HOSTSUFF_EXE)
-TOOL_FLEX_LEXFLAGS ?=
+
+#TOOL_FLEX_LEXFLAGS ?=
+TOOL_FLEX_LEX_OUT_FILE = $(evalcall KB_FN_OPT_TEST_SHORT_LONG,+,--c++,$(flags),$(outbase).cpp,$(outbase).c)
 TOOL_FLEX_LEX_OUTPUT =
+TOOL_FLEX_LEX_OUTPUT_MAYBE =
 TOOL_FLEX_LEX_DEPEND =
 TOOL_FLEX_LEX_DEPORD =
 define TOOL_FLEX_LEX_CMDS
-        $(TOOL_FLEX_LEX) $(flags) -o $(out) $(source)
+        $(QUIET)$(TOOL_FLEX_LEX) $(flags) -o $(out) $(source)
 endef
 
-

trunk/kBuild/units/lex.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2008 knut st. osmundsen <bird-src-spam@anduin.net>
+# Copyright (c) 2008-2009 knut st. osmundsen <bird-src-spam@anduin.net>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
+ifdef UNIT_lex
+ $(error kBuild: The lex unit was included twice!)
+endif
 UNIT_lex = lex
+
+# Add our target properties.
+PROPS_TOOLS += LEXTOOL
+PROPS_SINGLE += LEXTOOL
+PROPS_ACCUMULATE_R += LEXFLAGS
 
 # Add ourselves to the default source handlers.
@@ -73 +81 @@
 _OUT_FILES += $(out) $(output_extra) $(output_maybe)
 $(target)_GEN_SOURCES_ += $(out)
+$(target)_INTERMEDIATES += $(intermediates)
 
 endef # def_lex_rule
@@ -125 +134 @@
 local output_maybe := $(TOOL_$(tool)_LEX_OUTPUT_MAYBE)
 local deps += $(TOOL_$(tool)_LEX_DEPEND) $(source)
-local orderdeps += $(TOOL_$(tool)_LEX_DEPORD)
+local orderdeps += $(TOOL_$(tool)_LEX_DEPORD) $(dirdep)
+
+# Whether it generates a header file depends on the tool / flags.
+local intermediates := $(filter %.h %.hpp %.h++ %.H,$(output_extra))
 
 # generate the rule.