gobject-introspection 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

data/vendor/local/lib/gobject-introspection/giscanner/ast.py

@@ -409,12 +409,15 @@ but adds it to things like ctypes, symbols, and type_names.
             self.type_names[node.gtype_name] = node
         elif isinstance(node, Function):
             self.symbols[node.symbol] = node
-        if isinstance(node, (Compound, Class, Interface)):
+        if isinstance(node, (Compound, Class, Interface, Boxed)):
             for fn in chain(node.methods, node.static_methods, node.constructors):
                 if not isinstance(fn, Function):
                     continue
                 fn.namespace = self
                 self.symbols[fn.symbol] = fn
+        if isinstance(node, (Compound, Class, Interface)):
+            for f in node.fields:
+                f.namespace = self
         if isinstance(node, (Class, Interface)):
             for m in chain(node.signals, node.properties):
                 m.namespace = self
@@ -513,12 +516,14 @@ class Annotated(object):
 properties."""
     def __init__(self):
         self.version = None
+        self.version_doc = None
         self.skip = False
         self.introspectable = True
-        self.attributes = []    # (key, value)*
+        self.attributes = OrderedDict()
         self.stability = None
+        self.stability_doc = None
         self.deprecated = None
-        self.deprecated_version = None
+        self.deprecated_doc = None
         self.doc = None
 
 
@@ -676,8 +681,8 @@ class VFunction(Callable):
         self.invoker = None
 
     @classmethod
-    def from_callback(cls, cb):
-        obj = cls(cb.name, cb.retval, cb.parameters[1:],
+    def from_callback(cls, name, cb):
+        obj = cls(name, cb.retval, cb.parameters[1:],
                   cb.throws)
         return obj
 
@@ -755,9 +760,10 @@ class Alias(Node):
 class TypeContainer(Annotated):
     """A fundamental base class for Return and Parameter."""
 
-    def __init__(self, typenode, transfer):
+    def __init__(self, typenode, nullable, transfer):
         Annotated.__init__(self)
         self.type = typenode
+        self.nullable = nullable
         if transfer is not None:
             self.transfer = transfer
         elif typenode.is_const:
@@ -770,12 +776,20 @@ class Parameter(TypeContainer):
     """An argument to a function."""
 
     def __init__(self, argname, typenode, direction=None,
-                 transfer=None, allow_none=False, scope=None,
+                 transfer=None, nullable=False, optional=False,
+                 allow_none=False, scope=None,
                  caller_allocates=False):
-        TypeContainer.__init__(self, typenode, transfer)
+        TypeContainer.__init__(self, typenode, nullable, transfer)
         self.argname = argname
         self.direction = direction
-        self.allow_none = allow_none
+        self.optional = optional
+
+        if allow_none:
+            if self.direction == PARAM_DIRECTION_OUT:
+                self.optional = True
+            else:
+                self.nullable = True
+
         self.scope = scope
         self.caller_allocates = caller_allocates
         self.closure_name = None
@@ -785,8 +799,8 @@ class Parameter(TypeContainer):
 class Return(TypeContainer):
     """A return value from a function."""
 
-    def __init__(self, rtype, transfer=None):
-        TypeContainer.__init__(self, rtype, transfer)
+    def __init__(self, rtype, nullable=False, transfer=None):
+        TypeContainer.__init__(self, rtype, nullable, transfer)
         self.direction = PARAM_DIRECTION_OUT
 
 
@@ -857,7 +871,8 @@ class Compound(Node, Registered):
                  gtype_name=None,
                  get_type=None,
                  c_symbol_prefix=None,
-                 disguised=False):
+                 disguised=False,
+                 tag_name=None):
         Node.__init__(self, name)
         Registered.__init__(self, gtype_name, get_type)
         self.ctype = ctype
@@ -869,6 +884,7 @@ class Compound(Node, Registered):
         self.gtype_name = gtype_name
         self.get_type = get_type
         self.c_symbol_prefix = c_symbol_prefix
+        self.tag_name = tag_name
 
     def add_gtype(self, gtype_name, get_type):
         self.gtype_name = gtype_name
@@ -886,6 +902,18 @@ class Compound(Node, Registered):
             if field.anonymous_node is not None:
                 field.anonymous_node.walk(callback, chain)
 
+    def get_field(self, name):
+        for field in self.fields:
+            if field.name == name:
+                return field
+        raise ValueError("Unknown field %s" % (name, ))
+
+    def get_field_index(self, name):
+        for i, field in enumerate(self.fields):
+            if field.name == name:
+                return i
+        raise ValueError("Unknown field %s" % (name, ))
+
 
 class Field(Annotated):
 
@@ -900,6 +928,7 @@ class Field(Annotated):
         self.bits = bits
         self.anonymous_node = anonymous_node
         self.private = False
+        self.namespace = None
         self.parent = None  # a compound
 
     def __cmp__(self, other):
@@ -916,13 +945,15 @@ class Record(Compound):
                  gtype_name=None,
                  get_type=None,
                  c_symbol_prefix=None,
-                 disguised=False):
+                 disguised=False,
+                 tag_name=None):
         Compound.__init__(self, name,
                           ctype=ctype,
                           gtype_name=gtype_name,
                           get_type=get_type,
                           c_symbol_prefix=c_symbol_prefix,
-                          disguised=disguised)
+                          disguised=disguised,
+                          tag_name=tag_name)
         # If non-None, this record defines the FooClass C structure
         # for some Foo GObject (or similar for GInterface)
         self.is_gtype_struct_for = None
@@ -935,13 +966,15 @@ class Union(Compound):
                  gtype_name=None,
                  get_type=None,
                  c_symbol_prefix=None,
-                 disguised=False):
+                 disguised=False,
+                 tag_name=None):
         Compound.__init__(self, name,
                           ctype=ctype,
                           gtype_name=gtype_name,
                           get_type=get_type,
                           c_symbol_prefix=c_symbol_prefix,
-                          disguised=disguised)
+                          disguised=disguised,
+                          tag_name=tag_name)
 
 
 class Boxed(Node, Registered):

data/vendor/local/lib/gobject-introspection/giscanner/cachestore.py

@@ -45,7 +45,7 @@ def _get_versionhash():
 def _get_cachedir():
     if 'GI_SCANNER_DISABLE_CACHE' in os.environ:
         return None
-    homedir = os.environ.get('HOME')
+    homedir = os.path.expanduser('~')
     if homedir is None:
         return None
     if not os.path.exists(homedir):
@@ -54,14 +54,14 @@ def _get_cachedir():
     cachedir = os.path.join(homedir, '.cache')
     if not os.path.exists(cachedir):
         try:
-            os.mkdir(cachedir, 0755)
+            os.mkdir(cachedir, 0o755)
         except OSError:
             return None
 
     scannerdir = os.path.join(cachedir, 'g-ir-scanner')
     if not os.path.exists(scannerdir):
         try:
-            os.mkdir(scannerdir, 0755)
+            os.mkdir(scannerdir, 0o755)
         except OSError:
             return None
     # If it exists and is a file, don't cache at all
@@ -100,9 +100,11 @@ class CacheStore(object):
         if current_hash == cache_hash:
             return
 
+        versiontmp = version + '.tmp'
+
         self._clean()
         try:
-            fp = open(version, 'w')
+            fp = open(versiontmp, 'w')
         except IOError as e:
             # Permission denied
             if e.errno == errno.EACCES:
@@ -111,6 +113,10 @@ class CacheStore(object):
                 raise
 
         fp.write(current_hash)
+        fp.close()
+        # On Unix, this would just be os.rename() but Windows
+        # doesn't allow that.
+        shutil.move(versiontmp, version)
 
     def _get_filename(self, filename):
         # If we couldn't create the directory we're probably

data/vendor/local/lib/gobject-introspection/giscanner/ccompiler.py

@@ -0,0 +1,202 @@
+# -*- Mode: Python -*-
+# GObject-Introspection - a framework for introspecting GObject libraries
+# Copyright (C) 2014  Chun-wei Fan
+#
+# 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 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
+# Lesser General Public License for more details.
+#
+# 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 os
+import subprocess
+import sys
+import distutils
+
+from distutils.msvccompiler import MSVCCompiler
+from distutils.cygwinccompiler import Mingw32CCompiler
+from distutils.sysconfig import customize_compiler
+
+from . import utils
+
+
+class CCompiler(object):
+
+    compiler_cmd = ''
+    compiler = None
+    _cflags_no_deprecation_warnings = ''
+
+    def __init__(self, compiler_name=None):
+        pass
+
+    def get_internal_link_flags(self,
+                                args,
+                                libtool,
+                                libraries,
+                                libpaths,
+                                pkgconfig_msvc_flags,
+                                ns,
+                                ns_version):
+        # An "internal" link is where the library to be introspected
+        # is being built in the current directory.
+
+        # Search the current directory first
+        # (This flag is not supported nor needed for Visual C++)
+        if pkgconfig_msvc_flags == '':
+            args.append('-L.')
+
+        # https://bugzilla.gnome.org/show_bug.cgi?id=625195
+        if not libtool:
+            # We don't have -Wl,-rpath for Visual C++, and that's
+            # going to cause a problem.  Instead, link to internal
+            # libraries by deducing the .lib file name using
+            # the namespace name and version
+            if pkgconfig_msvc_flags:
+                if ns_version:
+                    args.append(str.lower(ns) +
+                                '-' +
+                                ns_version + '.lib')
+                else:
+                    args.append(str.lower(ns) + '.lib')
+            else:
+                args.append('-Wl,-rpath=.')
+
+        # Ensure libraries are always linked as we are going to use ldd to work
+        # out their names later
+        if not libtool and pkgconfig_msvc_flags == '':
+            args.append('-Wl,--no-as-needed')
+
+        for library in libraries:
+            # Visual C++: We have the needed .lib files now, and we need to link
+            # to .lib files, not the .dll as the --library option specifies the
+            # .dll(s) the .gir file refers to
+            if pkgconfig_msvc_flags == '':
+                if library.endswith(".la"):  # explicitly specified libtool library
+                    args.append(library)
+                else:
+                    args.append('-l' + library)
+
+        for library_path in libpaths:
+            # Not used/needed on Visual C++, and -Wl,-rpath options
+            # will cause grief
+            if pkgconfig_msvc_flags == '':
+                args.append('-L' + library_path)
+                if os.path.isabs(library_path):
+                    if libtool:
+                        args.append('-rpath')
+                        args.append(library_path)
+                    else:
+                        args.append('-Wl,-rpath=' + library_path)
+
+    def get_external_link_flags(self, args, libraries, pkgconfig_msvc_flags):
+        # An "external" link is where the library to be introspected
+        # is installed on the system; this case is used for the scanning
+        # of GLib in gobject-introspection itself.
+
+        for library in libraries:
+            # The --library option on Windows pass in the .dll file(s) the
+            # .gir files refer to, so don't link to them on Visual C++
+            if pkgconfig_msvc_flags == '':
+                if library.endswith(".la"):  # explicitly specified libtool library
+                    args.append(library)
+                else:
+                    args.append('-l' + library)
+
+    def resolve_windows_libs(self, libraries, options):
+        args = []
+        compiler_cmd = os.environ.get('CC', 'cc')
+        libsearch = []
+
+        # When we are using Visual C++...
+        if 'cl.exe' in compiler_cmd or 'cl' in compiler_cmd:
+            # The search path of the .lib's on Visual C++
+            # is dependent on the LIB environmental variable,
+            # so just query for that
+            is_msvc = True
+            libpath = os.environ.get('LIB')
+            libsearch = libpath.split(';')
+
+            # Use the dumpbin utility that's included in
+            # every Visual C++ installation to find out which
+            # DLL the library gets linked to
+            args.append('dumpbin.exe')
+            args.append('-symbols')
+
+        # When we are not using Visual C++ (i.e. we are using GCC)...
+        else:
+            is_msvc = False
+            libtool = utils.get_libtool_command(options)
+            if libtool:
+                args.append(utils.which(os.environ.get('SHELL', 'sh.exe')))
+                args.extend(libtool)
+                args.append('--mode=execute')
+            # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe)
+            args.extend(['dlltool.exe', '--identify'])
+            proc = subprocess.Popen([compiler_cmd, '-print-search-dirs'],
+                                    stdout=subprocess.PIPE)
+            o, e = proc.communicate()
+            for line in o.splitlines():
+                if line.startswith('libraries: '):
+                    libsearch = line[len('libraries: '):].split(';')
+
+        shlibs = []
+        not_resolved = []
+        for lib in libraries:
+            found = False
+            candidates = [
+                'lib%s.dll.a' % lib,
+                'lib%s.a' % lib,
+                '%s.dll.a' % lib,
+                '%s.a' % lib,
+                '%s.lib' % lib,
+            ]
+            for l in libsearch:
+                if found:
+                    break
+                if l.startswith('='):
+                    l = l[1:]
+                for c in candidates:
+                    if found:
+                        break
+                    implib = os.path.join(l, c)
+                    if os.path.exists(implib):
+                        proc = subprocess.Popen(args + [implib],
+                                                stdout=subprocess.PIPE)
+                        o, e = proc.communicate()
+                        for line in o.splitlines():
+                            if is_msvc:
+                                # On Visual Studio, dumpbin -symbols something.lib gives the
+                                # filename of DLL without the '.dll' extension that something.lib
+                                # links to, in the line that contains
+                                # __IMPORT_DESCRIPTOR_<dll_filename_that_something.lib_links_to>
+
+                                if '__IMPORT_DESCRIPTOR_' in line:
+                                    line_tokens = line.split()
+                                    for item in line_tokens:
+                                        if item.startswith('__IMPORT_DESCRIPTOR_'):
+                                            shlibs.append(item[20:] + '.dll')
+                                            found = True
+                                            break
+                                if found:
+                                    break
+                            else:
+                                shlibs.append(line)
+                                found = True
+                                break
+            if not found:
+                not_resolved.append(lib)
+        if len(not_resolved) > 0:
+            raise SystemExit(
+                "ERROR: can't resolve libraries to shared libraries: " +
+                ", ".join(not_resolved))
+        return shlibs

data/vendor/local/lib/gobject-introspection/giscanner/codegen.py

@@ -26,9 +26,21 @@ from . import ast
 
 
 class CCodeGenerator(object):
-    def __init__(self, namespace, out_h_filename, out_c_filename):
+    def __init__(self, namespace,
+                 out_h_filename,
+                 out_c_filename,
+                 function_decoration=[],
+                 include_first_header=[],
+                 include_last_header=[],
+                 include_first_src=[],
+                 include_last_src=[]):
         self.out_h_filename = out_h_filename
         self.out_c_filename = out_c_filename
+        self.function_decoration = function_decoration
+        self.include_first_header = include_first_header
+        self.include_last_header = include_last_header
+        self.include_first_src = include_first_src
+        self.include_last_src = include_last_src
         self._function_bodies = {}
         self.namespace = namespace
 
@@ -50,6 +62,10 @@ class CCodeGenerator(object):
         return param.type.ctype + suffix
 
     def _write_prelude(self, out, func):
+        if self.function_decoration:
+            out.write("""
+%s""" % " ".join(self.function_decoration))
+
         out.write("""
 %s
 %s (""" % (self._typecontainer_to_ctype(func.retval), func.symbol))
@@ -105,16 +121,31 @@ class CCodeGenerator(object):
         warning = '/* GENERATED BY testcodegen.py; DO NOT EDIT */\n\n'
         self.out_h.write(warning)
         nsupper = self.namespace.name.upper()
+
+        for header in self.include_first_header:
+            self.out_h.write("""#include "%s"\n""" % header)
+
         self.out_h.write("""
 #ifndef __%s_H__
 #define __%s_H__
 
 #include <glib-object.h>
+
 """ % (nsupper, nsupper))
 
+        for header in self.include_last_header:
+            self.out_h.write("""#include "%s"\n""" % header)
+
         self.out_c.write(warning)
+
+        for header in self.include_first_src:
+            self.out_c.write("""#include "%s"\n""" % header)
+
         self.out_c.write("""#include "%s"\n\n""" % (self.out_h_filename, ))
 
+        for header in self.include_last_src:
+            self.out_c.write("""#include "%s"\n""" % header)
+
     def _codegen_end(self):
         self.out_h.write("""#endif\n""")
 

data/vendor/local/lib/gobject-introspection/giscanner/collections/__init__.py

@@ -19,4 +19,5 @@
 #
 
 
+from .counter import Counter
 from .ordereddict import OrderedDict