diff options
| author | Ninja-Koala <mail@ninjakoa.la> | 2018-09-19 19:33:36 +0200 |
|---|---|---|
| committer | Ninja-Koala <mail@ninjakoa.la> | 2019-02-01 22:02:20 +0100 |
| commit | 27edd112e220e2483c69687cfc107bd250f3a257 (patch) | |
| tree | 41ea1fd7bcb68a99d5128ba5ea67d04170d905a2 | |
| parent | b4f04a67de3dd13027be523d1c14e6e7485a9af5 (diff) | |
| download | meson-27edd112e220e2483c69687cfc107bd250f3a257.zip meson-27edd112e220e2483c69687cfc107bd250f3a257.tar.gz meson-27edd112e220e2483c69687cfc107bd250f3a257.tar.bz2 | |
Fix code formatting
| -rw-r--r-- | mesonbuild/modules/gnome.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 09e8a53..50b077c 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -187,9 +187,9 @@ class GnomeModule(ExtensionModule): ld = ld_obj.get_command() objcopy_object = self.interpreter.find_program_impl('objcopy', required=False) if objcopy_object.found(): - objcopy = objcopy_object.get_command() + objcopy = objcopy_object.get_command() else: - objcopy = None + objcopy = None gresource = kwargs.pop('gresource_bundle', False) if gresource or gresource_ld_binary: @@ -242,9 +242,9 @@ class GnomeModule(ExtensionModule): target_g = GResourceTarget(g_name, state.subdir, state.subproject, g_kwargs) if gresource: # Only one target for .gresource files if target_g.get_id() not in self.interpreter.build.targets: - return ModuleReturnValue(target_g, [target_g]) + return ModuleReturnValue(target_g, [target_g]) else: - return ModuleReturnValue(target_g, []) + return ModuleReturnValue(target_g, []) target_c = GResourceTarget(name, state.subdir, state.subproject, kwargs) @@ -278,9 +278,9 @@ class GnomeModule(ExtensionModule): linkerscript_file = open(linkerscript_path, 'w') binary_name = os.path.join(state.subdir, g_output) - symbol_name = ''.join([ c if c.isalnum() else '_' for c in binary_name ]) + symbol_name = ''.join([c if c.isalnum() else '_' for c in binary_name]) - linkerscript_string = 'SECTIONS\n' + linkerscript_string = 'SECTIONS\n' linkerscript_string += '{\n' linkerscript_string += ' .gresource.' + c_name_no_underscores + ' : ALIGN(8)\n' linkerscript_string += ' {\n' @@ -301,32 +301,32 @@ class GnomeModule(ExtensionModule): } target_o2 = GResourceObjectTarget(args[0] + '2_o', state.subdir, state.subproject, o2_kwargs) - if objcopy != None: + if objcopy is not None: objcopy_cmd = [objcopy, '--set-section-flags', '.gresource.' + c_name + '=readonly,alloc,load,data'] objcopy_cmd += ['-N', '_binary_' + symbol_name + '_start'] objcopy_cmd += ['-N', '_binary_' + symbol_name + '_end'] objcopy_cmd += ['-N', '_binary_' + symbol_name + '_size'] - objcopy_cmd += ['@INPUT@','@OUTPUT@'] + objcopy_cmd += ['@INPUT@', '@OUTPUT@'] o3_kwargs = { - 'command': objcopy_cmd, - 'input': target_o2, - 'output': args[0] + '3.o' + 'command': objcopy_cmd, + 'input': target_o2, + 'output': args[0] + '3.o' } target_o3 = GResourceObjectTarget(args[0] + '3_o', state.subdir, state.subproject, o3_kwargs) rv1 = [target_c, target_h, target_o3] if target_g.get_id() not in self.interpreter.build.targets: - rv2 = rv1 + [target_g, target_o, target_o2] + rv2 = rv1 + [target_g, target_o, target_o2] else: - rv2 = rv1 + [target_o, target_o2] + rv2 = rv1 + [target_o, target_o2] else: rv1 = [target_c, target_h, target_o2] if target_g.get_id() not in self.interpreter.build.targets: - rv2 = rv1 + [target_g, target_o] + rv2 = rv1 + [target_g, target_o] else: - rv2 = rv1 + [target_o] + rv2 = rv1 + [target_o] return ModuleReturnValue(rv1, rv2) |