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

diff --git a/ChangeLog b/ChangeLog
index 3ff5e54..e5d8eb5 100644 (file)
--- 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 d06ac06..0737243 100755 (executable)
--- 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