No need to edit the file to choose different debugging methods, you can

pass an argument now.  For those that use a GUI, open the GUI in your
main X.  Defaults to using gdb, and will print help text if it doesn't
understand the argument.

SVN revision: 26270

diff --git a/xnest.sh b/xnest.sh
index 7305745..ca7b021 100755 (executable)
--- a/xnest.sh
+++ b/xnest.sh
@@ -1,16 +1,42 @@
 #!/bin/sh
 
 #export REDRAW_DEBUG=1        # To cause redraw- to happen slovly and obviously.
-#export ECORE_ERROR_ABORT=1   # To cause ecore to abort on errers.
+#export ECORE_ERROR_ABORT=1   # To cause ecore to abort on errors.
+
+main=$DISPLAY
+display=" -display :1"
+
+case "$@" in
+       "-d")   action="ddd -display $main" ; display="" ;;
+       "-e")   action="" ;;
+       "-g")   action="gdb -x gdb.txt" ; main=":1" ; display=""  ;;
+       "")     action="gdb -x gdb.txt" ; main=":1" ; display=""  ;;
+       "-l")   action="valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --log-file=valgrind_log" ;;
+       "-m")   action="valgrind --tool=memcheck --log-file=valgrind_log" ;;
+       "-p")   action="memprof --display=$main" ; main=":1" ; display="" ;;
+       "-r")   action="memprof_raster --display=$main" ; main=":1" ; display="" ;;
+       "-v")   action="valkyrie -display $main" ; main=":1" ; display="" ;;
+       *)      echo -e "Usage : xnest.sh [option]"
+               echo -e "\tdefault option is -g"
+               echo -e "\t-d use the GUI debugger\t\t\tddd"
+               echo -e "\t-e enlightenment with no debugging"
+               echo -e "\t-g use text debugger\t\t\tgdb"
+               echo -e "\t-l leak check\t\t\t\tvalgrind"
+               echo -e "\t-m memory check\t\t\t\tvalgrind"
+               echo -e "\t-p memory profiling\t\t\tmemprof"
+               echo -e "\t-r raster's memory profiling\t\tmemprof_raster"
+               echo -e "\t-v GUI memory check\t\t\tvalkyrie"
+               echo -e ""
+               echo -e "You need to add \"-display :1\" as the run arguments for the GUI debugger."
+               echo -e "When you have finished with the text debugger, use the q command to quit."
+               echo -e "The valgrind options will leave a log file with a name beginning with valgrind_log"
+               exit
+               ;;
+esac
+
 
 Xnest :1 -ac &
 
 sleep 2   # Someone reported that it starts E before X has started properly.
 
-# Comment out all but one of these.
-#DISPLAY=:1 ; enlightenment   # Just run it.
-#DISPLAY=:1 ; xterm -e gdb -x gdb.txt enlightenment   # Run it with the text based debugger.
-DISPLAY=:1 ; gdb -x gdb.txt enlightenment   # Run it with the text based debugger.
-#DISPLAY=:1 ; ddd -geometry 550x450+5+25 enlightenment &   # Run it with the GUI debugger.
-#DISPLAY=:1 ; valgrind --tool=memcheck --log-file=valgrind_log enlightenment    # Run it with valgrind.
-#DISPLAY=:1 ; valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --log-file=valgrind_log enlightenment    # Run it with valgrind and leak checking.
+DISPLAY=$main; $action enlightenment $display