summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-11-09 10:12:48 -0500
committerColin Walters <walters@verbum.org>2010-11-09 13:23:52 -0500
commit19469123e25c95084a606930021397f7d5c7bd54 (patch)
tree72b691d9d6531f215fed050466ce3d91260acd97
parent23a81ba427c58971a4def1f068f44562d5fd67c3 (diff)
downloadgobject-introspection-wip/nonrecursive-make.tar.gz
scanner: When running uninstalled, import from current directorywip/nonrecursive-make
The _giscanner.so will be dropped in the toplevel builddir, not giscanner/.
-rwxr-xr-xgiscanner/xmlwriter.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 6ba1e6ad..a418cc40 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -20,6 +20,8 @@
from __future__ import with_statement
+import os
+
from contextlib import contextmanager
from cStringIO import StringIO
from xml.sax.saxutils import escape, quoteattr
@@ -68,7 +70,10 @@ def collect_attributes(tag_name, attributes, self_indent,
with LibtoolImporter(None, None):
- from giscanner._giscanner import collect_attributes
+ if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+ from _giscanner import collect_attributes
+ else:
+ from giscanner._giscanner import collect_attributes
class XMLWriter(object):