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.

Sign up for GitHub

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

Improve invalid path for package #5511

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Improve invalid path for package #5511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0783a48
update changelog
waruqi Aug 26, 2024
688514b
fix invalid path
waruqi Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

### Changes

* [#5507](https://github.com/xmake-io/xmake/issues/5507): Use treeless to improve git.clone

### Bugs fixed

* [#4750](https://github.com/xmake-io/xmake/issues/4750): Fix compile_commands generator for `xmake tests`
Expand Down Expand Up @@ -1875,6 +1877,8 @@

### 改进

* [#5507](https://github.com/xmake-io/xmake/issues/5507): 改进 git clone 下载速度

### Bugs 修复

* [#4750](https://github.com/xmake-io/xmake/issues/4750): 修复 compile_commands 生成器，支持 `xmake tests`
Expand Down
8 changes: 4 additions & 4 deletions xmake/core/package/package.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,8 @@ function _instance:cachedir()
--
local name = self:displayname():lower():gsub("::", "_"):gsub("#", "_")
local version_str = self:version_str()
if self:is_thirdparty() then
-- strip `>= <=`
-- strip invalid characters on windows, e.g. `>= <=`
if is_host("windows") then
version_str = version_str:gsub("[>=<]", "")
end
if self:is_local() then
Expand Down Expand Up @@ -812,8 +812,8 @@ function _instance:installdir(...)
end
local version_str = self:version_str()
if version_str then
if self:is_thirdparty() then
-- strip `>= <=`
-- strip invalid characters on windows, e.g. `>= <=`
if is_host("windows") then
version_str = version_str:gsub("[>=<]", "")
end
installdir = path.join(installdir, version_str)
Expand Down
Loading