diff options
author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2011-09-08 07:37:38 +0200 |
---|---|---|
committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2015-06-29 16:54:29 +0200 |
commit | fb9dd21303254c01a0b150f02b17697d53b43669 (patch) | |
tree | aa54732206d628b5ce9a96f2b85bd7b634e985f2 | |
parent | 0fcbad89ce10f6927d03666e7ea290cf17883114 (diff) | |
download | gobject-introspection-fb9dd21303254c01a0b150f02b17697d53b43669.tar.gz |
tools: make g-ir-annotiotion-tool, g-ir-doc-tool and g-ir-scanner 'relocatable' at runtime.
https://bugzilla.gnome.org/show_bug.cgi?id=620566
-rwxr-xr-x | tools/g-ir-annotation-tool.in | 28 | ||||
-rw-r--r-- | tools/g-ir-doc-tool.in | 28 | ||||
-rwxr-xr-x | tools/g-ir-scanner.in | 28 |
3 files changed, 33 insertions, 51 deletions
diff --git a/tools/g-ir-annotation-tool.in b/tools/g-ir-annotation-tool.in index 03d11371..811e9153 100755 --- a/tools/g-ir-annotation-tool.in +++ b/tools/g-ir-annotation-tool.in @@ -23,12 +23,6 @@ import os import sys import __builtin__ -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir if 'GI_SCANNER_DEBUG' in os.environ: def on_exception(exctype, value, tb): @@ -37,19 +31,19 @@ if 'GI_SCANNER_DEBUG' in os.environ: pdb.pm() sys.excepthook = on_exception +if os.name == 'nt': + datadir = os.path.join(os.path.dirname(__file__), '..', 'share') + pylibdir = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') +else: + datadir = "@datarootdir@" + pylibdir = os.path.join('@libdir@', 'gobject-introspection') + srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-annotation-tool 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) + pylibdir = srcdir -from giscanner.annotationmain import annotation_main +__builtin__.__dict__['DATADIR'] = datadir +sys.path.insert(0, pylibdir) +from giscanner.annotationmain import annotation_main sys.exit(annotation_main(sys.argv)) diff --git a/tools/g-ir-doc-tool.in b/tools/g-ir-doc-tool.in index 241d0305..db389ba9 100644 --- a/tools/g-ir-doc-tool.in +++ b/tools/g-ir-doc-tool.in @@ -23,12 +23,6 @@ import os import sys import __builtin__ -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir if 'GI_SCANNER_DEBUG' in os.environ: def on_exception(exctype, value, tb): @@ -37,19 +31,19 @@ if 'GI_SCANNER_DEBUG' in os.environ: pdb.pm() sys.excepthook = on_exception +if os.name == 'nt': + datadir = os.path.join(os.path.dirname(__file__), '..', 'share') + pylibdir = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') +else: + datadir = "@datarootdir@" + pylibdir = os.path.join('@libdir@', 'gobject-introspection') + srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-doc-tool 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) + pylibdir = srcdir -from giscanner.docmain import doc_main +__builtin__.__dict__['DATADIR'] = datadir +sys.path.insert(0, pylibdir) +from giscanner.docmain import doc_main sys.exit(doc_main(sys.argv)) diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in index 6f8e70fa..420d435b 100755 --- a/tools/g-ir-scanner.in +++ b/tools/g-ir-scanner.in @@ -23,12 +23,6 @@ import os import sys import __builtin__ -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir if 'GI_SCANNER_DEBUG' in os.environ: def on_exception(exctype, value, tb): @@ -37,19 +31,19 @@ if 'GI_SCANNER_DEBUG' in os.environ: pdb.pm() sys.excepthook = on_exception +if os.name == 'nt': + datadir = os.path.join(os.path.dirname(__file__), '..', 'share') + pylibdir = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') +else: + datadir = "@datarootdir@" + pylibdir = os.path.join('@libdir@', 'gobject-introspection') + srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-scanner 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) + pylibdir = srcdir -from giscanner.scannermain import scanner_main +__builtin__.__dict__['DATADIR'] = datadir +sys.path.insert(0, pylibdir) +from giscanner.scannermain import scanner_main sys.exit(scanner_main(sys.argv)) |