# HG changeset patch # User Paul Boddie # Date 1611426094 -3600 # Node ID 034a494c888e06cc38a7b986f8973260ef00f73e # Parent 3391b63017f84916b6beaf34281108a64897c58b# Parent 92f9e337e685f4ff832dcab5fb40e8ca7c63c7f0 Merged concurrent development branches. diff -r 3391b63017f8 -r 034a494c888e docs/wiki/Development --- a/docs/wiki/Development Sat Jan 23 19:20:28 2021 +0100 +++ b/docs/wiki/Development Sat Jan 23 19:21:34 2021 +0100 @@ -165,8 +165,8 @@ #transform notugly digraph rule_structure { - graph [fontsize="15.0",fontname="Helvetica"]; - node [shape=record,fontname="Helvetica"]; + graph [fontsize="15.0",fontname="sans-serif"]; + node [shape=record,fontname="sans-serif"]; attributes1 [label="{attributes | { attribute | attributes}}"]; first [label="{attribute | { \"first\" | ... }}"]; @@ -190,8 +190,8 @@ #transform notugly digraph natural_structure { - graph [fontsize="15.0",fontname="Helvetica"]; - node [shape=record,fontname="Helvetica"]; + graph [fontsize="15.0",fontname="sans-serif"]; + node [shape=record,fontname="sans-serif"]; first [label="{attribute | { \"first\" | ... | tail }}"]; second [label="{attribute | { \"second\" | ... | tail }}"]; @@ -220,8 +220,8 @@ #transform notugly digraph types { - graph [fontsize="15.0",fontname="Helvetica"]; - node [shape=record,fontname="Helvetica"]; + graph [fontsize="15.0",fontname="sans-serif"]; + node [shape=record,fontname="sans-serif"]; interface [label="{interface | {name | signatures | attributes | includes | tail}}"]; signature [label="{signature | {qualifier | operation |

parameters | attributes | tail}}"]; @@ -318,8 +318,8 @@ #transform notugly digraph compound { - graph [fontsize="15.0",fontname="Helvetica"]; - node [shape=box,fontname="Helvetica",style=filled,fillcolor=white]; + graph [fontsize="15.0",fontname="sans-serif"]; + node [shape=box,fontname="sans-serif",style=filled,fillcolor=white]; rankdir=LR; parser [shape=ellipse]; @@ -375,8 +375,8 @@ #transform notugly digraph individual { - graph [fontsize="15.0",fontname="Helvetica"]; - node [shape=box,fontname="Helvetica",style=filled,fillcolor=white]; + graph [fontsize="15.0",fontname="sans-serif"]; + node [shape=box,fontname="sans-serif",style=filled,fillcolor=white]; rankdir=LR; parser [shape=ellipse]; diff -r 3391b63017f8 -r 034a494c888e docs/wiki/L4Re_Support --- a/docs/wiki/L4Re_Support Sat Jan 23 19:20:28 2021 +0100 +++ b/docs/wiki/L4Re_Support Sat Jan 23 19:21:34 2021 +0100 @@ -17,8 +17,8 @@ #format svg #transform notugly digraph processing { - node [shape=folder,fontsize="13.0",fontname="Helvetica"]; - edge [fontsize="13.0",fontname="Helvetica"]; + node [shape=folder,fontsize="13.0",fontname="sans-serif"]; + edge [fontsize="13.0",fontname="sans-serif"]; rankdir=LR; interface [label="Interface:\nfile.idl"]; @@ -189,8 +189,8 @@ #format svg #transform notugly digraph variables { - node [shape=folder,fontsize="13.0",fontname="Helvetica"]; - edge [fontsize="13.0",fontname="Helvetica"]; + node [shape=folder,fontsize="13.0",fontname="sans-serif"]; + edge [fontsize="13.0",fontname="sans-serif"]; rankdir=LR; IDL_DIR [label="IDL_DIR\nfile.idl\n..."]; @@ -274,8 +274,8 @@ #format svg #transform notugly digraph transformations { - node [shape=box,fontsize="13.0",fontname="Helvetica"]; - edge [fontsize="13.0",fontname="Helvetica"]; + node [shape=box,fontsize="13.0",fontname="sans-serif"]; + edge [fontsize="13.0",fontname="sans-serif"]; rankdir=LR; interface [label="file.idl"]; @@ -345,8 +345,8 @@ #transform notugly digraph example { - graph [fontsize="15.0",fontname="Helvetica",splines=ortho]; - node [shape=box,fontname="Helvetica",style=filled,fillcolor=white]; + graph [fontsize="15.0",fontname="sans-serif",splines=ortho]; + node [shape=box,fontname="sans-serif",style=filled,fillcolor=white]; edge [arrowhead=empty]; rankdir=BT; diff -r 3391b63017f8 -r 034a494c888e mk/export_comp_interface_c.mk --- a/mk/export_comp_interface_c.mk Sat Jan 23 19:20:28 2021 +0100 +++ b/mk/export_comp_interface_c.mk Sat Jan 23 19:21:34 2021 +0100 @@ -5,6 +5,7 @@ $(1)_INT_OPT = --comp=$(1) --comp-name=$(2) $$($(1)_INT_INC): $$($(1)_INT_IDL) + -mkdir -p $(IDL_EXPORT_DIR) $(IDL_PROG) -d $(IDL_EXPORT_DIR) $$($(1)_INT_OPT) --interfaces --language=c $$($(1)_INT_IDL) endif endef diff -r 3391b63017f8 -r 034a494c888e mk/export_comp_interface_cc.mk --- a/mk/export_comp_interface_cc.mk Sat Jan 23 19:20:28 2021 +0100 +++ b/mk/export_comp_interface_cc.mk Sat Jan 23 19:21:34 2021 +0100 @@ -5,6 +5,7 @@ $(1)_INT_OPT = --comp=$(1) --comp-name=$(2) $$($(1)_INT_INC): $$($(1)_INT_IDL) + -mkdir -p $(IDL_EXPORT_DIR) $(IDL_PROG) -d $(IDL_EXPORT_DIR) $$($(1)_INT_OPT) --interfaces --language=c++ $$($(1)_INT_IDL) endif endef diff -r 3391b63017f8 -r 034a494c888e mk/export_interface_c.mk --- a/mk/export_interface_c.mk Sat Jan 23 19:20:28 2021 +0100 +++ b/mk/export_interface_c.mk Sat Jan 23 19:21:34 2021 +0100 @@ -4,6 +4,7 @@ $(1)_INT_INC = $(call export_includes,$(call interfaces_to_interface_h,$(1))) $$($(1)_INT_INC): $$($(1)_INT_IDL) + -mkdir -p $(IDL_EXPORT_DIR) $(IDL_PROG) -d $(IDL_EXPORT_DIR) --interfaces --language=c $$($(1)_INT_IDL) endif endef diff -r 3391b63017f8 -r 034a494c888e mk/export_interface_cc.mk --- a/mk/export_interface_cc.mk Sat Jan 23 19:20:28 2021 +0100 +++ b/mk/export_interface_cc.mk Sat Jan 23 19:21:34 2021 +0100 @@ -4,6 +4,7 @@ $(1)_INT_INC = $(call export_includes,$(call interfaces_to_interface_h,$(1))) $$($(1)_INT_INC): $$($(1)_INT_IDL) + -mkdir -p $(IDL_EXPORT_DIR) $(IDL_PROG) -d $(IDL_EXPORT_DIR) --interfaces --language=c++ $$($(1)_INT_IDL) endif endef diff -r 3391b63017f8 -r 034a494c888e mk/idl.mk --- a/mk/idl.mk Sat Jan 23 19:20:28 2021 +0100 +++ b/mk/idl.mk Sat Jan 23 19:21:34 2021 +0100 @@ -46,3 +46,7 @@ # without duplicate words. common_interfaces = $(sort $(foreach INTERFACE,$(1),$(value $(INTERFACE)_INTERFACES))) + +# Generation of exported interface header file locations. + +exported_interfaces_h = $(foreach INTERFACE,$(call interfaces_to_interface_h,$(1)),$(call export_includes,$(INTERFACE)))