Documentation updates; Allow help for gdb-python

README.rst

@@ -160,6 +160,6 @@ sphinx
   This recipe generates only the Sphinx documentation generator applications.
   Extra options considered: none.
 
-gdbpy
+gdb-python
   This recipe generates a gdb launcher using the python interpreter so you can
   start your scripts directly typing ``gdbpy myscript.py``.

setup.py

@@ -31,7 +31,7 @@ setup(
         'develop = xbob.buildout.develop:Recipe',
         'scripts = xbob.buildout.scripts:Recipe',
         'python = xbob.buildout.scripts:PythonInterpreter',
-        'gdbpy = xbob.buildout.scripts:GdbPythonInterpreter',
+        'gdb-python = xbob.buildout.scripts:GdbPythonInterpreter',
         'ipython = xbob.buildout.scripts:IPythonInterpreter',
         'nose = xbob.buildout.scripts:NoseTests',
         'sphinx = xbob.buildout.scripts:Sphinx',

xbob/buildout/gdbpy.py

@@ -41,8 +41,11 @@ else:
   os.environ["PYTHONPATH"] = "%(paths)s"
 
 import sys
-args = [sys.argv[0], "--ex", "r", "--args", "%(interpreter)s"] + sys.argv[1:]
-os.execvp("gdb", args)
+if sys.argv[1] in ('-?', '-h', '--help'):
+  os.execvp("gdb", sys.argv)
+else:
+  args = [sys.argv[0], "--ex", "r", "--args", "%(interpreter)s"] + sys.argv[1:]
+  os.execvp("gdb", args)
 """
 
 class Recipe(Scripts):
@@ -58,7 +61,7 @@ class Recipe(Scripts):
     self.logger = logging.getLogger(self.name)
 
     # Preprocess some variables
-    self.interpreter = options.setdefault('interpreter', 'gdbpy')
+    self.interpreter = options.setdefault('interpreter', 'gdb-python')
     self.newest = bool_option(buildout['buildout'], 'newest')
     self.offline = bool_option(buildout['buildout'], 'offline')
     self.options['bin-directory'] = buildout['buildout']['bin-directory']