kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Fix missing dependencies.

Browse Source 
ARI modules that are generated by 'make ari-stubs' are all dependent on
res_ari_model.  Additionally some of the same modules depend on one or more
res_stasis_* modules.

ASTERISK-25027 #close
Reported by: Corey Farrell

Change-Id: I8e07fe7e81fedacb87232f2b6f8b5f47927b4153
This commit is contained in:
Corey Farrell
2015-04-29 07:46:44 -04:00
parent 881844297a
commit f226bd6f60
21 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.moddir_rules
View File

@@ -66,6 +66,7 @@ define MOD_ADD_SOURCE
$$(if $$(filter $(1),$$(EMBEDDED_MODS)),modules.link,$(1).so): $$(subst $(3),$(5),$(2)) $$(if $$(filter $(1),$$(EMBEDDED_MODS)),modules.link,$(1).so): $$(subst $(3),$(5),$(2))
$$(subst $(3),$(5),$(2)): _ASTCFLAGS+=$$(call MOD_ASTCFLAGS,$(1)) $$(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: MODULEINFO_EXTRA_OUTPUT=" $$(addprefix $$(SUBDIR)/,$$(subst $(3),$(5),$(2)) $$(subst $(3),$(4),$(2)))"
.$(1).moduleinfo: $(2)
clean:: clean-$(1)$(3) clean:: clean-$(1)$(3)
@@ -148,12 +149,12 @@ dist-clean::
.%.moduleinfo: %.c .%.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)\">" > $@ @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>" >> $@ echo "</member>" >> $@
.%.moduleinfo: %.cc .%.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)\">" > $@ @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>" >> $@ echo "</member>" >> $@
.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS)))) .moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS))))

3
build_tools/get_moduleinfo
View File

@@ -1,3 +1,4 @@
/\/\*\*\* MODULEINFO/ {printit=1; next} /\/\*\*\* MODULEINFO/ {printit=1; next}
/\*\*\*\// {if (printit) exit} /<support_level>/ {if (gotsupportlevel) { next }; gotsupportlevel=1}
/\*\*\*\// {printit=0}
/.*/ {if (printit) print} /.*/ {if (printit) print}

2
res/ari/ari_model_validators.c
View File

@@ -24,7 +24,7 @@
* !!!!! DO NOT EDIT !!!!! * !!!!! DO NOT EDIT !!!!!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* This file is generated by a mustache template. Please see the original * 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" #include "asterisk.h"

5
res/ari/resource_channels.c
View File

@@ -24,7 +24,10 @@
*/ */
/*** MODULEINFO /*** 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> <support_level>core</support_level>
***/ ***/

5
res/ari/resource_device_states.c
View File

@@ -23,6 +23,11 @@
* \author Kevin Harwell <kharwell@digium.com> * \author Kevin Harwell <kharwell@digium.com>
*/ */
/*** MODULEINFO
<depend type="module">res_stasis_device_states</depend>
<support_level>core</support_level>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_REGISTER_FILE() ASTERISK_REGISTER_FILE()

5
res/ari/resource_mailboxes.c
View File

@@ -23,6 +23,11 @@
* \author Jonathan Rose <jrose@digium.com> * \author Jonathan Rose <jrose@digium.com>
*/ */
/*** MODULEINFO
<depend type="module">res_stasis_mailbox</depend>
<support_level>core</support_level>
***/
#include "asterisk.h" #include "asterisk.h"
#include "asterisk/stasis_app_mailbox.h" #include "asterisk/stasis_app_mailbox.h"

5
res/ari/resource_playbacks.c
View File

@@ -23,6 +23,11 @@
* \author David M. Lee, II <dlee@digium.com> * \author David M. Lee, II <dlee@digium.com>
*/ */
/*** MODULEINFO
<depend type="module">res_stasis_playback</depend>
<support_level>core</support_level>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_REGISTER_FILE() ASTERISK_REGISTER_FILE()

5
res/ari/resource_recordings.c
View File

@@ -23,6 +23,11 @@
* \author David M. Lee, II <dlee@digium.com> * \author David M. Lee, II <dlee@digium.com>
*/ */
/*** MODULEINFO
<depend type="module">res_stasis_recording</depend>
<support_level>core</support_level>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_REGISTER_FILE() ASTERISK_REGISTER_FILE()

1
res/res_ari_applications.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_asterisk.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_bridges.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_channels.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_device_states.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_endpoints.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_events.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_mailboxes.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_playbacks.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_recordings.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

1
res/res_ari_sounds.c
View File

@@ -33,6 +33,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/

2
rest-api-templates/ari_model_validators.c.mustache
View File

@@ -22,7 +22,7 @@
/* /*
{{> do-not-edit}} {{> do-not-edit}}
* This file is generated by a mustache template. Please see the original * 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" #include "asterisk.h"

1
rest-api-templates/res_ari_resource.c.mustache
View File

@@ -38,6 +38,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend type="module">res_ari</depend> <depend type="module">res_ari</depend>
<depend type="module">res_ari_model</depend>
<depend type="module">res_stasis</depend> <depend type="module">res_stasis</depend>
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/