diff options
Diffstat (limited to 'zephyr/zmake/zmake/zmake.py')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 5d24e32ecb..a393b1c3e8 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -275,7 +275,10 @@ class Zmake: # Resolve build_dir if needed. if not build_dir: build_dir = ( - self.module_paths["ec"] / "build" / "zephyr" / project.config.name + self.module_paths["ec"] + / "build" + / "zephyr" + / project.config.project_name ) # Make sure the build directory is clean. if os.path.exists(build_dir): @@ -324,9 +327,11 @@ class Zmake: if not generated_include_dir.exists(): generated_include_dir.mkdir() processes = [] - self.logger.info("Building %s in %s.", project.config.name, build_dir) + self.logger.info("Building %s in %s.", project.config.project_name, build_dir) for build_name, build_config in project.iter_builds(): - self.logger.info("Configuring %s:%s.", project.config.name, build_name) + self.logger.info( + "Configuring %s:%s.", project.config.project_name, build_name + ) config = ( base_config | toolchain_config @@ -347,7 +352,7 @@ class Zmake: encoding="utf-8", errors="replace", ) - job_id = "{}:{}".format(project.config.name, build_name) + job_id = "{}:{}".format(project.config.project_name, build_name) zmake.multiproc.log_output( self.logger, logging.DEBUG, @@ -373,7 +378,7 @@ class Zmake: # To reconstruct a Project object later, we need to know the # name and project directory. - (build_dir / "project_name.txt").write_text(project.config.name) + (build_dir / "project_name.txt").write_text(project.config.project_name) util.update_symlink(project.config.project_dir, build_dir / "project") if test_after_configure: @@ -559,7 +564,7 @@ class Zmake: ).values(): is_test = project.config.is_test temp_build_dir = tempfile.mkdtemp( - suffix="-{}".format(project.config.name), + suffix="-{}".format(project.config.project_name), prefix="zbuild-", ) tmp_dirs.append(temp_build_dir) @@ -643,7 +648,7 @@ class Zmake: return 0 def _coverage_compile_only(self, project, build_dir, lcov_file): - self.logger.info("Building %s in %s", project.config.name, build_dir) + self.logger.info("Building %s in %s", project.config.project_name, build_dir) rv = self._configure( project=project, build_dir=build_dir, @@ -722,7 +727,9 @@ class Zmake: lcov_file, is_configured=False, ): - self.logger.info("Running test %s in %s", project.config.name, build_dir) + self.logger.info( + "Running test %s in %s", project.config.project_name, build_dir + ) if not is_configured: rv = self._configure( project=project, |