[tool] fixed scons --target=xmake#10971
Conversation
|
👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。 🛠 操作步骤 | Steps
完成后,提交将自动更新至 如有问题欢迎联系我们,再次感谢您的贡献!💐 |
There was a problem hiding this comment.
Pull request overview
This PR fixes the xmake build file generation functionality that was broken by a previous structural change. The fix correctly separates the template file from the generated output file.
- Corrects the output path for generated xmake.lua file to write to BSP directory instead of overwriting the template
- Restores the xmake.lua template file to use proper template variables instead of hardcoded values
- Ensures the template-based generation workflow functions correctly
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| tools/targets/xmake.py | Fixed output path from tools/targets/xmake.lua to current directory xmake.lua, preventing template file from being overwritten |
| tools/targets/xmake.lua | Restored template variables (${toolchain}, ${sdkdir}, ${src_path}, etc.) replacing hardcoded BSP-specific values that shouldn't be in the template |
拉取/合并请求描述:(PR description)
[
之前修改结构的pr,破坏了xmake生成的功能。还原代码,修复功能
已经基于星火1号测试过了
为什么提交这份PR (why to submit this PR)
你的解决方案是什么 (what is your solution)
请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up