diff options
| author | Ninja-Koala <mail@ninjakoa.la> | 2019-02-02 23:02:33 +0100 |
|---|---|---|
| committer | Ninja-Koala <mail@ninjakoa.la> | 2019-02-02 23:02:33 +0100 |
| commit | b0832c8747fa3ebb8e2d6ffac2a44bc623499bbf (patch) | |
| tree | d24839ea5658bff6a8ceb6b3bccfa1697d63a8a7 /mesonbuild/modules | |
| parent | 34191ec018816ac68fc6366fb5b884da3eddd8ec (diff) | |
| download | meson-b0832c8747fa3ebb8e2d6ffac2a44bc623499bbf.zip meson-b0832c8747fa3ebb8e2d6ffac2a44bc623499bbf.tar.gz meson-b0832c8747fa3ebb8e2d6ffac2a44bc623499bbf.tar.bz2 | |
Move some additional functionality into the new function
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8bc9f43..2fa03b7 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -170,8 +170,6 @@ class GnomeModule(ExtensionModule): cmd += ['--c-name', c_name] else: c_name = os.path.basename(ifile).partition('.')[0] - c_name = c_name.replace('-', '_') - c_name_no_underscores = c_name.replace('_', '') export = kwargs.pop('export', False) if not export: cmd += ['--internal'] @@ -185,12 +183,6 @@ class GnomeModule(ExtensionModule): ld_obj = self.interpreter.find_program_impl('ld', required=False) if ld_obj.found(): gresource_ld_binary = True - ld = ld_obj.get_command() - objcopy_object = self.interpreter.find_program_impl('objcopy', required=False) - if objcopy_object.found(): - objcopy = objcopy_object.get_command() - else: - objcopy = None gresource = kwargs.pop('gresource_bundle', False) if gresource or gresource_ld_binary: @@ -267,13 +259,22 @@ class GnomeModule(ExtensionModule): target_h = GResourceHeaderTarget(args[0] + '_h', state.subdir, state.subproject, h_kwargs) if gresource_ld_binary: - return self._create_gresource_ld_binary_targets(ld, target_g, args, state, g_output, c_name_no_underscores, c_name, objcopy, target_c, target_h) + return self._create_gresource_ld_binary_targets(args, state, ld_obj, c_name, target_g, g_output, target_c, target_h) else: rv = [target_c, target_h] return ModuleReturnValue(rv, rv) - def _create_gresource_ld_binary_targets(self, ld, target_g, args, state, g_output, c_name_no_underscores, c_name, objcopy, target_c, target_h): + def _create_gresource_ld_binary_targets(self, args, state, ld_obj, c_name, target_g, g_output, target_c, target_h): + c_name = c_name.replace('-', '_') + c_name_no_underscores = c_name.replace('_', '') + + ld = ld_obj.get_command() + objcopy_object = self.interpreter.find_program_impl('objcopy', required=False) + if objcopy_object.found(): + objcopy = objcopy_object.get_command() + else: + objcopy = None o_kwargs = { 'command': [ld, '-r', '-b', 'binary', '@INPUT@', '-o', '@OUTPUT@'], |