From: Joel Brobecker <brobecker@adacore.com>
To: Tom Tromey <tromey@redhat.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH] Add support for gdb.PYTHONDIR as $gdb_datadir/python.
Date: Thu, 24 Jun 2010 22:53:00 -0000 [thread overview]
Message-ID: <20100624225329.GL2595@adacore.com> (raw)
In-Reply-To: <m3fx0c6y66.fsf@fleche.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
> Joel> 2010-06-24 Joel Brobecker <brobecker@adacore.com>
> Joel> * python/python.c (_initialize_python): Add new "constant"
> Joel> PYTHONDIR in gdb module. Insert this path at the head of
> Joel> sys.path. Set gdb.__path__ to gdb.PYTHONDIR + '/gdb' and
> Joel> exec its __init__.py script if it exists in that directory.
>
> This is fine with me.
Thanks! Following Doug's comments, here is the patch that I just
checked in.
NEWS and docs next.
--
Joel
[-- Attachment #2: pythondir-commented.diff --]
[-- Type: text/x-diff, Size: 2502 bytes --]
commit 2de53ec24130ae79b8f5eb138185173f900ccb29
Author: Joel Brobecker <brobecker@adacore.com>
Date: Thu Jun 24 10:59:55 2010 -0700
Add support for gdb.PYTHONDIR as $gdb_datadir/python.
Python scripts to be used by GDB can be stored in that directory,
and will be automatically found by the interpreter when importing them.
This patch also sets up <gdb_pythondir>/gdb as the directory where gdb
submodules can be stored. For now, there is nothing there, but it can
now be added easily without further code changes.
gdb/ChangeLog:
2010-06-24 Joel Brobecker <brobecker@adacore.com>
* python/python.c (_initialize_python): Add new "constant"
PYTHONDIR in gdb module. Insert this path at the head of
sys.path. Set gdb.__path__ to gdb.PYTHONDIR + '/gdb' and
exec its __init__.py script if it exists in that directory.
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 31880c1..18b2cdc 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -668,6 +668,13 @@ Enables or disables printing of Python stack traces."),
PyModule_AddStringConstant (gdb_module, "VERSION", (char*) version);
PyModule_AddStringConstant (gdb_module, "HOST_CONFIG", (char*) host_name);
PyModule_AddStringConstant (gdb_module, "TARGET_CONFIG", (char*) target_name);
+ {
+ char *gdb_pythondir;
+
+ gdb_pythondir = concat (gdb_datadir, SLASH_STRING, "python", NULL);
+ PyModule_AddStringConstant (gdb_module, "PYTHONDIR", gdb_pythondir);
+ xfree (gdb_pythondir);
+ }
gdbpy_gdberror_exc = PyErr_NewException ("gdb.GdbError", NULL, NULL);
PyModule_AddObject (gdb_module, "GdbError", gdbpy_gdberror_exc);
@@ -720,6 +727,20 @@ class GdbOutputFile:\n\
\n\
sys.stderr = GdbOutputFile()\n\
sys.stdout = GdbOutputFile()\n\
+\n\
+# GDB's python scripts are stored inside gdb.PYTHONDIR. So insert\n\
+# that directory name at the start of sys.path to allow the Python\n\
+# interpreter to find them.\n\
+sys.path.insert(0, gdb.PYTHONDIR)\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 exists.\n\
+gdb.__path__ = [gdb.PYTHONDIR + '/gdb']\n\
+from os.path import exists\n\
+ipy = gdb.PYTHONDIR + '/gdb/__init__.py'\n\
+if exists (ipy):\n\
+ execfile (ipy)\n\
");
/* Release the GIL while gdb runs. */
prev parent reply other threads:[~2010-06-24 22:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 18:19 Joel Brobecker
2010-06-24 18:39 ` Doug Evans
2010-06-24 19:06 ` Tom Tromey
2010-06-24 19:06 ` Doug Evans
2010-06-24 19:14 ` Tom Tromey
2010-06-24 22:53 ` Joel Brobecker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100624225329.GL2595@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tromey@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).