diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-15 20:05:56 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-13 23:05:11 +0300 |
| commit | 40156e422a8810a5de1aae5d3b0728031c8777da (patch) | |
| tree | cd4115cc0e2a77d8dfd8af1bff2bd3427f8e9f9c /mesonbuild/modules/gnome.py | |
| parent | f5d530ef714bcbe72640a88ee8db9a041d88ce15 (diff) | |
| download | meson-0.42-msi.tar.gz | |
Make all functionality invokable via the main Meson binary,0.42-msi
which can be a Windows .exe file.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0e632c2d5..e1d077d8f 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -660,7 +660,7 @@ class GnomeModule(ExtensionModule): if kwargs: raise MesonException('Unknown arguments passed: {}'.format(', '.join(kwargs.keys()))) - script = [sys.executable, state.environment.get_build_command()] + script = state.environment.get_build_command() args = ['--internal', 'yelphelper', 'install', @@ -676,20 +676,20 @@ class GnomeModule(ExtensionModule): args.append('--langs=' + '@@'.join(langs)) inscript = build.RunScript(script, args) - potargs = [state.environment.get_build_command(), '--internal', 'yelphelper', 'pot', + potargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'pot', '--subdir=' + state.subdir, '--id=' + project_id, '--sources=' + source_str] - pottarget = build.RunTarget('help-' + project_id + '-pot', sys.executable, - potargs, [], state.subdir) + pottarget = build.RunTarget('help-' + project_id + '-pot', potargs[0], + potargs[1:], [], state.subdir) - poargs = [state.environment.get_build_command(), '--internal', 'yelphelper', 'update-po', + poargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'update-po', '--subdir=' + state.subdir, '--id=' + project_id, '--sources=' + source_str, '--langs=' + '@@'.join(langs)] - potarget = build.RunTarget('help-' + project_id + '-update-po', sys.executable, - poargs, [], state.subdir) + potarget = build.RunTarget('help-' + project_id + '-update-po', poargs[0], + poargs[1:], [], state.subdir) rv = [inscript, pottarget, potarget] return ModuleReturnValue(None, rv) @@ -717,7 +717,7 @@ class GnomeModule(ExtensionModule): raise MesonException('You can only specify main_xml or main_sgml, not both.') main_file = main_xml targetname = modulename + '-doc' - command = [sys.executable, state.environment.get_build_command()] + command = state.environment.get_build_command() namespace = kwargs.get('namespace', '') mode = kwargs.get('mode', 'auto') |