From ea46daa7bc600fec61b1962f1ebb6d948907040c Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 17 Sep 2020 22:08:35 +0530 Subject: [PATCH] Revert "windows: reduce chance of going over path limit in backend/vs" This reverts commit 807f88739ebfa002c9a0b9acd3e24c9610fb02a2. --- mesonbuild/modules/windows.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index ac28d6525..605070542 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -119,23 +119,22 @@ class WindowsModule(ExtensionModule): src = unholder(src) if isinstance(src, str): - name_formatted = src + name_format = 'file {!r}' name = os.path.join(state.subdir, src) elif isinstance(src, mesonlib.File): - name_formatted = src.fname + name_format = 'file {!r}' name = src.relative_name() elif isinstance(src, build.CustomTarget): if len(src.get_outputs()) > 1: raise MesonException('windows.compile_resources does not accept custom targets with more than 1 output.') - name_formatted = src.get_basename() + name_format = 'target {!r}' name = src.get_id() else: raise MesonException('Unexpected source type {!r}. windows.compile_resources accepts only strings, files, custom targets, and lists thereof.'.format(src)) # Path separators are not allowed in target names name = name.replace('/', '_').replace('\\', '_') - name_formatted = name_formatted.replace('/', '_').replace('\\', '_') res_kwargs = { 'output': name + '_@BASENAME@.' + suffix, @@ -150,7 +149,7 @@ class WindowsModule(ExtensionModule): res_kwargs['depfile'] = res_kwargs['output'] + '.d' res_kwargs['command'] += ['--preprocessor-arg=-MD', '--preprocessor-arg=-MQ@OUTPUT@', '--preprocessor-arg=-MF@DEPFILE@'] - res_targets.append(build.CustomTarget(name_formatted, state.subdir, state.subproject, res_kwargs)) + res_targets.append(build.CustomTarget('Windows resource for ' + name_format.format(name), state.subdir, state.subproject, res_kwargs)) add_target(args)