Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/about/who_is_using_xmake.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
If you are using Xmake, please click to edit [this page](https://github.com/xmake-io/xmake-docs/edit/master/docs/zh/about/who_is_using_xmake.md) to submit your information to the following list, so more users can know how many people are using Xmake.
If you are using Xmake, please click to edit [this page](https://github.com/xmake-io/xmake-docs/edit/master/docs/about/who_is_using_xmake.md) to submit your information to the following list, so more users can know how many people are using Xmake.

This also allows users to use Xmake more confidently, and gives us more motivation to maintain it continuously,
so that the Xmake project and community will grow stronger.
Expand Down
2 changes: 1 addition & 1 deletion docs/api/description/global-interfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ We can set build version in v2.1.7 version:
set_version("1.5.1", {build = "%Y%m%d%H%M"})
```

We can also add version to the config header files, @see [add_configfiles](/zh/api/description/project-target#add-configfiles)
We can also add version to the config header files, @see [add_configfiles](/api/description/project-target#add-configfiles)

:::tip NOTE
We can set the version globally, but now we can also set it individually in the target field.
Expand Down
2 changes: 1 addition & 1 deletion docs/api/description/package-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ end

- Adjust the link order within the package

For specific details, please see the target's internal documentation for `add_linkorders`, [target:add_linkorders](/zh/api/description/project-target#add-linkorders).
For specific details, please see the target's internal documentation for `add_linkorders`, [target:add_linkorders](/api/description/project-target#add-linkorders).

```lua
package("libpng")
Expand Down
4 changes: 2 additions & 2 deletions docs/guide/basic-commands/run-targets.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ $ xmake run foo --arg1=xxx --arg2=yyy
At this time, we cannot omit the target name, and must specify the target name to be run, otherwise it will cause parameter ambiguity.
:::

We can also use the [set_runargs](/zh/api/description/project-target#set-runargs) configuration interface of the target to specify the incoming run parameters without having to specify them in the command line every time.
We can also use the [set_runargs](/api/description/project-target#set-runargs) configuration interface of the target to specify the incoming run parameters without having to specify them in the command line every time.

## Set the working directory for running

Expand All @@ -73,7 +73,7 @@ $ xmake run -w /tmp foo

We changed the running directory of the foo program to /tmp/.

In addition, we can also specify the running parameters passed in through the target's [set_rundir](/zh/api/description/project-target#set-rundir) configuration interface, without having to specify them in the command line each time.
In addition, we can also specify the running parameters passed in through the target's [set_rundir](/api/description/project-target#set-rundir) configuration interface, without having to specify them in the command line each time.

## Debugging programs

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/basic-commands/switch-toolchains.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ We can switch toolchains globally by passing the `--toolchain=[name]` parameter
This method is global. If we want to switch toolchains for a specific target, we need to use the [set_toolchains](/api/description/project-target#set-toolchains) interface in the xmake.lua configuration.
:::

If we want to switch it in the xmake.lua project configuration file, we can go to: [Configure the toolchain](/zh/guide/project-configuration/toolchain-configuration) for further information.
If we want to switch it in the xmake.lua project configuration file, we can go to: [Configure the toolchain](/guide/project-configuration/toolchain-configuration) for further information.

In addition, Xmake also provides some commonly used toolchains that can be switched directly, but the premise is that the user has installed the corresponding toolchain environment on the system.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Previously, we mentioned that we can use the command line `xmake f --toolchain=[name]` to switch toolchains globally. For more information,
see: [Command line toolchain switching](/guide/basic-commands/switch-toolchains).

Although switching in the command line is fast and convenient, it can only switch globally. If there are multiple targets in the project, and we only want to switch the toolchain for one of them, we can use [set_toolchains](/zh/api/description/project-target.html#set-toolchains) in the configuration file to configure it.
Although switching in the command line is fast and convenient, it can only switch globally. If there are multiple targets in the project, and we only want to switch the toolchain for one of them, we can use [set_toolchains](/api/description/project-target.html#set-toolchains) in the configuration file to configure it.

For example:

Expand Down
4 changes: 2 additions & 2 deletions docs/posts/xmake-update-v2.5.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Among them, we set the code directory location of the foo package through `set_s
If only the local source code is integrated, we don't need to set additional `add_urls` and `add_versions`.
:::

For the configuration description of the package, see: [Package description description](/zh/guide/package-management/package-distribution).
For the configuration description of the package, see: [Package description description](/guide/package-management/package-distribution).

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The link text "Package description description" is redundant. It should probably be "Package Distribution" to match the title of the linked page.

Suggested change
For the configuration description of the package, see: [Package description description](/guide/package-management/package-distribution).
For the configuration description of the package, see: [Package Distribution](/guide/package-management/package-distribution).


After defining the package, we can integrate it with `add_requires("foo")` and `add_packages("foo")`, just like integrating remote packages.

Expand Down Expand Up @@ -300,7 +300,7 @@ Both `package.tools.autoconf` and `package.tools.cmake` modules can support cros

#### Integrate with other build systems

We also support the integration of code libraries maintained by other build systems such as Meson/Scons/Make. You only need to import the corresponding build auxiliary modules. I won’t go into details here. We can further check the documentation: [Integrate local third-party source code libraries ](/zh/guide/package-management/using-official-packages)
We also support the integration of code libraries maintained by other build systems such as Meson/Scons/Make. You only need to import the corresponding build auxiliary modules. I won’t go into details here. We can further check the documentation: [Integrate local third-party source code libraries ](/guide/package-management/using-official-packages)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

There are two issues here:

  1. The link text has a trailing space.
  2. The link points to /guide/package-management/using-official-packages, but the content about integrating local third-party source code libraries is in /guide/package-management/package-distribution.md. The link should be updated.
Suggested change
We also support the integration of code libraries maintained by other build systems such as Meson/Scons/Make. You only need to import the corresponding build auxiliary modules. I won’t go into details here. We can further check the documentation: [Integrate local third-party source code libraries ](/guide/package-management/using-official-packages)
We also support the integration of code libraries maintained by other build systems such as Meson/Scons/Make. You only need to import the corresponding build auxiliary modules. I won’t go into details here. We can further check the documentation: [Integrate local third-party source code libraries](/guide/package-management/package-distribution)


### Improve compiler feature detection

Expand Down