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

convert windows path delimiter to posix (#2149) #2150

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

jjonethal
Copy link

@jjonethal jjonethal commented Dec 27, 2024

Fixes #2149
When generating lwip file system data convert windows directory separators by posix separators.
This is an issue when native directory during resource generation separator is "\" as on windows. Running toolchain from mingw64 python3 would also preserve "\" in resource name which would cause mismatch on resource lookup.
Fix should be portable with python 3.4 and up.

@peterharperuk peterharperuk self-requested a review December 27, 2024 21:27
@lurch
Copy link
Contributor

lurch commented Dec 27, 2024

ping @ndabas , in light of the work he did in #1841

Copy link
Contributor

@ndabas ndabas left a comment

Choose a reason for hiding this comment

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

The overall fix looks good to me.

src/rp2_common/pico_lwip/tools/makefsdata.py Outdated Show resolved Hide resolved
@jjonethal
Copy link
Author

added explicite posix conversion result variable 3a7f95d

Copy link
Author

@jjonethal jjonethal left a comment

Choose a reason for hiding this comment

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

intermediate posix path conversion result stored in file_path_posix.

@lurch
Copy link
Contributor

lurch commented Jan 1, 2025

LGTM, but I (currently) don't have access to a Windows PC with which to test this.

@peterharperuk peterharperuk added this to the 2.1.1 milestone Jan 2, 2025
@peterharperuk
Copy link
Contributor

Seems to work ok

@kilograham kilograham merged commit e7a0e61 into raspberrypi:develop Jan 7, 2025
4 checks passed
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.

5 participants