summaryrefslogtreecommitdiff
path: root/xmake
diff options
context:
space:
mode:
authorruki <[email protected]>2024-06-04 23:31:27 +0800
committerGitHub <[email protected]>2024-06-04 23:31:27 +0800
commit94f3f0df160d69dcd52d0c01573ca40ad8bdae01 (patch)
tree0409c08844e5d6307db7311c760223b225ab8d83 /xmake
parent38ae0ac6591f098f7ed47a69b9ec01e6723575ed (diff)
parent3ee51f721dadf8efd9207ac927f1e29844ee676b (diff)
Merge pull request #5188 from zchrissirhcz/fix-typos
fix typos
Diffstat (limited to 'xmake')
-rw-r--r--xmake/modules/private/action/require/impl/install_packages.lua4
-rw-r--r--xmake/modules/private/action/require/impl/package.lua6
-rw-r--r--xmake/plugins/project/vstudio/impl/vs200x_solution.lua2
3 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua
index bcd0169b1..f7fb2e4ee 100644
--- a/xmake/modules/private/action/require/impl/install_packages.lua
+++ b/xmake/modules/private/action/require/impl/install_packages.lua
@@ -282,7 +282,7 @@ function _fetch_packages(packages_fetch, installdeps)
while instance == nil and #packages_pending > 0 do
for idx, pkg in ipairs(packages_pending) do
- -- all dependences has been fetched? we fetch it now
+ -- all dependencies has been fetched? we fetch it now
local ready = true
local dep_not_ready = nil
for _, dep in pairs(installdeps[tostring(pkg)]) do
@@ -408,7 +408,7 @@ function _install_packages(packages_install, packages_download, installdeps)
while instance == nil and #packages_pending > 0 do
for idx, pkg in ipairs(packages_pending) do
- -- all dependences has been installed? we install it now
+ -- all dependencies has been installed? we install it now
local ready = true
local dep_not_found = nil
for _, dep in pairs(installdeps[tostring(pkg)]) do
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index ef72c4489..8d64b7891 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -1058,7 +1058,7 @@ function _load_packages(requires, opt)
package._ORDERDEPS = table.unique(_sort_packagedeps(package))
package._LIBRARYDEPS = table.reverse_unique(_sort_librarydeps(package))
package._LIBRARYDEPS_WITH_PRIVATE = table.reverse_unique(_sort_librarydeps(package, {private = true}))
- -- we always need load dependences everytime
+ -- we always need load dependencies everytime
-- @see https://github.com/xmake-io/xmake/issues/4522
local packagedeps = {}
for _, dep in ipairs(package._ORDERDEPS) do
@@ -1092,7 +1092,7 @@ function _get_parents_str(package)
end
end
--- check dependences conflicts
+-- check dependencies conflicts
--
-- It exists conflict for dependent packages for each root packages? resolve it first
-- e.g.
@@ -1112,7 +1112,7 @@ function _check_package_depconflicts(package)
local key = _get_packagekey(dep:name(), dep:requireinfo())
local prevkey = packagekeys[dep:name()]
if prevkey then
- assert(key == prevkey, "package(%s): conflict dependences with package(%s) in %s!", key, prevkey, package:name())
+ assert(key == prevkey, "package(%s): conflict dependencies with package(%s) in %s!", key, prevkey, package:name())
else
packagekeys[dep:name()] = key
end
diff --git a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
index 48b10445f..05f873dcb 100644
--- a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
+++ b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
@@ -41,7 +41,7 @@ function _make_projects(slnfile, vsinfo)
-- enter project
slnfile:enter("Project(\"{%s}\") = \"%s\", \"%s\\%s.vcproj\", \"{%s}\"", vctool, targetname, targetname, targetname, hash.uuid4(targetname))
- -- add dependences
+ -- add dependencies
for _, dep in ipairs(target:get("deps")) do
slnfile:enter("ProjectSection(ProjectDependencies) = postProject")
slnfile:print("{%s} = {%s}", hash.uuid4(dep), hash.uuid4(dep))