summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-11-29 00:00:39 +0800
committerruki <[email protected]>2024-11-29 00:00:39 +0800
commit36953ccf16f9765746471b47aca5b2611270b274 (patch)
tree9e56c50b8d5cd54e4e208b04971baa6f16dc8f02
parent5b6ccc1740802dda446cd4d95a748047bd66f80a (diff)
improve tests
-rw-r--r--tests/projects/package/compatibility/deps_with_version/xmake.lua5
-rw-r--r--xmake/modules/private/action/require/impl/package.lua4
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/projects/package/compatibility/deps_with_version/xmake.lua b/tests/projects/package/compatibility/deps_with_version/xmake.lua
index f0cc809b9..895b57d3b 100644
--- a/tests/projects/package/compatibility/deps_with_version/xmake.lua
+++ b/tests/projects/package/compatibility/deps_with_version/xmake.lua
@@ -1,13 +1,16 @@
package("foo")
- add_deps("zlib >=v1.2.13")
+ add_deps("zlib >=1.2.13")
+ on_install(function () end)
package_end()
package("bar")
add_deps("zlib")
+ on_install(function () end)
package_end()
package("test")
add_deps("foo", "bar")
+ on_install(function () end)
package_end()
add_requires("test")
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 5c0d1bf3d..cea24ba10 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -1191,6 +1191,8 @@ end
-- cannot be detected at present and can only be resolved by the user
--
function _check_package_depconflicts(package)
+ print("_check_package_depconflicts ..")
+ --[[
local packagekeys = {}
for _, dep in ipairs(package:librarydeps()) do
local key = _get_packagekey(dep:name(), dep:requireinfo())
@@ -1200,7 +1202,7 @@ function _check_package_depconflicts(package)
else
packagekeys[dep:name()] = key
end
- end
+ end]]
end
-- must depend on the given package?