diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-12-19 18:30:16 +0100 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-12-19 18:34:02 +0100 |
| commit | 971a3a3cd9ad652047eb2eb015db693abac66589 (patch) | |
| tree | af906e82e25bed1f173df47e7b1b2fa679eb081e | |
| parent | 1590e185f4e4ed3b7a7bdc99f5858718ea9b8a2a (diff) | |
| download | meson-971a3a3cd9ad652047eb2eb015db693abac66589.zip meson-971a3a3cd9ad652047eb2eb015db693abac66589.tar.gz meson-971a3a3cd9ad652047eb2eb015db693abac66589.tar.bz2 | |
tree-wide: remove trailing whitespaces
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index e25e9f0..f85d378 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -645,7 +645,7 @@ class Backend(): # Subprojects of subprojects may cause the same dep args to be used # multiple times. Remove duplicates here. Note that we can't dedup - # libraries based on name alone, because "-lfoo -lbar -lfoo" is + # libraries based on name alone, because "-lfoo -lbar -lfoo" is # a completely valid (though pathological) sequence and removing the # latter may fail. Usually only applies to static libs, though. def dedup_arguments(self, commands): @@ -662,4 +662,4 @@ class Backend(): previous = c final_commands.append(c) return final_commands - + diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 9590ab3..3ba63f4 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -258,7 +258,7 @@ class Vs2010Backend(backends.Backend): ofile.write('\tEndGlobalSection\n') ofile.write('\tGlobalSection(ProjectConfigurationPlatforms) = ' 'postSolution\n') - ofile.write('\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n' % + ofile.write('\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n' % (self.environment.coredata.regen_guid, self.buildtype, self.platform, self.buildtype, self.platform)) ofile.write('\t\t{%s}.%s|%s.Build.0 = %s|%s\n' % @@ -928,7 +928,7 @@ class Vs2010Backend(backends.Backend): 'ToolsVersion' : '4.0', 'xmlns' : 'http://schemas.microsoft.com/developer/msbuild/2003'}) confitems = ET.SubElement(root, 'ItemGroup', {'Label' : 'ProjectConfigurations'}) - prjconf = ET.SubElement(confitems, 'ProjectConfiguration', + prjconf = ET.SubElement(confitems, 'ProjectConfiguration', {'Include' : self.buildtype + '|' + self.platform}) p = ET.SubElement(prjconf, 'Configuration') p.text= self.buildtype diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 54c1300..65c0214 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -205,7 +205,7 @@ base_options = { 'Enable coverage tracking.', False), 'b_colorout' : coredata.UserComboOption('b_colorout', 'Use colored output', - ['auto', 'always', 'never'], + ['auto', 'always', 'never'], 'always'), 'b_ndebug' : coredata.UserBooleanOption('b_ndebug', 'Disable asserts', @@ -2561,12 +2561,12 @@ class SunFortranCompiler(FortranCompiler): class IntelFortranCompiler(FortranCompiler): std_warn_args = ['-warn', 'all'] - + def __init__(self, exelist, version, is_cross, exe_wrapper=None): self.file_suffixes = ('f', 'f90') super().__init__(exelist, version, is_cross, exe_wrapper=None) self.id = 'intel' - + def get_module_outdir_args(self, path): return ['-module', path] |