Skip to content

Commit

Permalink
Merge pull request #5511 from xmake-io/package
Browse files Browse the repository at this point in the history
Improve invalid path for package
  • Loading branch information
waruqi authored Aug 26, 2024
2 parents ce3d162 + 688514b commit 0204508
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
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
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

0 comments on commit 0204508

Please sign in to comment.