summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-01 23:59:12 +0800
committerruki <[email protected]>2020-12-01 23:59:12 +0800
commitecf2bff17bd3fb76f618dcb75a42df28926dda40 (patch)
tree082ec8ed0fadc35cce3d6ccba8c4f2e9975a3d96
parent87374404384ed1fad21e7c50b0707bf211cf2779 (diff)
improve package url version argument
-rw-r--r--xmake/actions/require/impl/utils/filter.lua2
-rw-r--r--xmake/core/base/semver.lua5
2 files changed, 6 insertions, 1 deletions
diff --git a/xmake/actions/require/impl/utils/filter.lua b/xmake/actions/require/impl/utils/filter.lua
index 2c545ade1..91e403844 100644
--- a/xmake/actions/require/impl/utils/filter.lua
+++ b/xmake/actions/require/impl/utils/filter.lua
@@ -85,7 +85,7 @@ function _handler(package, strval)
-- {version = function (version) return version:gsub("%.", "") end})
local version_filter = package:url_version(strval)
if version_filter then
- return version_filter(package:version_str())
+ return version_filter(package:version())
end
end
return package:version_str()
diff --git a/xmake/core/base/semver.lua b/xmake/core/base/semver.lua
index 4e97f6b7b..a8b348880 100644
--- a/xmake/core/base/semver.lua
+++ b/xmake/core/base/semver.lua
@@ -145,6 +145,11 @@ function _instance:__tostring()
return self:rawstr()
end
+-- add string compatible interface, string.gsub
+function _instance:gsub(...)
+ return self:rawstr():gsub(...)
+end
+
-- new an instance
function semver.new(version)