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: https://origsvn.digium.com/svn/asterisk/trunk@109974 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 7bfc8ff..3392fea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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>" >> $@

diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
new file mode 100644 (file)
index 0000000..0836a85
--- /dev/null
+++ b/build_tools/cflags-devmode.xml
@@ -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>

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index ece1e0d..776160b 100644 (file)
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -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>