[asterisk-commits] qwell: trunk r109974 - in /trunk: ./ build_tools/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Mar 19 12:15:14 CDT 2008 

Author: qwell
Date: Wed Mar 19 12:15:14 2008
New Revision: 109974

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109974
Log:
Merged revisions 109973 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r109973 | qwell | 2008-03-19 12:12:52 -0500 (Wed, 19 Mar 2008) | 5 lines

People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...

Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)

........

Added:
    trunk/build_tools/cflags-devmode.xml
      - copied, changed from r109973, trunk/build_tools/cflags.xml
Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/cflags.xml

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=109974&r1=109973&r2=109974
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Mar 19 12:15:14 2008
@@ -847,7 +847,7 @@
 menuselect/makeopts:
 	$(MAKE_MENUSELECT) makeopts
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
 	@echo "Generating input for menuselect ..."
 	@echo "<?xml version=\"1.0\"?>" > $@
 	@echo >> $@
@@ -855,6 +855,9 @@
 	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
 	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
 	@cat build_tools/cflags.xml >> $@
+	@if [ "${AST_DEVMODE}" = "yes" ]; then \
+		cat build_tools/cflags-devmode.xml >> $@; \
+	fi
 	@cat build_tools/embed_modules.xml >> $@
 	@cat sounds/sounds.xml >> $@
 	@echo "</menu>" >> $@

Copied: trunk/build_tools/cflags-devmode.xml (from r109973, trunk/build_tools/cflags.xml)
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/cflags-devmode.xml?view=diff&rev=109974&p1=trunk/build_tools/cflags.xml&r1=109973&p2=trunk/build_tools/cflags-devmode.xml&r2=109974
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags-devmode.xml Wed Mar 19 12:15:14 2008
@@ -1,39 +1,5 @@
-	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
-		</member>
-		<member name="ENABLE_UPLOADS" displayname="Enable HTTP uploads">
-			<defaultenabled>yes</defaultenabled>
-			<depend>gmime</depend>
-		</member>
-		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
-		</member>
-		<member name="STATIC_BUILD" displayname="Build static binaries">
-		</member>
-		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
-			<defaultenabled>yes</defaultenabled>
-		</member>
-		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
-		</member>
-		<member name="LOTS_OF_SPANS" displayname="More than 32 Zaptel spans">
-		</member>
+	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
 		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
-		</member>
-		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
-		</member>
-		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
-			<defaultenabled>yes</defaultenabled>
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
 		</member>
 		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
 		</member>
@@ -44,25 +10,12 @@
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
 		</member>
-		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
-		</member>
 		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
 		</member>
 		<member name="DO_CRASH" displayname="Crash on fatal errors">
 		</member>
 		<member name="THREAD_CRASH" displayname="Crash on mutex errors">
 		</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>
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="BUSYDETECT_COMPARE_TONE_AND_SILENCE" displayname="Assume that tone and silence have the same duration">
-			<conflict>BUSYDETECT_TONEONLY</conflict>
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="BUSYDETECT_DEBUG" displayname="Enable additional busy detection debugging">
-			<defaultenabled>no</defaultenabled>
-		</member>
 		<member name="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
 		</member>
 	</category>

Modified: trunk/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=109974&r1=109973&r2=109974
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Wed Mar 19 12:15:14 2008
@@ -16,8 +16,6 @@
 		</member>
 		<member name="LOTS_OF_SPANS" displayname="More than 32 Zaptel spans">
 		</member>
-		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
-		</member>
 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
 		</member>
 		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
@@ -35,22 +33,7 @@
 		</member>
 		<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
 		</member>
-		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
-		</member>
-		<member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
-		</member>
-		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
-			<depend>DEBUG_THREADS</depend>
-		</member>
-		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
-		</member>
 		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
-		</member>
-		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
-		</member>
-		<member name="DO_CRASH" displayname="Crash on fatal errors">
-		</member>
-		<member name="THREAD_CRASH" displayname="Crash on mutex errors">
 		</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>
@@ -63,6 +46,4 @@
 		<member name="BUSYDETECT_DEBUG" displayname="Enable additional busy detection debugging">
 			<defaultenabled>no</defaultenabled>
 		</member>
-		<member name="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
-		</member>
 	</category>

More information about the asterisk-commits mailing list