Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[update] Sort the source file path #5783

Merged
merged 1 commit into from
Apr 8, 2022

Conversation

liukangcc
Copy link
Member

@liukangcc liukangcc commented Apr 8, 2022

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

[
group['src'] 在每次 scons --target =xx 时会随机排序。

使用 sort 方法进行排序,防止乱序,已使用 cmake 进行测试

]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 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
  • 本拉取/合并使用formatting等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@liukangcc
Copy link
Member Author

#5745

@mysterywolf
Copy link
Member

康康 你就是人类的福音

@mysterywolf mysterywolf added the +1 Agree +1 label Apr 8, 2022
@Guozhanxin
Copy link
Member

image

我看也不是所有的group都会运行到 MergeGroup这里,没有运行到这里的那些group顺序会乱吗

@Guozhanxin
Copy link
Member

我试了试,感觉效果还挺好的,每次生成git不会变红了。

@QIANWC
Copy link

QIANWC commented Apr 8, 2022

还没完全解决,有以下问题:
1,INCLUDE_DIRECTORIES确实有序了,但不符合理想的字母表排序方式:
如图,sort()是按ASCII数值排列的,导致大写的BSP_Config会排在小写的appliaction之前
不熟悉python,但我觉得应该用sort(key=str.lower)
image

2,PROJECT_SOURCES还是随机

@liukangcc
Copy link
Member Author

整体排序不太好做,本次修改只是让当前文件夹下的文件路径进行了排序。每个 SConscript 文件生成了一个 group,多个 group 组成了 Projects。往 keil/iar/cmake 里面加入路径,是一边遍历,一边写。像 MDK 这种:

image

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
+1 Agree +1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants