powertrain-build 1.4.4.dev2__tar.gz → 1.4.5.dev2__tar.gz

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/ChangeLog

@@ -1,10 +1,11 @@
 CHANGES
 =======
 
-1.4.4.dev2
+1.4.5.dev2
 ----------
 
-* generate\_nvm\_init\_stuff
+* testing adding suffix to calibration\_interface\_file\_name
+* Compatability fix in build.py
 
 1.4.3
 -----

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.4.4.dev2
+Version: 1.4.5.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/
@@ -45,6 +45,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: download-url
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/powertrain_build/build.py

@@ -29,7 +29,7 @@ from powertrain_build.dummy_spm import DummySpm
 from powertrain_build.ext_dbg import ExtDbg
 from powertrain_build.ext_var import ExtVarCsv, ExtVarYaml
 from powertrain_build.feature_configs import FeatureConfigs
-from powertrain_build.lib.helper_functions import get_repo_root, merge_dicts
+from powertrain_build.lib.helper_functions import create_dir, get_repo_root, merge_dicts
 from powertrain_build.memory_section import MemorySection
 from powertrain_build.nvm_def import NVMDef, ZCNVMDef
 from powertrain_build.problem_logger import ProblemLogger
@@ -542,8 +542,12 @@ def copy_files_to_include(build_cfg):
     if missing_tree_paths:
         LOG.warning(f"Missing include paths: {missing_tree_paths}")
     for path in existing_tree_paths:
-        shutil.copytree(path, src_dst_dir, dirs_exist_ok=True)
-        LOG.debug(f"copied {path} to {src_dst_dir}")
+        for file_ in path.rglob("*"):
+            if file_.is_file():
+                new_path = Path(src_dst_dir, file_.relative_to(path))
+                create_dir(new_path.parent)
+                shutil.copy2(file_, new_path)
+                LOG.debug("copied %s to %s", file_, new_path)
     LOG.info(
         "Finished copying extra included files (in %4.2f s)", time.time() - start_time
     )

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/powertrain_build/nvm_def.py

@@ -671,6 +671,7 @@ class ZCNVMDef(NVMDef):
         ]
 
         error_status = []
+        nvsw_init_instructions = False
         main_function_lines = []
 
         for nvm_name, nvm_data in self.valid_nvm_definitions.items():
@@ -680,7 +681,6 @@ class ZCNVMDef(NVMDef):
                 main_function_lines.append(f"  *{pim_call} = {nvm_name.lower()};\n")
                 if nvm_data["type"] == "type1":
                     init_function_lines.append(f"  {function_prefix}_SetRamBlockStatus(TRUE);\n")
-                    init_function_lines.append(f"  {nvm_name.lower()} = *{pim_call};\n")
                 elif nvm_data["type"] == "type2":
                     error_status = ["  UInt8 errorStatus = 0;\n"]
                     main_function_lines.extend([
@@ -693,9 +693,7 @@ class ZCNVMDef(NVMDef):
                     self.critical(f"Unknown NVM type: {nvm_data['type']} for NVM: {nvm_name}")
             elif nvm_data["method"] == "NVSWCOMPONENT":
                 if nvm_data["type"] == "type1":
-                    init_function_lines.append(
-                        f"  (void)Rte_Read_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n"        
-                    )
+                    nvsw_init_instructions = True
                     main_function.append(
                         f"  (void)Rte_Write_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n"
                     )
@@ -708,6 +706,9 @@ class ZCNVMDef(NVMDef):
                         f"  // Nvm {nvm_name.lower()} is type 2, add call in manually written source code.\n"
                     )
 
+        if nvsw_init_instructions:
+            init_function_lines.append("  // NVSWCOMPONENTS init calls are scheduled by the arxml.\n")
+
         output = init_function_lines + footer + ["\n"] + main_function + error_status + main_function_lines + footer
         with open(self._file_name + ".c", mode="a", encoding="utf-8") as cptr:
             cptr.writelines(output)

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/powertrain_build/zone_controller/calibration.py

@@ -27,8 +27,9 @@ class ZoneControllerCalibration(ProblemLogger):
         self.swc_name = build_cfg.get_composition_config("softwareComponentName")
         self.src_code_dst_dir = build_cfg.get_src_code_dst_dir()
         self.calibration_variables = calib_data['class_info']
-        self.calibration_interface_header = 'calibration_interface.h'
-        self.calibration_interface_source = 'calibration_interface.c'
+        suffix = build_cfg.get_scheduler_prefix().rstrip("_")
+        self.calibration_interface_header = f'calibration_interface_{suffix}.h'
+        self.calibration_interface_source = f'calibration_interface_{suffix}.c'
         self.trigger_read_rte_cdata_signal_name = self.trigger_read_rte_cdata_signal['name_template'].format(
             swc_name=self.swc_name
         )

{powertrain_build-1.4.4.dev2 → powertrain_build-1.4.5.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.4.4.dev2
+Version: 1.4.5.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/
@@ -45,6 +45,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: download-url
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

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

@@ -0,0 +1 @@
+{"git_version": "bbbcc05", "is_release": true}

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

@@ -1 +0,0 @@
-{"git_version": "a4ed48d", "is_release": true}