[gobject-introspection] Revert "Windows port: Make g-ir-annotiotion-tool, g-ir-doc-tool and g-ir-scanner 'relocatable' at ru

[Dieter Verfaillie <dieterv src gnome org>]

commit 354476089f29452a7e826161b75b454eba07f327
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date:   Wed Sep 7 22:34:38 2011 +0200

    Revert "Windows port: Make g-ir-annotiotion-tool, g-ir-doc-tool and g-ir-scanner 'relocatable' at runtime."
    
    It's a bit too soon for this one, misunderstood review on irc.
    Apologies for the mess!
    
    This reverts commit 0102c517c44d3e8fc3baf2394cb92281511941e3.

 tools/g-ir-annotation-tool.in |   15 +++------------
 tools/g-ir-doc-tool.in        |   13 ++-----------
 tools/g-ir-scanner.in         |   13 ++-----------
 3 files changed, 7 insertions(+), 34 deletions(-)
---
diff --git a/tools/g-ir-annotation-tool.in b/tools/g-ir-annotation-tool.in
index 9ce008d..5668cbe 100755
--- a/tools/g-ir-annotation-tool.in
+++ b/tools/g-ir-annotation-tool.in
@@ -23,12 +23,7 @@ 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
+__builtin__.__dict__['DATADIR'] = "@datarootdir@"
 
 if 'GI_SCANNER_DEBUG' in os.environ:
     def on_exception(exctype, value, tb):
@@ -37,17 +32,13 @@ if 'GI_SCANNER_DEBUG' in os.environ:
         pdb.pm()
     sys.excepthook = on_exception
 
-srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
+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')
+    path = os.path.join('@libdir@', 'gobject-introspection')
 sys.path.insert(0, path)
 
 from giscanner.annotationmain import annotation_main
diff --git a/tools/g-ir-doc-tool.in b/tools/g-ir-doc-tool.in
index 02db10c..4a84afa 100644
--- a/tools/g-ir-doc-tool.in
+++ b/tools/g-ir-doc-tool.in
@@ -23,12 +23,7 @@ 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
+__builtin__.__dict__['DATADIR'] = "@datarootdir@"
 
 if 'GI_SCANNER_DEBUG' in os.environ:
     def on_exception(exctype, value, tb):
@@ -43,11 +38,7 @@ if srcdir is not None:
 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')
+    path = os.path.join('@libdir@', 'gobject-introspection')
 sys.path.insert(0, path)
 
 from giscanner.docmain import doc_main
diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in
index 9a1b2bf..f709683 100755
--- a/tools/g-ir-scanner.in
+++ b/tools/g-ir-scanner.in
@@ -23,12 +23,7 @@ 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
+__builtin__.__dict__['DATADIR'] = "@datarootdir@"
 
 if 'GI_SCANNER_DEBUG' in os.environ:
     def on_exception(exctype, value, tb):
@@ -43,11 +38,7 @@ if srcdir is not None:
 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')
+    path = os.path.join('@libdir@', 'gobject-introspection')
 sys.path.insert(0, path)
 
 from giscanner.scannermain import scanner_main