diff options
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/Makefile.am | 87 | ||||
| -rw-r--r-- | giscanner/giscannermodule.c | 10 | ||||
| -rw-r--r-- | giscanner/sourcescanner.py | 10 |
3 files changed, 15 insertions, 92 deletions
diff --git a/giscanner/Makefile.am b/giscanner/Makefile.am deleted file mode 100644 index 2779b70c..00000000 --- a/giscanner/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -## Process this file with automake to produce Makefile.in - -INCLUDES = -I$(top_srcdir)/girepository -BUILT_SOURCES = \ - scannerparser.c \ - scannerparser.h \ - scannerlexer.c \ - scannerlexer.h - -CLEANFILES = \ - scannerparser.c \ - scannerparser.h \ - scannerlexer.c \ - scannerlexer.h -AM_YFLAGS = -d -t - -# Why do I have to do this automake? -scannerlexer.h: scannerlexer.c - -noinst_LTLIBRARIES = libgiscanner.la - -libgiscanner_la_SOURCES = \ - sourcescanner.c \ - sourcescanner.h \ - scannerlexer.l \ - scannerparser.y \ - grealpath.h -libgiscanner_la_LIBADD = $(GOBJECT_LIBS) -libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) - -# Python module -pkgpyexecdir = $(pkglibdir)/giscanner -pkgpyexec_LTLIBRARIES = _giscanner.la -pkgpyexec_PYTHON = \ - __init__.py \ - annotationmain.py \ - annotationparser.py \ - ast.py \ - cachestore.py \ - codegen.py \ - config.py \ - dumper.py \ - introspectablepass.py \ - girparser.py \ - girwriter.py \ - gdumpparser.py \ - libtoolimporter.py \ - odict.py \ - maintransformer.py \ - message.py \ - shlibs.py \ - scannermain.py \ - sourcescanner.py \ - testcodegen.py \ - transformer.py \ - utils.py \ - xmlwriter.py - -_giscanner_la_CFLAGS = \ - $(PYTHON_INCLUDES) \ - $(GOBJECT_CFLAGS) \ - -I$(top_srcdir)/giscanner -_giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS) - -_giscanner_la_LDFLAGS = \ - -module -avoid-version -export-symbols-regex init_giscanner - -if OS_WIN32 -# Yuck. Probably there is a way to get this from Python, but I don't -# know how. Use -Wl to avoid libtool crack. -_giscanner_la_LDFLAGS += -Wl,$(pyexecdir)/../../libs/libpython25.a -no-undefined -endif - -_giscanner_la_SOURCES = giscannermodule.c - -if OS_WIN32 -BUILT_SOURCES += _giscanner.pyd -CLEANFILES += _giscanner.pyd - -_giscanner.pyd: _giscanner.la - cp .libs/_giscanner.dll $@ - -install-exec-hook: - mv $(pkgpyexecdir)/_giscanner.dll $(pkgpyexecdir)/_giscanner.pyd - rm $(pkgpyexecdir)/_giscanner.dll.a - rm $(pkgpyexecdir)/_giscanner.la -endif diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index abea9858..a8061dbc 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -678,8 +678,14 @@ DL_EXPORT(void) init_giscanner(void) { PyObject *m, *d; - - m = Py_InitModule ("giscanner._giscanner", + gboolean is_uninstalled; + + /* Hack to avoid having to create a fake directory structure; when + * running uninstalled, the module will be in the top builddir, + * with no _giscanner prefix. + */ + is_uninstalled = g_getenv ("UNINSTALLED_INTROSPECTION_SRCDIR") != NULL; + m = Py_InitModule (is_uninstalled ? "_giscanner" : "giscanner._giscanner", (PyMethodDef*)pyscanner_functions); d = PyModule_GetDict (m); diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 20339e47..e3968e32 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -26,6 +26,12 @@ import tempfile from .libtoolimporter import LibtoolImporter from .message import Position +with LibtoolImporter(None, None): + if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: + from _giscanner import SourceScanner as CSourceScanner + else: + from giscanner._giscanner import SourceScanner as CSourceScanner + (CSYMBOL_TYPE_INVALID, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST, @@ -211,9 +217,7 @@ class SourceSymbol(object): class SourceScanner(object): def __init__(self): - with LibtoolImporter(None, None): - from giscanner._giscanner import SourceScanner - self._scanner = SourceScanner() + self._scanner = CSourceScanner() self._filenames = [] self._cpp_options = [] |