fixup! cargo build - mpy-files symlink

Author: cepetr

core/embed/upymod/build.rs

@@ -295,6 +295,9 @@ fn main() -> Result<()> {
             // Build frozen_mpy.c if frozen modules are enabled
             let mpy_frozen_c = mpy_builder.build_frozen_modules(&qstr_preprocessed)?;
             lib.add_source(mpy_frozen_c);
+
+            // Add symlink to __oot/src folder
+            create_mpy_files_symlink()?;
         }
 
         if cfg!(not(feature = "emulator")) {
@@ -363,6 +366,33 @@ fn define_scm_revision(lib: &mut CLibrary) -> Result<u8> {
     Ok(xor2)
 }
 
+/// Creates a symlink to the __oot/src folder used
+/// when generating test coverage reports that need to process *.i files
+fn create_mpy_files_symlink() -> Result<()> {
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let symlink_path = out_dir.join("../../../mpy-files");
+    let target_path = out_dir.join("__oot/src");
+
+    if symlink_path.exists() {
+        std::fs::remove_file(&symlink_path).with_context(|| {
+            format!(
+                "Failed to remove existing symlink at {}",
+                symlink_path.display()
+            )
+        })?;
+    }
+
+    std::os::unix::fs::symlink(&target_path, &symlink_path).with_context(|| {
+        format!(
+            "Failed to create symlink from {} to {}",
+            symlink_path.display(),
+            target_path.display()
+        )
+    })?;
+
+    Ok(())
+}
+
 struct MpyBuilder<'a> {
     lib: &'a CLibrary,
     crate_dir: PathBuf,

core/embed/xtask/src/artifacts.rs

@@ -12,6 +12,15 @@ fn copy_if_newer(src: &Path, dst: &Path) -> Result<bool> {
         return Ok(false);
     }
 
+    if src.symlink_metadata()?.file_type().is_symlink() {
+        let target = fs::read_link(src)?;
+        if dst.exists() {
+            fs::remove_file(dst)?;
+        }
+        std::os::unix::fs::symlink(target, dst)?;
+        return Ok(true);
+    }
+
     if dst.exists() {
         let src_modified = src
             .metadata()
@@ -68,6 +77,9 @@ pub fn collect_artifacts(args: &BuildArgs, is_dependency: bool) -> Result<()> {
             profile.join(format!("{binary_name}.map")),
             format!("{name}.map"),
         ));
+    } else {
+        let mpy_files = "mpy-files";
+        artifacts.push((profile.join(mpy_files), mpy_files.to_string()));
     }
 
     for (src, dst_name) in &artifacts {