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

[DFS] add Kconfig for dfs-v2.0 #7156

Merged
merged 3 commits into from
Apr 4, 2023
Merged

Conversation

BernardXiong
Copy link
Member

@BernardXiong BernardXiong commented Apr 2, 2023

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

合并DFS v2.0相关的Kconfig,其他部分陆续合并到dfs v2中,同时具备一定的兼容性。

当前拉取/合并请求的状态 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

components/Kconfig_dfs Outdated Show resolved Hide resolved
components/dfs/SConscript Outdated Show resolved Hide resolved
CPPPATH = [cwd + "/include"]
group = []

if GetDepend('RT_USING_DFS') and not GetDepend('RT_USING_DFS_V2'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if GetDepend('RT_USING_DFS') and not GetDepend('RT_USING_DFS_V2'):
if GetDepend('RT_USING_DFS_V1'):

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样改后,ci一堆的错

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

得刷工程,那就不用改了,我没啥问题了,可以先合进去,后面细节可以边推进边改 Sconscript那里改改 我就没啥问题了

# The set of source files associated with this SConscript file.
src = []
cwd = GetCurrentDir()
CPPPATH = [cwd + "/include"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

尽量采用os.path.join代替直接拼接带/字符串的路径,因为不同操作系统路径分隔符不一样,os.path.join可以自动处理不同操作系统的问题,之前遇到过类似的问题。

Suggested change
CPPPATH = [cwd + "/include"]
CPPPATH = [os.path.join(cwd, 'include')]

CPPPATH = [cwd + "/include"]
group = []

if GetDepend('RT_USING_DFS') and GetDepend('RT_USING_DFS_V2'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if GetDepend('RT_USING_DFS') and GetDepend('RT_USING_DFS_V2'):
if GetDepend('RT_USING_DFS_V2'):

# The set of source files associated with this SConscript file.
src = []
cwd = GetCurrentDir()
CPPPATH = [cwd + "/include"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上 用os.path.join函数处理路径粘合

@BernardXiong BernardXiong merged commit 23955ed into RT-Thread:master Apr 4, 2023
@BernardXiong BernardXiong deleted the dfs_v2 branch June 4, 2023 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants