summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@async.com.br>2008-05-31 21:04:59 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-05-31 21:04:59 +0000
commitf2808b8e5374fb74caf14f4775c2796cba56c952 (patch)
treeab962162a4ad5e0bb5ee41c1e4d2ea49db717fc3
parent8fe4141014ccef2e0cb8a5ece88689f2ff45064d (diff)
downloadgobject-introspection-f2808b8e5374fb74caf14f4775c2796cba56c952.tar.gz
Update sys.path before running the parser so we don't have to setup
2008-05-31 Johan Dahlin <jdahlin@async.com.br> * tools/g-ir-scanner: * tests/parser/Makefile.am: Update sys.path before running the parser so we don't have to setup PYTHONPATH ourselves. svn path=/trunk/; revision=278
-rw-r--r--ChangeLog5
-rwxr-xr-xtools/g-ir-scanner10
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ff5e546..e5d8eb53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-05-31 Johan Dahlin <jdahlin@async.com.br>
+ * tools/g-ir-scanner:
+ * tests/parser/Makefile.am:
+ Update sys.path before running the parser so we don't have
+ to setup PYTHONPATH ourselves.
+
* Makefile.am:
* configure.ac:
* girepository/Makefile.am:
diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index d06ac062..07372431 100755
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -24,6 +24,16 @@ import optparse
import os
import sys
+# This only works on unix systems
+currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+basedir = os.path.abspath(os.path.join(currentdir, '..'))
+if os.path.exists(os.path.join(basedir, '.svn')):
+ path = basedir
+else:
+ path = os.path.join(basedir, 'lib', 'python%d.%d' % sys.version_info[:2],
+ 'site-packages')
+sys.path.insert(0, path)
+
from giscanner.glibtransformer import GLibTransformer
from giscanner.sourcescanner import SourceScanner
from giscanner.transformer import Transformer