<p>Joshua Colp has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15603">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">xml: Embed module information into core XML documentation.<br><br>This change embeds the MODULEINFO block of modules<br>into the core XML documentation. This provides a shared<br>mechanism for use by both menuselect and Asterisk for<br>information and a definitive source of truth.<br><br>ASTERISK-29335<br><br>Change-Id: Ifbfd5c700049cf320a3e45351ac65dd89bc99d90<br>---<br>M Makefile<br>M apps/app_fax.c<br>M apps/app_speech_utils.c<br>M cdr/cdr_syslog.c<br>M channels/chan_dahdi.c<br>M codecs/codec_dahdi.c<br>M doc/appdocsxml.dtd<br>M funcs/func_periodic_hook.c<br>M funcs/func_pjsip_aor.c<br>M funcs/func_pjsip_contact.c<br>M funcs/func_pjsip_endpoint.c<br>M res/res_remb_modifier.c<br>12 files changed, 36 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/03/15603/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile b/Makefile</span><br><span>index 2a45065..9ef3486 100644</span><br><span>--- a/Makefile</span><br><span>+++ b/Makefile</span><br><span>@@ -490,6 +490,13 @@</span><br><span>         @for x in $(MOD_SUBDIRS); do \</span><br><span>               printf "$$x " ; \</span><br><span>          for i in `find $$x -name '*.c'`; do \</span><br><span style="color: hsl(120, 100%, 40%);">+                 MODULEINFO=$$($(AWK) -f build_tools/get_moduleinfo $$i) ; \</span><br><span style="color: hsl(120, 100%, 40%);">+                   if [ -n "$$MODULEINFO" ] ; \</span><br><span style="color: hsl(120, 100%, 40%);">+                        then \</span><br><span style="color: hsl(120, 100%, 40%);">+                                echo "<module language=\"en_US\" name=\"`$(BASENAME) -s .c $$i`\">" >> $@ ; \</span><br><span style="color: hsl(120, 100%, 40%);">+                               echo "$$MODULEINFO" >> $@ ; \</span><br><span style="color: hsl(120, 100%, 40%);">+                         echo "</module>" >> $@ ; \</span><br><span style="color: hsl(120, 100%, 40%);">+                      fi ; \</span><br><span>                       $(AWK) -f build_tools/get_documentation $$i >> $@ ; \</span><br><span>          done ; \</span><br><span>     done</span><br><span>diff --git a/apps/app_fax.c b/apps/app_fax.c</span><br><span>index d9b0a35..2404773 100644</span><br><span>--- a/apps/app_fax.c</span><br><span>+++ b/apps/app_fax.c</span><br><span>@@ -13,9 +13,9 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-     <defaultenabled>no</defaultenabled></span><br><span>      <depend>spandsp</depend></span><br><span>         <conflict>res_fax</conflict></span><br><span style="color: hsl(120, 100%, 40%);">+      <defaultenabled>no</defaultenabled></span><br><span>      <support_level>deprecated</support_level></span><br><span>        <replacement>res_fax</replacement></span><br><span> ***/</span><br><span>diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c</span><br><span>index 2ba297e..9af8d2a 100644</span><br><span>--- a/apps/app_speech_utils.c</span><br><span>+++ b/apps/app_speech_utils.c</span><br><span>@@ -26,8 +26,8 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-       <support_level>core</support_level></span><br><span>      <depend>res_speech</depend></span><br><span style="color: hsl(120, 100%, 40%);">+       <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c</span><br><span>index 4f0a78c..932d98f 100644</span><br><span>--- a/cdr/cdr_syslog.c</span><br><span>+++ b/cdr/cdr_syslog.c</span><br><span>@@ -37,8 +37,8 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-  <defaultenabled>no</defaultenabled></span><br><span>      <depend>syslog</depend></span><br><span style="color: hsl(120, 100%, 40%);">+   <defaultenabled>no</defaultenabled></span><br><span>      <support_level>deprecated</support_level></span><br><span> ***/</span><br><span> </span><br><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index 8d5d689..2c7b673 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -43,9 +43,9 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-    <use type="module">res_smdi</use></span><br><span>      <depend>dahdi</depend></span><br><span>   <depend>tonezone</depend></span><br><span style="color: hsl(120, 100%, 40%);">+ <use type="module">res_smdi</use></span><br><span>      <use type="external">pri</use></span><br><span>         <use type="external">ss7</use></span><br><span>         <use type="external">openr2</use></span><br><span>diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c</span><br><span>index 941bb1f..4494197 100644</span><br><span>--- a/codecs/codec_dahdi.c</span><br><span>+++ b/codecs/codec_dahdi.c</span><br><span>@@ -27,8 +27,8 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-  <support_level>core</support_level></span><br><span>      <depend>dahdi</depend></span><br><span style="color: hsl(120, 100%, 40%);">+    <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd</span><br><span>index 7c7e606..cf3bc4a 100644</span><br><span>--- a/doc/appdocsxml.dtd</span><br><span>+++ b/doc/appdocsxml.dtd</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-  <!ELEMENT docs (application|function|agi|manager|managerEvent|info|configInfo)*></span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT docs (module|application|function|agi|manager|managerEvent|info|configInfo)*></span><br><span>   <!ATTLIST docs xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"></span><br><span> </span><br><span>   <!ELEMENT xi:include (xi:fallback?) ></span><br><span>@@ -11,6 +11,24 @@</span><br><span>   accept      CDATA       #IMPLIED</span><br><span>   accept-language CDATA  #IMPLIED ></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT module (depend*,use*,conflict*,defaultenabled?,support_level?,replacement?)></span><br><span style="color: hsl(120, 100%, 40%);">+  <!ATTLIST module name CDATA #REQUIRED></span><br><span style="color: hsl(120, 100%, 40%);">+  <!ATTLIST module language CDATA #REQUIRED></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT support_level (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT depend (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+  <!ATTLIST depend type CDATA #IMPLIED></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT defaultenabled (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT replacement (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT use (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+  <!ATTLIST use type CDATA #IMPLIED></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  <!ELEMENT conflict (#PCDATA)></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   <!ELEMENT application (synopsis?,syntax?,description?,see-also?)></span><br><span>   <!ATTLIST application name CDATA #REQUIRED></span><br><span>   <!ATTLIST application language CDATA #REQUIRED></span><br><span>diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c</span><br><span>index e38ff3e..6b90ee3 100644</span><br><span>--- a/funcs/func_periodic_hook.c</span><br><span>+++ b/funcs/func_periodic_hook.c</span><br><span>@@ -26,11 +26,11 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-        <support_level>core</support_level></span><br><span>      <depend>app_chanspy</depend></span><br><span>     <depend>func_cut</depend></span><br><span>        <depend>func_groupcount</depend></span><br><span>         <depend>func_uri</depend></span><br><span style="color: hsl(120, 100%, 40%);">+ <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/funcs/func_pjsip_aor.c b/funcs/func_pjsip_aor.c</span><br><span>index 589f667..9ae51ed 100644</span><br><span>--- a/funcs/func_pjsip_aor.c</span><br><span>+++ b/funcs/func_pjsip_aor.c</span><br><span>@@ -27,9 +27,9 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-  <support_level>core</support_level></span><br><span>      <depend>pjproject</depend></span><br><span>       <depend>res_pjsip</depend></span><br><span style="color: hsl(120, 100%, 40%);">+        <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c</span><br><span>index 9d4ba68..44272e1 100644</span><br><span>--- a/funcs/func_pjsip_contact.c</span><br><span>+++ b/funcs/func_pjsip_contact.c</span><br><span>@@ -27,9 +27,9 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-  <support_level>core</support_level></span><br><span>      <depend>pjproject</depend></span><br><span>       <depend>res_pjsip</depend></span><br><span style="color: hsl(120, 100%, 40%);">+        <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/funcs/func_pjsip_endpoint.c b/funcs/func_pjsip_endpoint.c</span><br><span>index e4a6aba..bc4f0dc 100644</span><br><span>--- a/funcs/func_pjsip_endpoint.c</span><br><span>+++ b/funcs/func_pjsip_endpoint.c</span><br><span>@@ -27,9 +27,9 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-      <support_level>core</support_level></span><br><span>      <depend>pjproject</depend></span><br><span>       <depend>res_pjsip</depend></span><br><span style="color: hsl(120, 100%, 40%);">+        <support_level>core</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span>diff --git a/res/res_remb_modifier.c b/res/res_remb_modifier.c</span><br><span>index bf56391..7d50c79 100644</span><br><span>--- a/res/res_remb_modifier.c</span><br><span>+++ b/res/res_remb_modifier.c</span><br><span>@@ -25,8 +25,8 @@</span><br><span>  */</span><br><span> </span><br><span> /*** MODULEINFO</span><br><span style="color: hsl(0, 100%, 40%);">-      <support_level>extended</support_level></span><br><span>  <defaultenabled>no</defaultenabled></span><br><span style="color: hsl(120, 100%, 40%);">+       <support_level>extended</support_level></span><br><span>  ***/</span><br><span> </span><br><span> #include "asterisk.h"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15603">change 15603</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15603"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Ifbfd5c700049cf320a3e45351ac65dd89bc99d90 </div>
<div style="display:none"> Gerrit-Change-Number: 15603 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>