[gobject-introspection] tools: Windows-re-enable 'relocatability' for tool template
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] tools: Windows-re-enable 'relocatability' for tool template
- Date: Wed, 28 Oct 2015 14:05:32 +0000 (UTC)
commit 6492ac6386d90fd840722e00c0eef9e24e09f9c2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Oct 28 15:59:40 2015 +0800
tools: Windows-re-enable 'relocatability' for tool template
The transition to Python 3.x compatibility accidentily removed the
'relocatability' support that was added, so re-enable this support on
Windows again.
https://bugzilla.gnome.org/show_bug.cgi?id=757126
tools/g-ir-tool-template.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 59f3ff4..f80730e 100644
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -31,8 +31,6 @@ if sys.version_info.major < 3:
else:
import builtins
-builtins.__dict__['DATADIR'] = "@datarootdir@"
-
debug = os.getenv('GI_SCANNER_DEBUG', '').split(',')
if debug:
if 'pydevd' in debug:
@@ -56,6 +54,8 @@ else:
datadir = "@datarootdir@"
pylibdir = os.path.join('@libdir@', 'gobject-introspection')
+builtins.__dict__['DATADIR'] = datadir
+
srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
if srcdir is not None:
pylibdir = srcdir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]