From 999d44a1995d4607fbf7811c1e1da0acbe253400 Mon Sep 17 00:00:00 2001 From: Matthew Jordan <mjordan@digium.com> Date: Sat, 18 Aug 2012 01:08:03 +0000 Subject: [PATCH] Update module support level on a variety of modules and compiler options Some core support modules and compiler options were no longer tagged with a module support level. This patch adds 'core' back to those options. Note that this patch modifies a few of the patches provided by Andrew Latham slightly. res_curl and res_fax are both 'core' supported modules. (closes issue ASTERISK-20215) Reported by: Andrew Latham Tested by: mjordan Patches: astcanary.diff (license #5985) uploaded by Andrew Latham cflagsxml.diff (license #5985) uploaded by Andrew Latham curl_fax.diff (license #5985) uploaded by Andrew Latham soundsxml.diff (license #5985) uploaded by Andrew Latham git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@371507 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- build_tools/cflags.xml | 8 ++++- res/res_curl.c | 1 + res/res_fax.c | 5 +-- sounds/sounds.xml | 72 ++++++++++++++++++++++++++++++++++++++++++ utils/utils.xml | 1 + 5 files changed, 82 insertions(+), 5 deletions(-) diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 4396b47736..7e3e9eeb76 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -1,15 +1,19 @@ <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean"> <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler"> + <support_level>core</support_level> </member> <member name="DEBUG_THREADS" displayname="Enable Thread Debugging"> + <support_level>core</support_level> </member> <member name="STATIC_BUILD" displayname="Build static binaries"> <support_level>extended</support_level> </member> <member name="LOADABLE_MODULES" displayname="Runtime module loading"> <defaultenabled>yes</defaultenabled> + <support_level>core</support_level> </member> <member name="DEBUG_FD_LEAKS" displayname="Enable File Descriptor Leak Detection"> + <support_level>core</support_level> </member> <member name="REBUILD_PARSERS" displayname="Rebuild AEL and expression parsers from bison/flex source files"> <depend>bison</depend> @@ -24,7 +28,7 @@ <depend>BFD</depend> <depend>DLADDR</depend> <defaultenabled>no</defaultenabled> - <support_level>extended</support_level> + <support_level>core</support_level> </member> <member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one"> <defaultenabled>no</defaultenabled> @@ -32,6 +36,7 @@ <support_level>extended</support_level> </member> <member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans"> + <support_level>core</support_level> </member> <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications"> <support_level>extended</support_level> @@ -53,6 +58,7 @@ <support_level>extended</support_level> </member> <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations"> + <support_level>core</support_level> </member> <member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part"> <conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict> diff --git a/res/res_curl.c b/res/res_curl.c index 411c06e11b..08e6aa1395 100644 --- a/res/res_curl.c +++ b/res/res_curl.c @@ -28,6 +28,7 @@ /*** MODULEINFO <depend>curl</depend> + <support_level>core</support_level> ***/ #include "asterisk.h" diff --git a/res/res_fax.c b/res/res_fax.c index 50c1c368db..900f21f668 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -36,6 +36,7 @@ /*** MODULEINFO <conflict>app_fax</conflict> + <support_level>core</support_level> ***/ /*! \file @@ -53,10 +54,6 @@ * \ingroup applications */ -/*** MODULEINFO - <support_level>core</support_level> - ***/ - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/sounds/sounds.xml b/sounds/sounds.xml index 9a1707d321..4b234ec0a4 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -1,152 +1,224 @@ <category name="MENUSELECT_CORE_SOUNDS" displayname="Core Sound Packages" positive_output="yes"> <member name="CORE-SOUNDS-EN-WAV" displayname="English, WAV format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > + <support_level>core</support_level> <defaultenabled>yes</defaultenabled> </member> <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-SIREN7" displayname="English, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN-SIREN14" displayname="English, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-ALAW" displayname="Spanish, a-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-GSM" displayname="Spanish, GSM format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-G722" displayname="Spanish, G.722 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-SLN16" displayname="Spanish, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-SIREN7" displayname="Spanish, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-ES-SIREN14" displayname="Spanish, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-ALAW" displayname="French, a-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-SIREN7" displayname="French, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-WAV" displayname="Russian, WAV format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-ULAW" displayname="Russian, mu-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-ALAW" displayname="Russian, a-Law format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-GSM" displayname="Russian, GSM format" > + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-G729" displayname="Russian, G.729 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-G722" displayname="Russian, G.722 format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-SLN16" displayname="Russian, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-SIREN7" displayname="Russian, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="CORE-SOUNDS-RU-SIREN14" displayname="Russian, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> </category> <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" > <defaultenabled>yes</defaultenabled> + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-ALAW" displayname="opsound.org Music On Hold Files, a-Law format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-GSM" displayname="opsound.org Music On Hold Files, GSM format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-SIREN7" displayname="opsound.org Music On Hold Files, G.722.1 (Siren7) format" > + <support_level>core</support_level> </member> <member name="MOH-OPSOUND-SIREN14" displayname="opsound.org Music On Hold Files, G.722.1C (Siren14) format" > + <support_level>core</support_level> </member> </category> <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes"> <member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" > + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-SIREN7" displayname="English, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-EN-SIREN14" displayname="English, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-WAV" displayname="French, WAV format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-ULAW" displayname="French, mu-Law format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-ALAW" displayname="French, a-Law format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-GSM" displayname="French, GSM format" > + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-G729" displayname="French, G.729 format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-G722" displayname="French, G.722 format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-SIREN7" displayname="French, G.722.1 (Siren7) format"> + <support_level>core</support_level> </member> <member name="EXTRA-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format"> + <support_level>core</support_level> </member> </category> diff --git a/utils/utils.xml b/utils/utils.xml index a7b2c988e0..a9b6e28ca1 100644 --- a/utils/utils.xml +++ b/utils/utils.xml @@ -5,6 +5,7 @@ </member> <member name="astcanary"> <defaultenabled>yes</defaultenabled> + <support_level>core</support_level> </member> <member name="astdb2sqlite3"> <defaultenabled>yes</defaultenabled> -- GitLab