diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rwxr-xr-x | mesontest.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index e568213..fe90478 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1769,7 +1769,7 @@ rule FORTRAN_DEP_HACK curdir = target.get_subdir() tmppath = os.path.normpath(os.path.join(self.build_to_src, curdir)) src_inc = compiler.get_include_args(tmppath, False) - if curdir == '': + if curdir == '': curdir = '.' build_inc = compiler.get_include_args(curdir, False) commands += build_inc + src_inc @@ -1781,7 +1781,7 @@ rule FORTRAN_DEP_HACK for i in target.get_include_dirs(): basedir = i.get_curdir() for d in i.get_incdirs(): - expdir = os.path.join(basedir, d) + expdir = os.path.join(basedir, d) srctreedir = os.path.join(self.build_to_src, expdir) # There may be include dirs where a build directory has not been # created for some source dir. For example if someone does this: diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 304dd40..c517c5b 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -330,7 +330,7 @@ class BuildTarget(): if isinstance(s, (str, File, ExtractedObjects)): self.objects.append(s) elif isinstance(s, (GeneratedList, CustomTarget)): - msg = 'Generated files are not allowed in the \'objects\' kwarg ' + \ + msg = 'Generated files are not allowed in the \'objects\' kwarg ' + \ 'for target {!r}.\nIt is meant only for '.format(self.name) + \ 'pre-built object files that are shipped with the\nsource ' + \ 'tree. Try adding it in the list of sources.' diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index c0e8851..884a0d8 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -965,7 +965,7 @@ class QtBaseDependency(Dependency): if not self.qmake.found(): continue # Check that the qmake is for qt5 - pc, stdo = Popen_safe(self.qmake.fullpath + ['-v'])[0:2] + pc, stdo = Popen_safe(self.qmake.fullpath + ['-v'])[0:2] if pc.returncode != 0: continue if not 'Qt version ' + self.qtver in stdo: @@ -978,7 +978,7 @@ class QtBaseDependency(Dependency): return self.version = re.search(self.qtver + '(\.\d+)+', stdo).group(0) # Query library path, header path, and binary path - stdo = Popen_safe(self.qmake.fullpath + ['-query'])[1] + stdo = Popen_safe(self.qmake.fullpath + ['-query'])[1] qvars = {} for line in stdo.split('\n'): line = line.strip() diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 6c59f52..c693c8d 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -48,7 +48,7 @@ class PkgConfigModule: # '${prefix}' is ignored if the second path is absolute (see # 'os.path.join' for details) ofile.write('libdir=%s\n' % os.path.join('${prefix}', coredata.get_builtin_option('libdir'))) - ofile.write('includedir=%s\n' % os.path.join('${prefix}', coredata.get_builtin_option('includedir'))) + ofile.write('includedir=%s\n' % os.path.join('${prefix}', coredata.get_builtin_option('includedir'))) ofile.write('\n') ofile.write('Name: %s\n' % name) if len(description) > 0: diff --git a/mesontest.py b/mesontest.py index 240b4f7..88d0527 100755 --- a/mesontest.py +++ b/mesontest.py @@ -346,7 +346,7 @@ class TestHarness: logfile = None try: if not self.options.verbose: - jsonlogfile = open(jsonlogfilename, 'w') + jsonlogfile = open(jsonlogfilename, 'w') logfile = open(logfilename, 'w') logfile.write('Log of Meson test suite run on %s.\n\n' % datetime.datetime.now().isoformat()) |