[asterisk-commits] mjordan: trunk r371508 - in /trunk: ./ build_tools/ res/ sounds/ utils/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Aug 17 20:14:45 CDT 2012


Author: mjordan
Date: Fri Aug 17 20:14:42 2012
New Revision: 371508

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371508
Log:
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
........

Merged revisions 371507 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/build_tools/cflags.xml
    trunk/res/res_curl.c
    trunk/res/res_fax.c
    trunk/sounds/sounds.xml
    trunk/utils/utils.xml

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Fri Aug 17 20:14:42 2012
@@ -1,1 +1,1 @@
-/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492
+/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492,371507

Modified: trunk/build_tools/cflags.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=371508&r1=371507&r2=371508
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Fri Aug 17 20:14:42 2012
@@ -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>

Modified: trunk/res/res_curl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_curl.c?view=diff&rev=371508&r1=371507&r2=371508
==============================================================================
--- trunk/res/res_curl.c (original)
+++ trunk/res/res_curl.c Fri Aug 17 20:14:42 2012
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>curl</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=371508&r1=371507&r2=371508
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Fri Aug 17 20:14:42 2012
@@ -36,6 +36,7 @@
 
 /*** MODULEINFO
 	<conflict>app_fax</conflict>
+	<support_level>core</support_level>
 ***/
 
 /*! \file
@@ -52,10 +53,6 @@
  * so it can use the technology modules to perform the actual FAX transmissions.
  * \ingroup applications
  */
-
-/*** MODULEINFO
-	<support_level>core</support_level>
- ***/
 
 #include "asterisk.h"
 

Modified: trunk/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/sounds.xml?view=diff&rev=371508&r1=371507&r2=371508
==============================================================================
--- trunk/sounds/sounds.xml (original)
+++ trunk/sounds/sounds.xml Fri Aug 17 20:14:42 2012
@@ -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>

Modified: trunk/utils/utils.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/utils.xml?view=diff&rev=371508&r1=371507&r2=371508
==============================================================================
--- trunk/utils/utils.xml (original)
+++ trunk/utils/utils.xml Fri Aug 17 20:14:42 2012
@@ -5,6 +5,7 @@
   </member>
   <member name="astcanary">
 	<defaultenabled>yes</defaultenabled>
+	<support_level>core</support_level>
   </member>
   <member name="astdb2sqlite3">
 	<defaultenabled>yes</defaultenabled>




More information about the asterisk-commits mailing list