kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +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:39:22 -04:00
parent 3e4624ad21
commit d61f03c4f9
23 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.moddir_rules
View File

@@ -133,12 +133,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)/$*.so\">" > $@
$(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)/$*.so\">" > $@
$(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))))

3
build_tools/get_moduleinfo
View File

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

11
res/ari.make
View File

@@ -18,46 +18,57 @@
#
res_ari_asterisk.so: ari/resource_asterisk.o
.res_ari_asterisk.moduleinfo: ari/resource_asterisk.c
ari/resource_asterisk.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_asterisk)
res_ari_endpoints.so: ari/resource_endpoints.o
.res_ari_endpoints.moduleinfo: ari/resource_endpoints.c
ari/resource_endpoints.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_endpoints)
res_ari_channels.so: ari/resource_channels.o
.res_ari_channels.moduleinfo: ari/resource_channels.c
ari/resource_channels.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_channels)
res_ari_bridges.so: ari/resource_bridges.o
.res_ari_bridges.moduleinfo: ari/resource_bridges.c
ari/resource_bridges.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_bridges)
res_ari_recordings.so: ari/resource_recordings.o
.res_ari_recordings.moduleinfo: ari/resource_recordings.c
ari/resource_recordings.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_recordings)
res_ari_sounds.so: ari/resource_sounds.o
.res_ari_sounds.moduleinfo: ari/resource_sounds.c
ari/resource_sounds.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_sounds)
res_ari_playbacks.so: ari/resource_playbacks.o
.res_ari_playbacks.moduleinfo: ari/resource_playbacks.c
ari/resource_playbacks.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_playbacks)
res_ari_device_states.so: ari/resource_device_states.o
.res_ari_device_states.moduleinfo: ari/resource_device_states.c
ari/resource_device_states.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_device_states)
res_ari_mailboxes.so: ari/resource_mailboxes.o
.res_ari_mailboxes.moduleinfo: ari/resource_mailboxes.c
ari/resource_mailboxes.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_mailboxes)
res_ari_events.so: ari/resource_events.o
.res_ari_events.moduleinfo: ari/resource_events.c
ari/resource_events.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_events)
res_ari_applications.so: ari/resource_applications.o
.res_ari_applications.moduleinfo: ari/resource_applications.c
ari/resource_applications.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_applications)

2
res/ari/ari_model_validators.c
View File

@@ -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"

5
res/ari/resource_channels.c
View File

@@ -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>
***/

5
res/ari/resource_device_states.c
View File

@@ -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_FILE_VERSION(__FILE__, "$Revision$")

5
res/ari/resource_mailboxes.c
View File

@@ -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"

5
res/ari/resource_playbacks.c
View File

@@ -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_FILE_VERSION(__FILE__, "$Revision$")

5
res/ari/resource_recordings.c
View File

@@ -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_FILE_VERSION(__FILE__, "$Revision$")

1
res/res_ari_applications.c
View File

@@ -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>
***/

1
res/res_ari_asterisk.c
View File

@@ -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>
***/

1
res/res_ari_bridges.c
View File

@@ -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>
***/

1
res/res_ari_channels.c
View File

@@ -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>
***/

1
res/res_ari_device_states.c
View File

@@ -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>
***/

1
res/res_ari_endpoints.c
View File

@@ -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>
***/

1
res/res_ari_events.c
View File

@@ -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>
***/

1
res/res_ari_mailboxes.c
View File

@@ -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>
***/

1
res/res_ari_playbacks.c
View File

@@ -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>
***/

1
res/res_ari_recordings.c
View File

@@ -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>
***/

1
res/res_ari_sounds.c
View File

@@ -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>
***/

1
rest-api-templates/ari.make.mustache
View File

@@ -20,6 +20,7 @@
{{#apis}}
res_ari_{{c_name}}.so: ari/resource_{{c_name}}.o
.res_ari_{{c_name}}.moduleinfo: ari/resource_{{c_name}}.c
ari/resource_{{c_name}}.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_{{c_name}})

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

@@ -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"

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

@@ -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>
***/