gobject-introspection r767 - in trunk: . giscanner

[johan svn gnome org]

Author: johan
Date: Tue Oct 21 14:51:33 2008
New Revision: 767
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=767&view=rev

Log:
2008-10-21  Johan Dahlin  <johan gnome org>

        Bug 556358 - don't use libtool internals

        * giscanner/Makefile.am:
        * giscanner/libtoolimporter.py:
        * giscanner/sourcescanner.py:
        * giscanner/utils.py:
        Add a python meta importer and remove a libtool symlink hack.



Added:
   trunk/giscanner/libtoolimporter.py
Modified:
   trunk/ChangeLog
   trunk/giscanner/Makefile.am
   trunk/giscanner/sourcescanner.py
   trunk/giscanner/utils.py

Modified: trunk/giscanner/Makefile.am
==============================================================================
--- trunk/giscanner/Makefile.am	(original)
+++ trunk/giscanner/Makefile.am	Tue Oct 21 14:51:33 2008
@@ -42,6 +42,7 @@
 	girwriter.py		\
 	glibast.py		\
 	glibtransformer.py 	\
+	libtoolimporter.py	\
 	minixpath.py		\
 	odict.py		\
 	sourcescanner.py	\
@@ -77,13 +78,6 @@
 	mv $(pkgpyexecdir)/_giscanner.dll $(pkgpyexecdir)/_giscanner.pyd
 	rm $(pkgpyexecdir)/_giscanner.dll.a
 	rm $(pkgpyexecdir)/_giscanner.la
-else
-BUILT_SOURCES += _giscanner.so
-CLEANFILES += _giscanner.so
 endif
 
-# Yuck, ugly but...
-_giscanner.so: _giscanner.la
-	ln -sf .libs/_giscanner.so .
-
 include $(top_srcdir)/gcov.mak

Added: trunk/giscanner/libtoolimporter.py
==============================================================================
--- (empty file)
+++ trunk/giscanner/libtoolimporter.py	Tue Oct 21 14:51:33 2008
@@ -0,0 +1,52 @@
+# -*- Mode: Python -*-
+# GObject-Introspection - a framework for introspecting GObject libraries
+# Copyright (C) 2008  Johan Dahlin
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+import imp
+import os
+import sys
+
+from .utils import extract_libtool
+
+
+class LibToolImporter(object):
+    def __init__(self, name, path):
+        self.name = name
+        self.path = path
+
+    @staticmethod
+    def find_module(name, path=None):
+        modname = name.split('.')[-1]
+        for part in path or sys.path:
+            full = os.path.join(part, '.libs', modname + '.la')
+            if os.path.exists(full):
+                return LibToolImporter(name, full)
+        raise SystemExit
+
+    def load_module(self, name):
+        realpath = extract_libtool(self.path)
+        mod = imp.load_module(name, open(realpath), realpath,
+                              ('.so', 'rb', 3))
+        return mod
+
+def install_libtoolimporter():
+    sys.meta_path.append(LibToolImporter)
+
+def uninstall_libtoolimporter():
+    sys.meta_path.remove(LibToolImporter)

Modified: trunk/giscanner/sourcescanner.py
==============================================================================
--- trunk/giscanner/sourcescanner.py	(original)
+++ trunk/giscanner/sourcescanner.py	Tue Oct 21 14:51:33 2008
@@ -22,7 +22,10 @@
 import subprocess
 import tempfile
 
+from .libtoolimporter import install_libtoolimporter, uninstall_libtoolimporter
+install_libtoolimporter()
 from . import _giscanner
+uninstall_libtoolimporter()
 
 (CSYMBOL_TYPE_INVALID,
  CSYMBOL_TYPE_ELLIPSIS,

Modified: trunk/giscanner/utils.py
==============================================================================
--- trunk/giscanner/utils.py	(original)
+++ trunk/giscanner/utils.py	Tue Oct 21 14:51:33 2008
@@ -52,6 +52,10 @@
     filename = _libtool_pat.search(data).groups()[0]
     libname = os.path.join(os.path.dirname(libname),
                            '.libs', filename)
+    # FIXME: This hackish, but I'm not sure how to do this
+    #        in a way which is compatible with both libtool 2.2
+    #        and pre-2.2. Johan 2008-10-21
+    libname = libname.replace('.libs/.libs', '.libs')
     return libname