[scanner] Catch OSError too when checking for libtool

[gnome.gobject-introspection] / giscanner / utils.py

diff --git a/giscanner/utils.py b/giscanner/utils.py
index 959ed83..3bbf33b 100644 (file)
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -2,24 +2,25 @@
 # 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 library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser 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,
+# This library 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.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser 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.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 #
 
 import re
 import os
+import subprocess
 
 # Copied from h2defs.py
 _upperstr_pat1 = re.compile(r'([^A-Z])([A-Z])')
@@ -46,18 +47,58 @@ def to_underscores_noprefix(name):
 
 _libtool_pat = re.compile("dlname='([A-z0-9\.\-\+]+)'\n")
 
+def _extract_dlname_field(la_file):
+    f = open(la_file)
+    data = f.read()
+    f.close()
+    m = _libtool_pat.search(data)
+    if m:
+        return m.groups()[0]
+    else:
+        return None
 
-def extract_libtool(libname):
-    data = open(libname).read()
-    filename = _libtool_pat.search(data).groups()[0]
-    libname = os.path.join(os.path.dirname(libname),
-                           '.libs', filename)
+# Returns the name that we would pass to dlopen() the library
+# corresponding to this .la file
+def extract_libtool_shlib(la_file):
+    dlname = _extract_dlname_field(la_file)
+    if dlname is None:
+        return None
+
+    # From the comments in extract_libtool(), older libtools had
+    # a path rather than the raw dlname
+    return os.path.basename(dlname)
+
+def extract_libtool(la_file):
+    dlname = _extract_dlname_field(la_file)
+    if dlname is None:
+        raise ValueError("%s has no dlname. Not a shared library?" % la_file)
+    libname = os.path.join(os.path.dirname(la_file),
+                           '.libs', dlname)
+    # 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
 
+# Returns arguments for invoking libtool, if applicable, otherwise None
+def get_libtool_command(options):
+    libtool_infection = not options.nolibtool
+    if not libtool_infection:
+        return None
+
+    libtool_path = options.libtool_path
+    if libtool_path:
+        # Automake by default sets:
+        # LIBTOOL = $(SHELL) $(top_builddir)/libtool
+        # To be strictly correct we would have to parse shell.  For now
+        # we simply split().
+        return libtool_path.split(' ')
+
+    try:
+        subprocess.check_call(['libtool', '--version'],
+                              stdout=open(os.devnull))
+    except:
+        # If libtool's not installed, assume we don't need it
+        return None
 
-def strip_common_prefix(first, second):
-    second = second.replace('_', '')
-    for i, c in enumerate(first.upper()):
-        if i >= len(second) or c != second[i]:
-            return second[i:]
-    return second[i + 1:]
+    return ['libtool']