Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
zchrissirhcz committed Jun 4, 2024
1 parent a1d6ba0 commit 3ee51f7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<a href="https://xmake.io">
<img width="160" heigth="160" src="https://tboox.org/static/img/xmake/logo256c.png">
<img width="160" height="160" src="https://tboox.org/static/img/xmake/logo256c.png">
</a>

<h1>xmake</h1>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -133,7 +133,7 @@ The official xmake package repository exists at: [xmake-repo](https://github.com
<img src="https://github.com/xmake-io/xmake-docs/raw/master/assets/img/index/package.gif" width="650px" />
</p>

## Commandline interface reference
## Command line interface reference

The below assumes you are currently in the project's root directory.

Expand Down
2 changes: 1 addition & 1 deletion README_zh.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<a href="https://xmake.io/cn">
<img width="160" heigth="160" src="https://tboox.org/static/img/xmake/logo256c.png">
<img width="160" height="160" src="https://tboox.org/static/img/xmake/logo256c.png">
</a>

<h1>xmake</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions xmake/modules/private/action/require/impl/package.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xmake/plugins/project/vstudio/impl/vs200x_solution.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 3ee51f7

Please sign in to comment.