diff options
| -rw-r--r-- | mesonbuild/backend/backends.py | 6 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 | ||||
| -rw-r--r-- | mesonbuild/backend/nonebackend.py | 8 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 24 | ||||
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 8 | ||||
| -rw-r--r-- | mesonbuild/msetup.py | 21 |
6 files changed, 30 insertions, 45 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 9e247b6..d425f06 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -292,12 +292,10 @@ class Backend: # to populate things like intellisense fields in generated visual studio # projects (as is the case when using '--genvslite'). # - # 'captured_compile_args_per_buildtype_and_target' is only provided when + # 'vslite_ctx' is only provided when # we expect this backend setup/generation to make use of previously captured # compile args (as is the case when using '--genvslite'). - def generate(self, - capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: raise RuntimeError(f'generate is not implemented in {type(self).__name__}') def get_target_filename(self, t: T.Union[build.Target, build.CustomTargetIndex], *, warn_multi_output: bool = True) -> str: diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 2139847..27be9a9 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -575,13 +575,11 @@ class NinjaBackend(backends.Backend): raise MesonException(f'Could not determine vs dep dependency prefix string. output: {stderr} {stdout}') - def generate(self, - capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: - if captured_compile_args_per_buildtype_and_target: + def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: + if vslite_ctx: # We don't yet have a use case where we'd expect to make use of this, # so no harm in catching and reporting something unexpected. - raise MesonBugException('We do not expect the ninja backend to be given a valid \'captured_compile_args_per_buildtype_and_target\'') + raise MesonBugException('We do not expect the ninja backend to be given a valid \'vslite_ctx\'') ninja = environment.detect_ninja_command_and_version(log=True) if self.environment.coredata.get_option(OptionKey('vsenv')): builddir = Path(self.environment.get_build_dir()) diff --git a/mesonbuild/backend/nonebackend.py b/mesonbuild/backend/nonebackend.py index 79ee7b2..35ec958 100644 --- a/mesonbuild/backend/nonebackend.py +++ b/mesonbuild/backend/nonebackend.py @@ -25,14 +25,12 @@ class NoneBackend(Backend): name = 'none' - def generate(self, - capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect the none backend to generate with \'capture = True\'') - if captured_compile_args_per_buildtype_and_target: - raise MesonBugException('We do not expect the none backend to be given a valid \'captured_compile_args_per_buildtype_and_target\'') + if vslite_ctx: + raise MesonBugException('We do not expect the none backend to be given a valid \'vslite_ctx\'') if self.build.get_targets(): raise MesonBugException('None backend cannot generate target rules, but should have failed earlier.') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 501525a..1962fc2 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -127,12 +127,12 @@ def get_primary_source_lang(target_sources: T.List[File], custom_sources: T.List # (pre-processor defines, include paths, additional compiler options) # fields to use to fill in the respective intellisense fields of sources that can't simply # reference and re-use the shared 'primary' language intellisense fields of the vcxproj. -def get_non_primary_lang_intellisense_fields(captured_compile_args_per_buildtype_and_target: dict, +def get_non_primary_lang_intellisense_fields(vslite_ctx: dict, target_id: str, primary_src_lang: str) -> T.Dict[str, T.Dict[str, T.Tuple[str, str, str]]]: defs_paths_opts_per_lang_and_buildtype = {} for buildtype in coredata.get_genvs_default_buildtype_list(): - captured_build_args = captured_compile_args_per_buildtype_and_target[buildtype][target_id] # Results in a 'Src types to compile args' dict + captured_build_args = vslite_ctx[buildtype][target_id] # Results in a 'Src types to compile args' dict non_primary_build_args_per_src_lang = [(lang, build_args) for lang, build_args in captured_build_args.items() if lang != primary_src_lang] # Only need to individually populate intellisense fields for sources of non-primary types. for src_lang, args_list in non_primary_build_args_per_src_lang: if src_lang not in defs_paths_opts_per_lang_and_buildtype: @@ -234,7 +234,7 @@ class Vs2010Backend(backends.Backend): def generate(self, capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: + vslite_ctx: dict = None) -> T.Optional[dict]: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect any vs backend to generate with \'capture = True\'') @@ -286,7 +286,7 @@ class Vs2010Backend(backends.Backend): except MesonException: self.sanitize = 'none' sln_filename = os.path.join(self.environment.get_build_dir(), self.build.project_name + '.sln') - projlist = self.generate_projects(captured_compile_args_per_buildtype_and_target) + projlist = self.generate_projects(vslite_ctx) self.gen_testproj() self.gen_installproj() self.gen_regenproj() @@ -541,7 +541,7 @@ class Vs2010Backend(backends.Backend): ofile.write('EndGlobal\n') replace_if_different(sln_filename, sln_filename_tmp) - def generate_projects(self, captured_compile_args_per_buildtype_and_target: dict = None) -> T.List[Project]: + def generate_projects(self, vslite_ctx: dict = None) -> T.List[Project]: startup_project = self.environment.coredata.options[OptionKey('backend_startup_project')].value projlist: T.List[Project] = [] startup_idx = 0 @@ -558,7 +558,7 @@ class Vs2010Backend(backends.Backend): relname = target_dir / fname projfile_path = outdir / fname proj_uuid = self.environment.coredata.target_guids[name] - generated = self.gen_vcxproj(target, str(projfile_path), proj_uuid, captured_compile_args_per_buildtype_and_target) + generated = self.gen_vcxproj(target, str(projfile_path), proj_uuid, vslite_ctx) if generated: projlist.append((name, relname, proj_uuid, target.for_machine)) @@ -1258,7 +1258,7 @@ class Vs2010Backend(backends.Backend): root: ET.Element, platform: str, target_ext: str, - captured_compile_args_per_buildtype_and_target: dict, + vslite_ctx: dict, target, proj_to_build_root: str, primary_src_lang: T.Optional[str]) -> None: @@ -1288,7 +1288,7 @@ class Vs2010Backend(backends.Backend): ET.SubElement(per_config_prop_group, 'IntDir').text = f'{proj_to_build_dir_for_buildtype}\\' ET.SubElement(per_config_prop_group, 'NMakeBuildCommandLine').text = f'{nmake_base_meson_command} compile -C "{proj_to_build_dir_for_buildtype}"' ET.SubElement(per_config_prop_group, 'NMakeOutput').text = f'$(OutDir){target.name}{target_ext}' - captured_build_args = captured_compile_args_per_buildtype_and_target[buildtype][target.get_id()] + captured_build_args = vslite_ctx[buildtype][target.get_id()] # 'captured_build_args' is a dictionary, mapping from each src file type to a list of compile args to use for that type. # Usually, there's just one but we could have multiple src types. However, since there's only one field for the makefile # project's NMake... preprocessor/include intellisense fields, we'll just use the first src type we have to fill in @@ -1632,7 +1632,7 @@ class Vs2010Backend(backends.Backend): # Returns bool indicating whether the .vcxproj has been generated. # Under some circumstances, it's unnecessary to create some .vcxprojs, so, when generating the .sln, # we need to respect that not all targets will have generated a project. - def gen_vcxproj(self, target: build.BuildTarget, ofname: str, guid: str, captured_compile_args_per_buildtype_and_target: dict = None) -> bool: + def gen_vcxproj(self, target: build.BuildTarget, ofname: str, guid: str, vslite_ctx: dict = None) -> bool: mlog.debug(f'Generating vcxproj {target.name}.') subsystem = 'Windows' self.handled_target_deps[target.get_id()] = [] @@ -1712,9 +1712,9 @@ class Vs2010Backend(backends.Backend): target, compiler, generated_files_include_dirs, proj_to_src_root, proj_to_src_dir, build_args) if self.gen_lite: - assert captured_compile_args_per_buildtype_and_target is not None + assert vslite_ctx is not None primary_src_lang = get_primary_source_lang(target.sources, custom_src) - self.add_gen_lite_makefile_vcxproj_elements(root, platform, tfilename[1], captured_compile_args_per_buildtype_and_target, target, proj_to_build_root, primary_src_lang) + self.add_gen_lite_makefile_vcxproj_elements(root, platform, tfilename[1], vslite_ctx, target, proj_to_build_root, primary_src_lang) else: self.add_non_makefile_vcxproj_elements(root, type_config, target, platform, subsystem, build_args, target_args, target_defines, target_inc_dirs, file_args) @@ -1789,7 +1789,7 @@ class Vs2010Backend(backends.Backend): if self.gen_lite: # Get data to fill in intellisense fields for sources that can't reference the project-wide values defs_paths_opts_per_lang_and_buildtype = get_non_primary_lang_intellisense_fields( - captured_compile_args_per_buildtype_and_target, + vslite_ctx, target.get_id(), primary_src_lang) if gen_src: diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index f8a5c23..c24074b 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -254,14 +254,12 @@ class XCodeBackend(backends.Backend): obj_path = f'{project}.build/{buildtype}/{tname}.build/Objects-normal/{arch}/{stem}.o' return obj_path - def generate(self, - capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: # Check for (currently) unexpected capture arg use cases - if capture: raise MesonBugException('We do not expect the xcode backend to generate with \'capture = True\'') - if captured_compile_args_per_buildtype_and_target: - raise MesonBugException('We do not expect the xcode backend to be given a valid \'captured_compile_args_per_buildtype_and_target\'') + if vslite_ctx: + raise MesonBugException('We do not expect the xcode backend to be given a valid \'vslite_ctx\'') self.serialize_tests() # Cache the result as the method rebuilds the array every time it is called. self.build_targets = self.build.get_build_targets() diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index ecf8b1e..6fee306 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -174,20 +174,15 @@ class MesonApp: return src_dir, build_dir # See class Backend's 'generate' for comments on capture args and returned dictionary. - def generate(self, - capture: bool = False, - captured_compile_args_per_buildtype_and_target: dict = None) -> T.Optional[dict]: + def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional[dict]: env = environment.Environment(self.source_dir, self.build_dir, self.options) mlog.initialize(env.get_log_dir(), self.options.fatal_warnings) if self.options.profile: mlog.set_timestamp_start(time.monotonic()) with mesonlib.BuildDirLock(self.build_dir): - return self._generate(env, capture = capture, captured_compile_args_per_buildtype_and_target = captured_compile_args_per_buildtype_and_target) + return self._generate(env, capture, vslite_ctx) - def _generate(self, - env: environment.Environment, - capture: bool, - captured_compile_args_per_buildtype_and_target: dict) -> T.Optional[dict]: + def _generate(self, env: environment.Environment, capture: bool, vslite_ctx: dict) -> T.Optional[dict]: # Get all user defined options, including options that have been defined # during a previous invocation or using meson configure. user_defined_options = argparse.Namespace(**vars(self.options)) @@ -253,9 +248,7 @@ class MesonApp: fname = os.path.join(self.build_dir, 'meson-logs', fname) profile.runctx('intr.backend.generate()', globals(), locals(), filename=fname) else: - captured_compile_args = intr.backend.generate( - capture = capture, - captured_compile_args_per_buildtype_and_target = captured_compile_args_per_buildtype_and_target) + captured_compile_args = intr.backend.generate(capture, vslite_ctx) build.save(b, dumpfile) if env.first_invocation: @@ -336,18 +329,18 @@ def run_genvslite_setup(options: argparse.Namespace) -> None: else: options.cmd_line_options[k_backend] = 'ninja' buildtypes_list = coredata.get_genvs_default_buildtype_list() - captured_compile_args_per_buildtype_and_target = {} + vslite_ctx = {} for buildtypestr in buildtypes_list: options.builddir = f'{builddir_prefix}_{buildtypestr}' # E.g. builddir_release options.cmd_line_options[mesonlib.OptionKey('buildtype')] = buildtypestr app = MesonApp(options) - captured_compile_args_per_buildtype_and_target[buildtypestr] = app.generate(capture = True) + vslite_ctx[buildtypestr] = app.generate(capture=True) #Now for generating the 'lite' solution and project files, which will use these builds we've just set up, above. options.builddir = f'{builddir_prefix}_vs' options.cmd_line_options[mesonlib.OptionKey('genvslite')] = genvsliteval app = MesonApp(options) - app.generate(capture = False, captured_compile_args_per_buildtype_and_target = captured_compile_args_per_buildtype_and_target) + app.generate(capture=False, vslite_ctx=vslite_ctx) def run(options: T.Union[argparse.Namespace, T.List[str]]) -> int: if not isinstance(options, argparse.Namespace): |