diff options
-rw-r--r-- | Makefile.moddir_rules | 5 | ||||
-rw-r--r-- | build_tools/get_moduleinfo | 3 | ||||
-rw-r--r-- | res/ari/ari_model_validators.c | 2 | ||||
-rw-r--r-- | res/ari/resource_channels.c | 5 | ||||
-rw-r--r-- | res/ari/resource_device_states.c | 5 | ||||
-rw-r--r-- | res/ari/resource_mailboxes.c | 5 | ||||
-rw-r--r-- | res/ari/resource_playbacks.c | 5 | ||||
-rw-r--r-- | res/ari/resource_recordings.c | 5 | ||||
-rw-r--r-- | res/res_ari_applications.c | 1 | ||||
-rw-r--r-- | res/res_ari_asterisk.c | 1 | ||||
-rw-r--r-- | res/res_ari_bridges.c | 1 | ||||
-rw-r--r-- | res/res_ari_channels.c | 1 | ||||
-rw-r--r-- | res/res_ari_device_states.c | 1 | ||||
-rw-r--r-- | res/res_ari_endpoints.c | 1 | ||||
-rw-r--r-- | res/res_ari_events.c | 1 | ||||
-rw-r--r-- | res/res_ari_mailboxes.c | 1 | ||||
-rw-r--r-- | res/res_ari_playbacks.c | 1 | ||||
-rw-r--r-- | res/res_ari_recordings.c | 1 | ||||
-rw-r--r-- | res/res_ari_sounds.c | 1 | ||||
-rw-r--r-- | rest-api-templates/ari_model_validators.c.mustache | 2 | ||||
-rw-r--r-- | rest-api-templates/res_ari_resource.c.mustache | 1 |
21 files changed, 43 insertions, 6 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 673580db1..3d3e6ad67 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -66,6 +66,7 @@ define MOD_ADD_SOURCE $$(if $$(filter $(1),$$(EMBEDDED_MODS)),modules.link,$(1).so): $$(subst $(3),$(5),$(2)) $$(subst $(3),$(5),$(2)): _ASTCFLAGS+=$$(call MOD_ASTCFLAGS,$(1)) .$(1).moduleinfo: MODULEINFO_EXTRA_OUTPUT=" $$(addprefix $$(SUBDIR)/,$$(subst $(3),$(5),$(2)) $$(subst $(3),$(4),$(2)))" +.$(1).moduleinfo: $(2) clean:: clean-$(1)$(3) @@ -148,12 +149,12 @@ dist-clean:: .%.moduleinfo: %.c @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.i $(SUBDIR)/$*.so$(MODULEINFO_EXTRA_OUTPUT)\">" > $@ - $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@ + $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $^ >> $@ echo "</member>" >> $@ .%.moduleinfo: %.cc @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.ii $(SUBDIR)/$*.so$(MODULEINFO_EXTRA_OUTPUT)\">" > $@ - $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@ + $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $^ >> $@ echo "</member>" >> $@ .moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS)))) diff --git a/build_tools/get_moduleinfo b/build_tools/get_moduleinfo index 92bc7e920..4dbb2942f 100644 --- a/build_tools/get_moduleinfo +++ b/build_tools/get_moduleinfo @@ -1,3 +1,4 @@ /\/\*\*\* MODULEINFO/ {printit=1; next} -/\*\*\*\// {if (printit) exit} +/<support_level>/ {if (gotsupportlevel) { next }; gotsupportlevel=1} +/\*\*\*\// {printit=0} /.*/ {if (printit) print} diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index db12f0000..37d31a1ab 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -24,7 +24,7 @@ * !!!!! DO NOT EDIT !!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * This file is generated by a mustache template. Please see the original - * template in rest-api-templates/ari_model_validators.h.mustache + * template in rest-api-templates/ari_model_validators.c.mustache */ #include "asterisk.h" diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c index e35fc8b05..297560175 100644 --- a/res/ari/resource_channels.c +++ b/res/ari/resource_channels.c @@ -24,7 +24,10 @@ */ /*** MODULEINFO - <depend type="module">res_stasis_app_playback</depend> + <depend type="module">res_stasis_answer</depend> + <depend type="module">res_stasis_playback</depend> + <depend type="module">res_stasis_recording</depend> + <depend type="module">res_stasis_snoop</depend> <support_level>core</support_level> ***/ diff --git a/res/ari/resource_device_states.c b/res/ari/resource_device_states.c index 53a3683a9..6f68d52e4 100644 --- a/res/ari/resource_device_states.c +++ b/res/ari/resource_device_states.c @@ -23,6 +23,11 @@ * \author Kevin Harwell <kharwell@digium.com> */ +/*** MODULEINFO + <depend type="module">res_stasis_device_states</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" ASTERISK_REGISTER_FILE() diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c index de41338ef..f899ee476 100644 --- a/res/ari/resource_mailboxes.c +++ b/res/ari/resource_mailboxes.c @@ -23,6 +23,11 @@ * \author Jonathan Rose <jrose@digium.com> */ +/*** MODULEINFO + <depend type="module">res_stasis_mailbox</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" #include "asterisk/stasis_app_mailbox.h" diff --git a/res/ari/resource_playbacks.c b/res/ari/resource_playbacks.c index f610c6d1b..f2751f70d 100644 --- a/res/ari/resource_playbacks.c +++ b/res/ari/resource_playbacks.c @@ -23,6 +23,11 @@ * \author David M. Lee, II <dlee@digium.com> */ +/*** MODULEINFO + <depend type="module">res_stasis_playback</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" ASTERISK_REGISTER_FILE() diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c index e7e74ff9f..a49c3b12e 100644 --- a/res/ari/resource_recordings.c +++ b/res/ari/resource_recordings.c @@ -23,6 +23,11 @@ * \author David M. Lee, II <dlee@digium.com> */ +/*** MODULEINFO + <depend type="module">res_stasis_recording</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" ASTERISK_REGISTER_FILE() diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c index 04992c108..5d38616f8 100644 --- a/res/res_ari_applications.c +++ b/res/res_ari_applications.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c index df4d276d5..92f013301 100644 --- a/res/res_ari_asterisk.c +++ b/res/res_ari_asterisk.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c index 524b03d09..72a34648b 100644 --- a/res/res_ari_bridges.c +++ b/res/res_ari_bridges.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c index ef92b6b21..a2305a514 100644 --- a/res/res_ari_channels.c +++ b/res/res_ari_channels.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c index 6d18b3447..c4eff8ccd 100644 --- a/res/res_ari_device_states.c +++ b/res/res_ari_device_states.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c index e6c9d295e..c23fbc658 100644 --- a/res/res_ari_endpoints.c +++ b/res/res_ari_endpoints.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_events.c b/res/res_ari_events.c index 2c9c1d999..aea318d68 100644 --- a/res/res_ari_events.c +++ b/res/res_ari_events.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c index 5eabbd2b7..0fe83c224 100644 --- a/res/res_ari_mailboxes.c +++ b/res/res_ari_mailboxes.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c index 8128bb919..a0fc29a5b 100644 --- a/res/res_ari_playbacks.c +++ b/res/res_ari_playbacks.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c index edc614f20..61d23aa32 100644 --- a/res/res_ari_recordings.c +++ b/res/res_ari_recordings.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c index 7c3528ef9..ea7f60a0b 100644 --- a/res/res_ari_sounds.c +++ b/res/res_ari_sounds.c @@ -33,6 +33,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ diff --git a/rest-api-templates/ari_model_validators.c.mustache b/rest-api-templates/ari_model_validators.c.mustache index 9d3167156..be20515a4 100644 --- a/rest-api-templates/ari_model_validators.c.mustache +++ b/rest-api-templates/ari_model_validators.c.mustache @@ -22,7 +22,7 @@ /* {{> do-not-edit}} * This file is generated by a mustache template. Please see the original - * template in rest-api-templates/ari_model_validators.h.mustache + * template in rest-api-templates/ari_model_validators.c.mustache */ #include "asterisk.h" diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache index 896ee0d1d..4cc9e0db0 100644 --- a/rest-api-templates/res_ari_resource.c.mustache +++ b/rest-api-templates/res_ari_resource.c.mustache @@ -38,6 +38,7 @@ /*** MODULEINFO <depend type="module">res_ari</depend> + <depend type="module">res_ari_model</depend> <depend type="module">res_stasis</depend> <support_level>core</support_level> ***/ |