Skip to content

[tool][mkdist]修复disk命令的bug:1.重复在SConstruct注入RTT_ROOT;2.重建dist时遇到无权限删除… - #11874

Open
CXSforHPU wants to merge 1 commit into
RT-Thread:masterfrom
CXSforHPU:fix_mkdist
Open

CXSforHPU wants to merge 1 commit into
RT-Thread:masterfrom
CXSforHPU:fix_mkdist

Conversation

@CXSforHPU

@CXSforHPU CXSforHPU commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

…的目录或文件会直接先尝试删掉但并不会再次copy

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

scons --dist 在同一目录上重复执行、或目标 dist 目录里残留只读文件时,
tools/mkdist.py 表现异常:

  1. bsp_update_sconstruct 重复注入 RTT_ROOT 块

    • 命中含 RTT_ROOT + sys.path 的行时,函数只向流里前置写入 3
      行新代码并保留原行,原始 sys.path 行永远不被移除;
    • 每次 scons --dist 都再注入一遍,导致 dist/SConstruct 里
      # set RTT_ROOT / if not os.getenv("RTT_ROOT"): ... 块不断累积;
  2. do_copy_folder 撞只读/被锁文件直接放弃整次 copy

    • 目标目录里有 Windows 上常见的只读文件(如 BSP 自带的
      packages/CMSIS-Core-latest/.git/objects/pack/*.idx、杀毒残留、
      文件索引器占句柄等)时,shutil.rmtree 抛 WinError 5 (拒绝访问);
    • 原代码裸 except 吞掉异常直接 return,rmtree 失败后
      copytree 也不执行
      ,整次 dist 中断;
    • 用户必须手动 rm -rf dist/project 才能恢复,对开发体验影响很大。

你的解决方案是什么 (what is your solution)

1.先读一边文档是否已经存在 # set RTT_ROOT;存在便直接返回

2.对于捕获到无法删除的,先清除其只读位进行删除

请提供验证的bsp和config (provide the config and bsp)

  • BSP:
  • .config:
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions github-actions Bot added the tools label Oct 16, 2026
@github-actions

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 fix_mkdist
    Enter PR branch fix_mkdist in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 fix_mkdist 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix_mkdist branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@CXSforHPU
CXSforHPU marked this pull request as draft October 16, 2026 17:44
@github-actions

github-actions Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

@CXSforHPU
CXSforHPU marked this pull request as ready for review October 16, 2026 18:08

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant