[Asterisk-code-review] ARI: Fix missing dependencies. (asterisk[13])
Corey Farrell
asteriskteam at digium.com
Wed Apr 29 02:09:32 CDT 2015
Corey Farrell has uploaded a new change for review.
https://gerrit.asterisk.org/275
Change subject: ARI: Fix missing dependencies.
......................................................................
ARI: Fix missing dependencies.
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.
A minor fix to 'make ari-stubs' is also included to ensure the directory
'./doc/rest-api' exists before trying to generate stubs. The directory is
also added to git ignores.
Dependencies and unneeded headers were removed from res_pjsip/presence_xml.c
as they are wrong and would no longer be ignored.
ASTERISK-25027 #close
Reported by: Corey Farrell
Change-Id: I8e07fe7e81fedacb87232f2b6f8b5f47927b4153
---
M Makefile
M Makefile.moddir_rules
M build_tools/get_moduleinfo
M doc/.gitignore
M res/ari.make
M res/ari/ari_model_validators.c
M res/ari/resource_channels.c
M res/ari/resource_device_states.c
M res/ari/resource_mailboxes.c
M res/ari/resource_playbacks.c
M res/ari/resource_recordings.c
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
M res/res_pjsip/presence_xml.c
M rest-api-templates/ari.make.mustache
M rest-api-templates/ari_model_validators.c.mustache
M rest-api-templates/res_ari_resource.c.mustache
26 files changed, 57 insertions(+), 17 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/75/275/1
diff --git a/Makefile b/Makefile
index d4f9e3c..fab3fd1 100644
--- a/Makefile
+++ b/Makefile
@@ -983,6 +983,7 @@
@echo "--------------------------------------------------------------------------"
@false
else
+ @$(INSTALL) -d doc/rest-api
$(PYTHON) rest-api-templates/make_ari_stubs.py \
rest-api/resources.json .
endif
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 939e79f..8d83516 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -133,12 +133,12 @@
.%.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))))
diff --git a/build_tools/get_moduleinfo b/build_tools/get_moduleinfo
index 92bc7e9..4dbb294 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/doc/.gitignore b/doc/.gitignore
index 27acdb3..e098ec0 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
core-en_US.xml
+rest-api
\ No newline at end of file
diff --git a/res/ari.make b/res/ari.make
index f9a87d3..133f2ae 100644
--- a/res/ari.make
+++ b/res/ari.make
@@ -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)
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c
index 97435d0..fe61ad4 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 5943158..f722802 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 621910e..7239e11 100644
--- a/res/ari/resource_device_states.c
+++ b/res/ari/resource_device_states.c
@@ -23,6 +23,11 @@
* \author Kevin Harwell <kharwell at digium.com>
*/
+/*** MODULEINFO
+ <depend type="module">res_stasis_device_states</depend>
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c
index 0d9bac7..ec4c8e8 100644
--- a/res/ari/resource_mailboxes.c
+++ b/res/ari/resource_mailboxes.c
@@ -23,6 +23,11 @@
* \author Jonathan Rose <jrose at 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 3ef6710..9f59754 100644
--- a/res/ari/resource_playbacks.c
+++ b/res/ari/resource_playbacks.c
@@ -23,6 +23,11 @@
* \author David M. Lee, II <dlee at digium.com>
*/
+/*** MODULEINFO
+ <depend type="module">res_stasis_playback</depend>
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c
index bd273aa..28fa735 100644
--- a/res/ari/resource_recordings.c
+++ b/res/ari/resource_recordings.c
@@ -23,6 +23,11 @@
* \author David M. Lee, II <dlee at digium.com>
*/
+/*** MODULEINFO
+ <depend type="module">res_stasis_recording</depend>
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 0b09213..e81d164 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 c904379..6118297 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 e0b9f78..860ff1d 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 0d1334e..d1ae801 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 24ea554..f15e3da 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 8d8ed71..4d54ff3 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 c601f57..40a9dfe 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 c1c7e48..2b3404f 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 8155b2a..de38ad8 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 0657fa3..dede53c 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 107f47c..c53330d 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/res/res_pjsip/presence_xml.c b/res/res_pjsip/presence_xml.c
index 2fe6bdc..12bfa07 100644
--- a/res/res_pjsip/presence_xml.c
+++ b/res/res_pjsip/presence_xml.c
@@ -16,14 +16,6 @@
* at the top of the source tree.
*/
-/*** MODULEINFO
- <depend>pjproject</depend>
- <depend>res_pjsip</depend>
- <depend>res_pjsip_pubsub</depend>
- <depend>res_pjsip_exten_state</depend>
- <support_level>core</support_level>
- ***/
-
#include "asterisk.h"
#include <pjsip.h>
@@ -31,10 +23,8 @@
#include <pjlib.h>
#include "asterisk/module.h"
-#include "asterisk/res_pjsip.h"
-#include "asterisk/res_pjsip_pubsub.h"
+#include "asterisk/pbx.h"
#include "asterisk/res_pjsip_presence_xml.h"
-#include "asterisk/res_pjsip_body_generator_types.h"
void ast_sip_sanitize_xml(const char *input, char *output, size_t len)
{
diff --git a/rest-api-templates/ari.make.mustache b/rest-api-templates/ari.make.mustache
index 50293cf..0e1b7a0 100644
--- a/rest-api-templates/ari.make.mustache
+++ b/rest-api-templates/ari.make.mustache
@@ -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}})
diff --git a/rest-api-templates/ari_model_validators.c.mustache b/rest-api-templates/ari_model_validators.c.mustache
index 9d31671..be20515 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 896ee0d..4cc9e0d 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>
***/
--
To view, visit https://gerrit.asterisk.org/275
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e07fe7e81fedacb87232f2b6f8b5f47927b4153
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Corey Farrell <git at cfware.com>
More information about the asterisk-code-review
mailing list