diff options
| -rwxr-xr-x | manual tests/4 standalone binaries/build_windows_package.py | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 15 | ||||
| -rw-r--r-- | mesonbuild/modules/qt4.py | 6 | ||||
| -rw-r--r-- | mesonbuild/modules/qt5.py | 6 | ||||
| -rw-r--r-- | mesonbuild/scripts/gettext.py | 2 | ||||
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 6 |
7 files changed, 21 insertions, 22 deletions
diff --git a/manual tests/4 standalone binaries/build_windows_package.py b/manual tests/4 standalone binaries/build_windows_package.py index c676113..c361aa0 100755 --- a/manual tests/4 standalone binaries/build_windows_package.py +++ b/manual tests/4 standalone binaries/build_windows_package.py @@ -23,10 +23,10 @@ libs = glob(os.path.join('build', sdl_dir, 'lib/x86/*')) # Sorry for this hack but this needs to work during development # when Meson is not in path. subprocess.check_call(['python3', r'..\..\meson.py', 'build', - '--backend=ninja', '--buildtype=release']) + '--backend=ninja', '--buildtype=release']) subprocess.check_call(['ninja'], cwd='build') shutil.copy('myapp.iss', 'build') subprocess.check_call([r'\Program Files\Inno Setup 5\ISCC.exe', 'myapp.iss'], - cwd = 'build') + cwd = 'build') shutil.copy('build/setup.exe', 'myapp 1.0.exe') shutil.rmtree('build') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index ac4bb0b..06f76e4 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -201,8 +201,8 @@ base_options = { 'Enable coverage tracking.', False), 'b_colorout': coredata.UserComboOption('b_colorout', 'Use colored output', - ['auto', 'always', 'never'], - 'always'), + ['auto', 'always', 'never'], + 'always'), 'b_ndebug': coredata.UserBooleanOption('b_ndebug', 'Disable asserts', False), diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 3f88585..f7aa0f2 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -593,15 +593,15 @@ can not be used with the current version of glib-compiled-resources, due to '--id=' + project_id, '--sources=' + source_str] pottarget = build.RunTarget('help-' + project_id + '-pot', sys.executable, - potargs, [], state.subdir) + potargs, [], state.subdir) poargs = [state.environment.get_build_command(), '--internal', 'yelphelper', 'update-po', - '--subdir=' + state.subdir, - '--id=' + project_id, - '--sources=' + source_str, - '--langs=' + '@@'.join(langs)] + '--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) + poargs, [], state.subdir) return [inscript, pottarget, potarget] @@ -1015,8 +1015,7 @@ can not be used with the current version of glib-compiled-resources, due to for i in inputs: if isinstance(i, str): cmd.append(os.path.join(source_dir, i)) - elif hasattr(i, 'held_object') \ - and isinstance(i.held_object, GirTarget): + elif hasattr(i, 'held_object') and isinstance(i.held_object, GirTarget): link_with += self._get_vapi_link_with(i.held_object) subdir = os.path.join(state.environment.get_build_dir(), i.held_object.get_subdir()) diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 8670533..beb7ca5 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -44,7 +44,7 @@ class Qt4Module(): moc_ver = stderr else: raise MesonException('Moc preprocessor is not for Qt 4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.moc.fullpath), moc_ver.split()[-1])) else: @@ -57,7 +57,7 @@ class Qt4Module(): uic_ver = stderr else: raise MesonException('Uic compiler is not for Qt4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.uic.fullpath), uic_ver.split()[-1])) else: @@ -70,7 +70,7 @@ class Qt4Module(): rcc_ver = stderr else: raise MesonException('Rcc compiler is not for Qt 4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\ % (' '.join(self.rcc.fullpath), rcc_ver.split()[-1])) else: diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 7a9f8f5..2e348db 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -46,7 +46,7 @@ class Qt5Module(): moc_ver = stdout else: raise MesonException('Moc preprocessor is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.moc.fullpath), moc_ver.split()[-1])) else: @@ -61,7 +61,7 @@ class Qt5Module(): uic_ver = stdout else: raise MesonException('Uic compiler is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.uic.fullpath), uic_ver.split()[-1])) else: @@ -76,7 +76,7 @@ class Qt5Module(): rcc_ver = stdout else: raise MesonException('Rcc compiler is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\ % (' '.join(self.rcc.fullpath), rcc_ver.split()[-1])) else: diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py index d463313..624790d 100644 --- a/mesonbuild/scripts/gettext.py +++ b/mesonbuild/scripts/gettext.py @@ -58,7 +58,7 @@ def run_potgen(src_sub, pkgname, datadirs, args): ofile = os.path.join(src_sub, pkgname + '.pot') return subprocess.call(['xgettext', '--package-name=' + pkgname, '-p', src_sub, '-f', listfile, '-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile] + args, - env=child_env) + env=child_env) def gen_gmo(src_sub, bld_sub, langs): for l in langs: diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index dead6fb..d812b4e 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -133,9 +133,9 @@ class Resolver: is_there = True except subprocess.CalledProcessError: raise RuntimeError('%s is not empty but is not a valid ' - 'git repository, we can not work with it' - ' as a subproject directory.' % ( - checkoutdir)) + 'git repository, we can not work with it' + ' as a subproject directory.' % ( + checkoutdir)) if revno.lower() == 'head': # Failure to do pull is not a fatal error, |