diff options
Diffstat (limited to 'manual')
| -rw-r--r-- | manual/extension_modules.md | 6 | ||||
| -rw-r--r-- | manual/global_interfaces.md | 4 | ||||
| -rw-r--r-- | manual/plugin_task.md | 2 | ||||
| -rw-r--r-- | manual/project_target.md | 24 |
4 files changed, 18 insertions, 18 deletions
diff --git a/manual/extension_modules.md b/manual/extension_modules.md index c51de69c..db41c58d 100644 --- a/manual/extension_modules.md +++ b/manual/extension_modules.md @@ -149,7 +149,7 @@ function main(...) -- Run the built-in xmake configuration task, equivalent to: xmake f|config --plat=iphoneos --arch=armv7 task.run("config", {plat="iphoneos", arch="armv7"}) -emd +end ``` ### core.tool.linker @@ -289,7 +289,7 @@ For the target, link the specified object file list to generate the correspondin compiler.compile("xxx.c", "xxx.o", "xxx.h.d", {target = target}) ``` -Where [target](#target) is the project target, here is the specific compile option that is mainly used to get the taeget. If you get the project target object, see: [core.project.project](#core-project-project) +Where [target](#target) is the project target, here is the specific compile option that is mainly used to get the target. If you get the project target object, see: [core.project.project](#core-project-project) The `xxx.h.d` file is used to store the header file dependency file list for this source file. Finally, these two parameters are optional. You can not pass them when compiling: @@ -870,7 +870,7 @@ end Load specific language objects from the source file extension: `.cc, .c, .cpp, .mm, .swift, .go ..`, for example: ```lua -local lang = language.load_sk(".cpp") +local lang = language.load_ex(".cpp") if lang then print(lang:name()) end diff --git a/manual/global_interfaces.md b/manual/global_interfaces.md index f47762f2..362e5ca6 100644 --- a/manual/global_interfaces.md +++ b/manual/global_interfaces.md @@ -320,7 +320,7 @@ Of course, if we have no special requirements for the version of the dependency add_requires("tbox", "libpng", "zlib") ``` -This will use the latest known version of the package, or the source code compiled from the master branch. If the current package has a git repo address we can also specify a specific branch version: +This will use the latest known version of the package, or the source code compiled from the master branch. If the current package has a git repository address we can also specify a specific branch version: ```lua add_requires("tbox master") @@ -483,7 +483,7 @@ We can add through this interface: add_repositories("my-repo git@github.com:myrepo/xmake-repo.git") ``` -If we just want to add one or two private packages, this time to build a git repo is too big, we can directly put the package repository into the project, for example: +If we just want to add one or two private packages, this time to build a git repository is too big, we can directly put the package repository into the project, for example: ``` projectdir diff --git a/manual/plugin_task.md b/manual/plugin_task.md index b3bbcde4..4dcf72c8 100644 --- a/manual/plugin_task.md +++ b/manual/plugin_task.md @@ -162,7 +162,7 @@ Options: -P PROJECT, --project=PROJECT Change to the given project directory. Search priority: 1. The Given Command Argument - 2. The Envirnoment Variable: XMAKE_PROJECT_DIR + 2. The Environment Variable: XMAKE_PROJECT_DIR 3. The Current Directory -b, --bright Enable bright. diff --git a/manual/project_target.md b/manual/project_target.md index 48de9038..de911434 100644 --- a/manual/project_target.md +++ b/manual/project_target.md @@ -30,7 +30,7 @@ target("test2") | [set_strip](#targetset_strip) | Strip target symbols | >= 1.0.1 | | [set_enabled](#targetset_enabled) | Enable or disable target | >= 2.2.2 | | [set_default](#targetset_default) | Mark as default target | >= 2.1.3 | -| [set_options](#targetset_options) | Set configuartion options | >= 1.0.1 | +| [set_options](#targetset_options) | Set configuration options | >= 1.0.1 | | [set_symbols](#targetset_symbols) | Set symbol info | >= 1.0.1 | | [set_basename](#targetset_basename) | Set the base name of target file | >= 2.1.2 | | [set_filename](#targetset_filename) | Set the full name of target file | >= 2.1.2 | @@ -43,7 +43,7 @@ target("test2") | [set_dependir](#targetset_dependir) | Set output directories for dependent files | >= 2.2.2 | | [add_imports](#targetadd_imports) | Add imported modules for the custom script | >= 2.1.7 | | [add_rules](#targetadd_rules) | Add custom compilation rule to target | >= 2.1.9 | -| [on_load](#targeton_load) | Run custom load target configuartion script | >= 2.1.5 | +| [on_load](#targeton_load) | Run custom load target configuration script | >= 2.1.5 | | [on_link](#targeton_link) | Run custom link target script | >= 2.2.7 | | [on_build](#targeton_build) | Run custom build target script | >= 2.0.1 | | [on_build_file](#targeton_build_file) | Run custom build single file script | >= 2.2.3 | @@ -113,17 +113,17 @@ target("test2") | [add_frameworkdirs](#targetadd_frameworkdirs) | Add framework search directories | >= 2.1.5 | | [set_tools](#targetset_tools) | Set toolchains | >= 2.2.1 | | [add_tools](#targetadd_tools) | Add toolchains | >= 2.2.1 | -| [set_values](#targetset_values) | Set custom configuartion values | >= 2.2.1 | -| [add_values](#targetadd_values) | Add custom configuartion values | >= 2.2.1 | +| [set_values](#targetset_values) | Set custom configuration values | >= 2.2.1 | +| [add_values](#targetadd_values) | Add custom configuration values | >= 2.2.1 | | [set_rundir](#targetset_rundir) | Set run directory | >= 2.2.7 | | [add_runenvs](#targetadd_runenvs) | Add run environments | >= 2.2.7 | | [set_runenv](#targetset_runenv) | Set run environment | >= 2.2.8 | | [set_installdir](#targetset_installdir) | Set the installation directory | >= 2.2.5 | | [add_installfiles](#targetadd_installfiles) | add installation files | >= 2.2.5 | | [add_headerfiles](#targetadd_headerfiles) | Add header files | >= 2.2.5 | -| [set_configdir](#targetset_configdir) | Set the output directory of configuartion files | >= 2.2.5 | -| [set_configvar](#targetset_configvar) | Set template configuartion variable | >= 2.2.5 | -| [add_configfiles](#targetadd_configfiles) | Add template configuartion files | >= 2.2.5 | +| [set_configdir](#targetset_configdir) | Set the output directory of configuration files | >= 2.2.5 | +| [set_configvar](#targetset_configvar) | Set template configuration variable | >= 2.2.5 | +| [add_configfiles](#targetadd_configfiles) | Add template configuration files | >= 2.2.5 | ### target @@ -137,10 +137,10 @@ target("test") add_files("src/*.c") ``` -And we can call `target("demo")` repeatly to enter the target scope for modifying it's configuartion. +And we can call `target("demo")` repeatedly to enter the target scope for modifying it's configuration. ```lua --- defines target: demo and enter it's scope to set configuartion +-- defines target: demo and enter it's scope to set configuration target("demo") set_kind("binary") add_files("src/demo.c") @@ -155,7 +155,7 @@ target("demo") ``` <p class="tip"> -All configuartion in root scope affects all targets, but does not affect the configuartion of `option()`. +All configuration in root scope affects all targets, but does not affect the configuration of `option()`. </p> For example: @@ -299,7 +299,7 @@ $ xmake install [-a|--all] ### target:set_options -#### Set configuartion options +#### Set configuration options Add option dependencies. If you have customized some options through the [option](#option) interface, you can add associations only if you specify this option under the target target field. @@ -609,7 +609,7 @@ We can also specify the application of local files to the rules, see: [add_files ### target:on_load -#### Run custom load target configuartion script +#### Run custom load target configuration script This script will be executed when the target is initialized and loaded, and some dynamic target configurations can be made to achieve more flexible target description definitions, for example: |