dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@109974 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2008-03-19 17:15:14 +00:00
parent ab44bf6700
commit 425f17c8b2
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -847,7 +847,7 @@ menuselect/nmenuselect: menuselect/makeopts
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 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di
@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>" >> $@

21
build_tools/cflags-devmode.xml Normal file
View File

@ -0,0 +1,21 @@
<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
</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="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="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
</member>
</category>

19
build_tools/cflags.xml
View File

@ -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,23 +33,8 @@
</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>
<defaultenabled>no</defaultenabled>
@ -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>