From f2ccad64fc5169998843f5f1a2470f9ea82b931f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 30 Aug 2016 03:36:04 -0400 Subject: Determine GIR include paths like targets. These paths are now generated similar to NinjaBackend.generate_single_compile where IncludeDirs create includes of both the build directory path and the source directory path. This also fixes a bug with include_directories, where the path string supplied to the IncludeDirs initializer was used for the search path, instead of the actual location to which it referred. Often, this was a '.', and not a really useful path. --- mesonbuild/modules/gnome.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d6a0fcf..e83e54e 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -100,22 +100,27 @@ class GnomeModule: depends.append(lib) return link_command - def get_include_args(self, state, include_dirs): + def get_include_args(self, state, include_dirs, prefix='-I'): if not include_dirs: return [] + build_to_src = os.path.relpath(state.environment.get_source_dir(), + state.environment.get_build_dir()) dirs_str = [] for incdirs in include_dirs: if hasattr(incdirs, "held_object"): dirs = incdirs.held_object else: dirs = incdirs - for incdir in dirs.get_incdirs(): - if os.path.isabs(incdir): - dirs_str += ['-I%s' % os.path.join(incdir)] - else: - dirs_str += ['-I%s' % os.path.join(state.environment.get_source_dir(), - dirs.curdir, incdir)] + basedir = dirs.get_curdir() + for d in dirs.get_incdirs(): + expdir = os.path.join(basedir, d) + srctreedir = os.path.join(build_to_src, expdir) + dirs_str += ['%s%s' % (prefix, expdir), + '%s%s' % (prefix, srctreedir)] + for d in dirs.get_extra_build_dirs(): + dirs_str += ['%s%s' % (prefix, d)] + return dirs_str def generate_gir(self, state, args, kwargs): @@ -148,7 +153,7 @@ class GnomeModule: extra_args = mesonlib.stringlistify(kwargs.pop('extra_args', [])) scan_command += extra_args - scan_command += self.get_include_args(state, girtarget.include_dirs) + scan_command += self.get_include_args(state, girtarget.get_include_dirs()) if 'link_with' in kwargs: link_with = kwargs.pop('link_with') @@ -232,10 +237,10 @@ class GnomeModule: inc_dirs = [inc_dirs] for ind in inc_dirs: - if isinstance(ind.held_object, build.IncludeDirs): - scan_command += ['--add-include-path=%s' % inc for inc in ind.held_object.get_incdirs()] - else: + if not isinstance(ind.held_object, build.IncludeDirs): raise MesonException('Gir include dirs should be include_directories()') + scan_command += self.get_include_args(state, inc_dirs, + prefix='--add-include-path=') if isinstance(girtarget, build.Executable): scan_command += ['--program', girtarget] elif isinstance(girtarget, build.SharedLibrary): -- cgit v1.1 From d0b6f0b7a4b5266c63ea7914eb5cc4db187bd752 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 30 Aug 2016 04:01:01 -0400 Subject: Add dependency's include paths to GIR generation. --- mesonbuild/modules/gnome.py | 1 + 1 file changed, 1 insertion(+) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index e83e54e..e85ba97 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -209,6 +209,7 @@ class GnomeModule: os.path.join(state.environment.get_build_dir(), source.held_object.get_subdir())] elif isinstance(dep.held_object, dependencies.PkgConfigDependency): + scan_command += dep.held_object.get_compile_args() for lib in dep.held_object.libs: if os.path.isabs(lib) and dep.held_object.is_libtool: scan_command += ["-L%s" % os.path.dirname(lib)] -- cgit v1.1 From 3ae327a2ac4724ad9dd7b0d8d663962733faa2e1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 30 Aug 2016 04:02:25 -0400 Subject: Pull dependency directly from GIR's target library. --- mesonbuild/modules/gnome.py | 108 ++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 48 deletions(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index e85ba97..11efd58 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -193,42 +193,50 @@ class GnomeModule: else: raise MesonException('Gir export packages must be str or list') - deps = None - if 'dependencies' in kwargs: - deps = kwargs.pop('dependencies') - if not isinstance (deps, list): - deps = [deps] - for dep in deps: - if isinstance(dep.held_object, dependencies.InternalDependency): - scan_command += self.get_include_args(state, dep.held_object.include_directories) - for lib in dep.held_object.libraries: - scan_command += self.get_link_args(state, lib.held_object, depends) - for source in dep.held_object.sources: - if isinstance(source.held_object, GirTarget): - scan_command += ["--add-include-path=%s" % - os.path.join(state.environment.get_build_dir(), - source.held_object.get_subdir())] - elif isinstance(dep.held_object, dependencies.PkgConfigDependency): - scan_command += dep.held_object.get_compile_args() - for lib in dep.held_object.libs: - if os.path.isabs(lib) and dep.held_object.is_libtool: - scan_command += ["-L%s" % os.path.dirname(lib)] - libname = os.path.basename(lib) - if libname.startswith("lib"): - libname = libname[3:] - libname = libname.split(".so")[0] - lib = "-l%s" % libname - # Hack to avoid passing some compiler options in - if lib.startswith("-W"): - continue - scan_command += [lib] - - girdir = dep.held_object.get_variable ("girdir") - if girdir: - scan_command += ["--add-include-path=%s" % girdir] - else: - mlog.log('dependency %s not handled to build gir files' % dep) - continue + deps = kwargs.pop('dependencies', []) + if not isinstance(deps, list): + deps = [deps] + deps = (girtarget.get_all_link_deps() + girtarget.get_external_deps() + + deps) + for dep in deps: + if hasattr(dep, 'held_object'): + dep = dep.held_object + if isinstance(dep, dependencies.InternalDependency): + scan_command += self.get_include_args( + state, + dep.include_directories) + for lib in dep.libraries: + scan_command += self.get_link_args(state, lib.held_object, + depends) + for source in dep.sources: + if isinstance(source.held_object, GirTarget): + scan_command += [ + "--add-include-path=%s" % ( + os.path.join(state.environment.get_build_dir(), + source.held_object.get_subdir()), + ) + ] + elif isinstance(dep, dependencies.PkgConfigDependency): + scan_command += dep.get_compile_args() + for lib in dep.libs: + if os.path.isabs(lib) and dep.is_libtool: + scan_command += ["-L%s" % os.path.dirname(lib)] + libname = os.path.basename(lib) + if libname.startswith("lib"): + libname = libname[3:] + libname = libname.split(".so")[0] + lib = "-l%s" % libname + # Hack to avoid passing some compiler options in + if lib.startswith("-W"): + continue + scan_command += [lib] + + girdir = dep.get_variable("girdir") + if girdir: + scan_command += ["--add-include-path=%s" % (girdir, )] + else: + mlog.log('dependency %s not handled to build gir files' % dep) + continue inc_dirs = None if kwargs.get('include_directories'): @@ -264,18 +272,22 @@ class GnomeModule: for incd in inc_dirs: typelib_cmd += ['--includedir=%s' % inc for inc in incd.held_object.get_incdirs()] - if deps: - for dep in deps: - if isinstance(dep.held_object, dependencies.InternalDependency): - for source in dep.held_object.sources: - if isinstance(source.held_object, GirTarget): - typelib_cmd += ["--includedir=%s" % - os.path.join(state.environment.get_build_dir(), - source.held_object.get_subdir())] - elif isinstance(dep.held_object, dependencies.PkgConfigDependency): - girdir = dep.held_object.get_variable ("girdir") - if girdir: - typelib_cmd += ["--includedir=%s" % girdir] + for dep in deps: + if hasattr(dep, 'held_object'): + dep = dep.held_object + if isinstance(dep, dependencies.InternalDependency): + for source in dep.sources: + if isinstance(source.held_object, GirTarget): + typelib_cmd += [ + "--includedir=%s" % ( + os.path.join(state.environment.get_build_dir(), + source.held_object.get_subdir()), + ) + ] + elif isinstance(dep, dependencies.PkgConfigDependency): + girdir = dep.get_variable("girdir") + if girdir: + typelib_cmd += ["--includedir=%s" % (girdir, )] kwargs['output'] = typelib_output kwargs['command'] = typelib_cmd -- cgit v1.1 From 9009f8267edc5bd48e845bc8469fff6b3b3b106e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 2 Sep 2016 20:29:19 -0400 Subject: Allow GirTargets as includes for another GirTarget. --- mesonbuild/modules/gnome.py | 58 +++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 21 deletions(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 11efd58..ebee196 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -112,6 +112,12 @@ class GnomeModule: dirs = incdirs.held_object else: dirs = incdirs + + if isinstance(dirs, str): + dirs_str += ['%s%s' % (prefix, dirs)] + continue + + # Should be build.IncludeDirs object. basedir = dirs.get_curdir() for d in dirs.get_incdirs(): expdir = os.path.join(basedir, d) @@ -145,6 +151,7 @@ class GnomeModule: libsources = kwargs.pop('sources') girfile = '%s-%s.gir' % (ns, nsversion) depends = [girtarget] + gir_inc_dirs = [] scan_command = ['g-ir-scanner', '@INPUT@'] scan_command += pkgargs @@ -164,12 +171,25 @@ class GnomeModule: if 'includes' in kwargs: includes = kwargs.pop('includes') - if isinstance(includes, str): - scan_command += ['--include=%s' % includes] - elif isinstance(includes, list): - scan_command += ['--include=%s' % inc for inc in includes] - else: - raise MesonException('Gir includes must be str or list') + if not isinstance(includes, list): + includes = [includes] + for inc in includes: + if hasattr(inc, 'held_object'): + inc = inc.held_object + if isinstance(inc, str): + scan_command += ['--include=%s' % (inc, )] + elif isinstance(inc, GirTarget): + gir_inc_dirs += [ + os.path.join(state.environment.get_build_dir(), + inc.get_subdir()), + ] + scan_command += [ + "--include=%s" % (inc.get_basename()[:-4], ), + ] + depends += [inc] + else: + raise MesonException( + 'Gir includes must be str, GirTarget, or list of them') if state.global_args.get('c'): scan_command += ['--cflags-begin'] scan_command += state.global_args['c'] @@ -238,18 +258,16 @@ class GnomeModule: mlog.log('dependency %s not handled to build gir files' % dep) continue - inc_dirs = None - if kwargs.get('include_directories'): - inc_dirs = kwargs.pop('include_directories') - - if not isinstance(inc_dirs, list): - inc_dirs = [inc_dirs] + inc_dirs = kwargs.pop('include_directories', []) + if not isinstance(inc_dirs, list): + inc_dirs = [inc_dirs] + for incd in inc_dirs: + if not isinstance(incd.held_object, build.IncludeDirs): + raise MesonException( + 'Gir include dirs should be include_directories().') + scan_command += self.get_include_args(state, gir_inc_dirs + inc_dirs, + prefix='--add-include-path=') - for ind in inc_dirs: - if not isinstance(ind.held_object, build.IncludeDirs): - raise MesonException('Gir include dirs should be include_directories()') - scan_command += self.get_include_args(state, inc_dirs, - prefix='--add-include-path=') if isinstance(girtarget, build.Executable): scan_command += ['--program', girtarget] elif isinstance(girtarget, build.SharedLibrary): @@ -268,10 +286,8 @@ class GnomeModule: typelib_output = '%s-%s.typelib' % (ns, nsversion) typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] - if inc_dirs: - for incd in inc_dirs: - typelib_cmd += ['--includedir=%s' % inc for inc in - incd.held_object.get_incdirs()] + typelib_cmd += self.get_include_args(state, gir_inc_dirs, + prefix='--includedir=') for dep in deps: if hasattr(dep, 'held_object'): dep = dep.held_object -- cgit v1.1 From 68a2e5c9c905ee4415efa9f8801330fcc5c49e3b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 30 Aug 2016 21:46:57 -0400 Subject: Also add GIR include_directories to header search path. --- mesonbuild/modules/gnome.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index ebee196..f82c5c5 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -262,9 +262,10 @@ class GnomeModule: if not isinstance(inc_dirs, list): inc_dirs = [inc_dirs] for incd in inc_dirs: - if not isinstance(incd.held_object, build.IncludeDirs): + if not isinstance(incd.held_object, (str, build.IncludeDirs)): raise MesonException( 'Gir include dirs should be include_directories().') + scan_command += self.get_include_args(state, inc_dirs) scan_command += self.get_include_args(state, gir_inc_dirs + inc_dirs, prefix='--add-include-path=') -- cgit v1.1 From 7a6534e05440faa686098f21bbfdf31a1459817b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 31 Aug 2016 19:28:33 -0400 Subject: GIR: Handle all dependencies and internal libraries. --- mesonbuild/modules/gnome.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index f82c5c5..8da9035 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -236,10 +236,13 @@ class GnomeModule: source.held_object.get_subdir()), ) ] - elif isinstance(dep, dependencies.PkgConfigDependency): + # This should be any dependency other than an internal one. + elif isinstance(dep, dependencies.Dependency): scan_command += dep.get_compile_args() - for lib in dep.libs: - if os.path.isabs(lib) and dep.is_libtool: + for lib in dep.get_link_args(): + if (os.path.isabs(lib) and + # For PkgConfigDependency only: + getattr(dep, 'is_libtool', False)): scan_command += ["-L%s" % os.path.dirname(lib)] libname = os.path.basename(lib) if libname.startswith("lib"): @@ -251,9 +254,13 @@ class GnomeModule: continue scan_command += [lib] - girdir = dep.get_variable("girdir") - if girdir: - scan_command += ["--add-include-path=%s" % (girdir, )] + if isinstance(dep, dependencies.PkgConfigDependency): + girdir = dep.get_variable("girdir") + if girdir: + scan_command += ["--add-include-path=%s" % (girdir, )] + elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): + for incd in dep.get_include_dirs(): + scan_command += incd.get_incdirs() else: mlog.log('dependency %s not handled to build gir files' % dep) continue -- cgit v1.1 From 28e1f3ba13c00eff2040effb9c12078351107c20 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Sep 2016 16:59:53 -0400 Subject: Fix pkgconfig libraries passed to GIR targets. --- mesonbuild/modules/gnome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8da9035..3609d2f 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -252,7 +252,7 @@ class GnomeModule: # Hack to avoid passing some compiler options in if lib.startswith("-W"): continue - scan_command += [lib] + scan_command += [lib] if isinstance(dep, dependencies.PkgConfigDependency): girdir = dep.get_variable("girdir") -- cgit v1.1