From 5e239b84ac58a9edfc0d942ef751a78aac4c007b Mon Sep 17 00:00:00 2001 From: Phil Muldoon Date: Tue, 9 Aug 2011 12:45:40 +0000 Subject: [PATCH] 2011-08-09 Phil Muldoon * python/lib/gdb/__init__.py: Auto-load files in command and function directories. * python/python.c (finish_python_initialization): Use os.path.join. * python/lib/gdb/command/pretty_printers.py: Self register command. * NEWS: Document auto-loading. 2011-08-09 Phil Muldoon * gdb.texinfo (Python): Document command and function auto-loading. --- gdb/ChangeLog | 10 +++++++ gdb/NEWS | 5 ++++ gdb/doc/ChangeLog | 5 ++++ gdb/doc/gdb.texinfo | 6 +++++ gdb/python/lib/gdb/__init__.py | 27 +++++++++++++++++-- gdb/python/lib/gdb/command/pretty_printers.py | 2 ++ gdb/python/python.c | 4 +-- 7 files changed, 55 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab1e2f823e7..ac421f1782a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2011-08-09 Phil Muldoon + + * python/lib/gdb/__init__.py: Auto-load files in command and + function directories. + * python/python.c (finish_python_initialization): Use + os.path.join. + * python/lib/gdb/command/pretty_printers.py: Self register + command. + * NEWS: Document auto-loading. + 2011-08-08 Jan Kratochvil * dwarf2loc.c (dwarf2_evaluate_loc_desc_full) diff --git a/gdb/NEWS b/gdb/NEWS index b0da564c36b..da558508151 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -23,6 +23,11 @@ ** A prompt subsitution hook (prompt_hook) is now available to the Python API. + ** Python commands and convenience-functions located in + 'data-directory'/python/gdb/command and + 'data-directory'/python/gdb/function are now automatically loaded + on GDB start-up. + * libthread-db-search-path now supports two special values: $sdir and $pdir. $sdir specifies the default system locations of shared libraries. $pdir specifies the directory where the libpthread used by the application diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index ea27a62b5c7..dbef2b11b20 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-08-09 Phil Muldoon + + * gdb.texinfo (Python): Document command and function + auto-loading. + 2011-07-26 Jan Kratochvil Eli Zaretskii diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 35fa075d775..9a0c8dbb11b 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20845,6 +20845,12 @@ This directory, known as the @dfn{python directory}, is automatically added to the Python Search Path in order to allow the Python interpreter to locate all scripts installed at this location. +Additionally, @value{GDBN} commands and convenience functions which +are written in Python and are located in the +@file{@var{data-directory}/python/gdb/command} or +@file{@var{data-directory}/python/gdb/function} directories are +automatically imported when @value{GDBN} starts. + @menu * Python Commands:: Accessing Python from @value{GDBN}. * Python API:: Accessing @value{GDBN} from Python. diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index 43975c2819a..190213274c1 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -13,6 +13,29 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import gdb.command.pretty_printers +import traceback -gdb.command.pretty_printers.register_pretty_printer_commands() +# Auto-load all functions/commands. + +# Modules to auto-load, and the paths where those modules exist. + +module_dict = { + 'gdb.function': os.path.join(gdb.PYTHONDIR, 'gdb', 'function'), + 'gdb.command': os.path.join(gdb.PYTHONDIR, 'gdb', 'command') +} + +# Iterate the dictionary, collating the Python files in each module +# path. Construct the module name, and import. + +for module, location in module_dict.iteritems(): + if os.path.exists(location): + py_files = filter(lambda x: x.endswith('.py') and x != '__init__.py', + os.listdir(location)) + + for py_file in py_files: + # Construct from foo.py, gdb.module.foo + py_file = module + '.' + py_file[:-3] + try: + exec('import ' + py_file) + except: + print >> sys.stderr, traceback.format_exc() diff --git a/gdb/python/lib/gdb/command/pretty_printers.py b/gdb/python/lib/gdb/command/pretty_printers.py index 86923d7cf85..00aa390528c 100644 --- a/gdb/python/lib/gdb/command/pretty_printers.py +++ b/gdb/python/lib/gdb/command/pretty_printers.py @@ -368,3 +368,5 @@ def register_pretty_printer_commands(): InfoPrettyPrinter() EnablePrettyPrinter() DisablePrettyPrinter() + +register_pretty_printer_commands() diff --git a/gdb/python/python.c b/gdb/python/python.c index 16c0a6e27b4..03edce9e9a2 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1302,13 +1302,13 @@ def GdbSetPythonDirectory (dir):\n\ sys.path.insert (0, gdb.PYTHONDIR)\n\ \n\ # Tell python where to find submodules of gdb.\n\ - gdb.__path__ = [gdb.PYTHONDIR + '/gdb']\n\ + gdb.__path__ = [os.path.join (gdb.PYTHONDIR, 'gdb')]\n\ \n\ # The gdb module is implemented in C rather than in Python. As a result,\n\ # the associated __init.py__ script is not not executed by default when\n\ # the gdb module gets imported. Execute that script manually if it\n\ # exists.\n\ - ipy = gdb.PYTHONDIR + '/gdb/__init__.py'\n\ + ipy = os.path.join (gdb.PYTHONDIR, 'gdb', '__init__.py')\n\ if os.path.exists (ipy):\n\ execfile (ipy)\n\ \n\ -- 2.30.2