diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-16 22:03:26 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 17:37:35 -0500 |
commit | a01919976eb08277bad78bb22937601cf5a862e0 (patch) | |
tree | e366cba35d5e16664c5e3557fd44eb5f17149b07 /mesonbuild/modules/gnome.py | |
parent | 996f4d89f3d60731306a6a72b339eb5c2dbb5020 (diff) | |
download | meson-a01919976eb08277bad78bb22937601cf5a862e0.zip meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.gz meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.bz2 |
Always specify installed data with a File object. Closes #858.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
-rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index e15147a..114114d 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -921,13 +921,13 @@ can not be used with the current version of glib-compiled-resources, due to vapi_args = ret + self._vapi_args_to_command('--pkg=', 'packages', kwargs, accept_vapi=True) return vapi_args, vapi_depends, vapi_packages, vapi_includes - def _generate_deps(self, state, library, packages, indir): + def _generate_deps(self, state, library, packages, install_dir): outdir = state.environment.scratch_dir fname = os.path.join(outdir, library + '.deps') with open(fname, 'w') as ofile: for package in packages: ofile.write(package + '\n') - return build.Data(False, outdir, [fname], indir) + return build.Data(mesonlib.File(True, outdir, fname), install_dir) def _get_vapi_link_with(self, target): link_with = [] @@ -993,6 +993,7 @@ can not be used with the current version of glib-compiled-resources, due to # We shouldn't need this locally but we install it deps_target = self._generate_deps(state, library, vapi_packages, install_dir) + # XXX WRONG, state objects must not be modified! Fix this! state.data.append(deps_target) vapi_target = VapiTarget(vapi_output, state.subdir, custom_kwargs) |