powertrain-build 1.11.7.dev1__tar.gz → 1.11.7.dev2__tar.gz

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/ChangeLog

@@ -1,6 +1,7 @@
 CHANGES
 =======
 
+* Dummy 1
 * ZC updates
 
 1.11.6

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev1
+Version: 1.11.7.dev2
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/README.md

@@ -1,4 +1,4 @@
-# powertrain-build
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/powertrain_build/build.py

@@ -212,7 +212,7 @@ def generate_dummy_spm(build_cfg, unit_cfg, feature_cfg, signal_if, udt):
         _add_undefined_signals_from_unit(data)
 
     dummy_spm = DummySpm(
-        undefined_outports, build_cfg, feature_cfg, unit_cfg, udt, f"{prefix}Dummy_spm"
+        undefined_outports, build_cfg, feature_cfg, unit_cfg, udt, f"{prefix}VcDummy_spm"
     )
     dummy_spm.generate_files(dst_dir)
     LOG.info("Finished generating output vars (in %4.2f s)", time.time() - start_time)
@@ -615,6 +615,71 @@ def propagate_tag_name(build_cfg, tag_name, problem_logger):
     LOG.info("Finished propagating tag name (in %4.2f s)", time.time() - start_time)
 
 
+def patch_target_link_sources(build_cfg):
+    """Patch TargetLink generated source files to instead include prefixed version of common headers.
+    Common headers will also be renamed accordingly.
+
+    Args:
+        build_cfg (BuildProjConfig): Build project class holding where files should be stored.
+    """
+    patch_tl_sources = build_cfg.get_code_generation_config("patchTargetLinkSources")
+    prefix = build_cfg.get_scheduler_prefix()
+    if not patch_tl_sources:
+        return
+    elif patch_tl_sources and not prefix:
+        LOG.warning(
+            "patchTargetLinkSources is set to true but schedulerPrefix is not defined. "
+            "Skipping patching of TargetLink generated source files."
+        )
+        return
+
+    start_time = time.time()
+    LOG.info("******************************************************")
+    LOG.info("Start patching TargetLink generated source files")
+
+    mem_map_files = []
+    for section_dict in build_defs.PREDECL_EXTRA.values():
+        for section_file in section_dict.values():
+            mem_map_files.append(section_file)
+    for asil_dict in build_defs.ASIL_LEVEL_MAP.values():
+        for type_dict in asil_dict.values():
+            for section_dict in type_dict.values():
+                for section_file in section_dict.values():
+                    mem_map_files.append(section_file)
+    for nvm_dict in build_defs.NVM_LEVEL_MAP.values():
+        for section_dict in nvm_dict.values():
+            for section_file in section_dict.values():
+                mem_map_files.append(section_file)
+    nvm_defs = build_cfg.get_nvm_defs()
+    tl_headers_to_prefix = [
+        ZCCore.FILE_NAME + ".h",
+        build_cfg.get_ts_header_name(),
+        build_cfg.get_feature_conf_header_name(),
+        nvm_defs["fileName"] + ".h",
+    ]
+    tl_headers_to_prefix.extend(mem_map_files)
+
+    src_code_dst_dir = build_cfg.get_src_code_dst_dir()
+    for file_path in [f for f in Path(src_code_dst_dir).glob("*") if f.suffix in [".c", ".h"]]:
+        with file_path.open(mode="r", encoding="utf-8") as file_handle:
+            content = file_handle.read()
+        for header in tl_headers_to_prefix:
+            content = content.replace(f'#include "{header}"', f'#include "{prefix}{header}"')
+        with file_path.open(mode="w", encoding="utf-8") as file_handle:
+            file_handle.write(content)
+
+    for header_file in tl_headers_to_prefix:
+        source_file = Path(src_code_dst_dir, header_file).with_suffix(".c")
+        if source_file.exists():
+            source_file.replace(Path(src_code_dst_dir, f"{prefix}{header_file}").with_suffix(".c"))
+        Path(src_code_dst_dir, header_file).replace(Path(src_code_dst_dir, f"{prefix}{header_file}"))
+
+    LOG.info(
+        "Finished patching TargetLink generated source files (in %4.2f s)",
+        time.time() - start_time,
+    )
+
+
 def add_args(parser):
     """Add command line arguments for powertrain_build.
 
@@ -965,6 +1030,8 @@ def build(
                     core = Core(build_cfg, unit_cfg)
                     generate_core_dummy(build_cfg, core, unit_cfg)
 
+        patch_target_link_sources(build_cfg)
+
         if problem_logger.errors():
             problem_logger.info(
                 "Critical errors were detected, aborting" " after %4.2f s.",

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/powertrain_build/build_proj_config.py

@@ -67,7 +67,6 @@ class BuildProjConfig:
             'generalAsilLevelDebug': 'B',
             'generalAsilLevelDependability': 'B',
             'generateCalibrationInterfaceFiles': False,
-            'useCalibrationRteMacroExpansion': False,
             'generateCoreDummy': False,
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,
@@ -76,9 +75,11 @@ class BuildProjConfig:
             'includeAllEnums': False,
             'mapToRteEnums': False,
             'propagateTagName': False,
+            'patchTargetLinkSources': False,
             'useA2lSymbolLinks': False,
             'useRteNvmStructs': False,
-            'useCamelCaseForNvmVariables': False
+            'useCamelCaseForNvmVariables': False,
+            'useCalibrationRteMacroExpansion': False,
         }
 
     def _get_code_generation_config(self):

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/powertrain_build/dids.py

@@ -618,7 +618,7 @@ class ZCDIDs(ProblemLogger):
         self._unit_cfgs = unit_cfgs
         self._valid_dids = None
         prefix = build_cfg.get_scheduler_prefix()
-        self._file_name = f'{prefix}DIDAPI'
+        self._file_name = f'{prefix}VcDIDAPI'
         self.project_dids = self._get_project_dids()
 
     @property

{powertrain_build-1.11.7.dev1 → powertrain_build-1.11.7.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev1
+Version: 1.11.7.dev2
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

powertrain_build-1.11.7.dev2/powertrain_build.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "b4279b4", "is_release": false}

powertrain_build-1.11.7.dev1/powertrain_build.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "3cffe55", "is_release": false}