Changeset 1865

Timestamp:

06/11/08 21:11:31 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11147

Message:

Added the generation of a debug script when "freevo -d" is executed
Changed "freevo -d -d" to write the gdb debug script to the current directory

Files:

• freevo/freevo (modified) (5 diffs)

freevo/freevo

@@ -36 +36 @@
 import popen2
 
+from stat import *
 from signal import *
 
@@ -49 +50 @@
     global debug
     global cmdfile
-    if debug < 2:
+    if debug < 1:
         return
     print >>cmdfile, message
@@ -241 +242 @@
     start a process
     """
-    global cmdfile
+    global cmdfile, debug
     _debug_('start(name=%r, arg=%r, bg=%r, store=%r)' % (name, arg, bg, store))
-    _gdb_script_('cat > /tmp/freevo-gdb << _END_')
-    _gdb_script_('b main')
-    _gdb_script_('r %s' % ' '.join(arg[1:]))
-    _gdb_script_('_END_')
-    _gdb_script_('gdb -x /tmp/freevo-gdb %s' % (arg[0]))
-    if cmdfile: cmdfile.close()
+    if debug >= 2:
+        _gdb_script_('cat > freevo-gdb << _END_')
+        _gdb_script_('b main')
+        _gdb_script_('r %s' % ' '.join(arg[1:]))
+        _gdb_script_('_END_')
+        _gdb_script_('gdb -x freevo-gdb %s' % (arg[0]))
+    elif debug >= 1:
+        _gdb_script_('%s -m pdb src/main.py' % (arg[0]))
+    if cmdfile:
+        cmdfile.close()
+        os.chmod(cmdfile.name, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
 
     pid = os.fork()
@@ -286 +292 @@
         sys.argv.remove('-d')
 if debug >= 2:
-    cmdfile = open('/tmp/freevo-gdb.sh', 'w')
+    cmdfile = open('freevo-gdb.sh', 'w')
+    print >>cmdfile,'#!/bin/bash'
+elif debug >= 1:
+    cmdfile = open('freevo-pdb.sh', 'w')
     print >>cmdfile,'#!/bin/bash'
 
@@ -352 +361 @@
 
 # add the variables from above into environ so Freevo can use them, too
-for var in ('freevo_script', 'runapp', 'freevo_python', 'freevo_locale',
+for var in ('runapp', 'freevo_script', 'freevo_python', 'freevo_locale',
             'freevo_share', 'freevo_contrib', 'freevo_config', 'freevo_helpers'):
     os.environ[var.upper()] = eval(var)