gobject-introspection r969 - in trunk: . giscanner tools

[johan svn gnome org]

Author: johan
Date: Tue Nov 25 21:09:56 2008
New Revision: 969
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=969&view=rev

Log:
Revert earlier libtool change, there's no need
to execute through libtool since libtool would have
created a wrapper if it was found at link time


Modified:
   trunk/ChangeLog
   trunk/giscanner/glibtransformer.py
   trunk/tools/g-ir-scanner

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Tue Nov 25 21:09:56 2008
@@ -82,10 +82,9 @@
 
 class GLibTransformer(object):
 
-    def __init__(self, transformer, noclosure=False, nolibtool=False):
+    def __init__(self, transformer, noclosure=False):
         self._transformer = transformer
         self._noclosure = noclosure
-        self._nolibtool = nolibtool
         self._transformer.set_container_types(['GList*', 'GSList*'],
                                               ['GHashTable*'])
         self._namespace_name = None
@@ -214,19 +213,6 @@
         except KeyError, e:
             return Unresolved(gtype_name)
 
-    def _use_libtool_infection(self):
-        libtool_infection = not self._nolibtool
-        if not libtool_infection:
-            return False
-
-        try:
-            subprocess.check_call(['libtool', '--version'])
-        except subprocess.CalledProcessError, e:
-            # If libtool's not installed, assume we don't need it
-            return False
-
-        return True
-
     def _execute_binary(self):
         in_path = os.path.join(self._binary.tmpdir, 'types.txt')
         f = open(in_path, 'w')
@@ -237,8 +223,6 @@
         out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
 
         args = []
-        if self._use_libtool_infection():
-            args.extend(['libtool', '--mode=execute'])
         args.extend(self._binary.args)
         args.append('--introspect-dump=%s,%s' % (in_path, out_path))
 

Modified: trunk/tools/g-ir-scanner
==============================================================================
--- trunk/tools/g-ir-scanner	(original)
+++ trunk/tools/g-ir-scanner	Tue Nov 25 21:09:56 2008
@@ -305,8 +305,7 @@
     # Transform the C AST nodes into higher level
     # GLib/GObject nodes
     glibtransformer = GLibTransformer(transformer,
-                                      noclosure=options.noclosure,
-                                      nolibtool=options.nolibtool)
+                                      noclosure=options.noclosure)
     glibtransformer.set_introspection_binary(binary)
 
     namespace = glibtransformer.parse()