diff --git a/NOTICE.md b/NOTICE.md index 09f2aaf1c8d..b52c9de038d 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -37,7 +37,7 @@ which can be obtained at: * HOMEPAGE: * http://luajit.org/ -This product depends on 'Lua', The Lua Programing Language, +This product depends on 'Lua', The Lua Programming Language, which can be obtained at: * LICENSE: diff --git a/README.md b/README.md index c2e35a8ad9e..2a0b77f444e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
- +

xmake

@@ -53,7 +53,7 @@ Support this project by [becoming a sponsor](https://xmake.io/#/about/sponsor). ## Technical support -You can also consider sponsoring us to get extra technical support services via the [Github sponsor program](https://github.com/sponsors/waruqi). If you do, you can get access to the [xmake-io/technical-support](https://github.com/xmake-io/technical-support) repository, which has the following bennefits: +You can also consider sponsoring us to get extra technical support services via the [Github sponsor program](https://github.com/sponsors/waruqi). If you do, you can get access to the [xmake-io/technical-support](https://github.com/xmake-io/technical-support) repository, which has the following benefits: - [X] Handling Issues with higher priority - [X] One-to-one technical consulting service @@ -119,7 +119,7 @@ target("console") Creates a new target `console` of kind `binary`, and adds all the files ending in `.c` in the `src` directory. -## Package dependences +## Package dependencies ```lua add_requires("tbox 1.6.*", "zlib", "libpng ~1.6") @@ -133,7 +133,7 @@ The official xmake package repository exists at: [xmake-repo](https://github.com

-## Commandline interface reference +## Command line interface reference The below assumes you are currently in the project's root directory. diff --git a/README_zh.md b/README_zh.md index 9a9fb222b7e..efbb47e046a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,6 +1,6 @@
- +

xmake

diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua index bcd0169b16d..f7fb2e4eeed 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 ef72c44897c..8d64b7891ca 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 48b10445f57..05f873dcb1d 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))