diff options
| -rw-r--r-- | README.md | 18 | ||||
| -rw-r--r-- | cn/index.html | 6 | ||||
| -rw-r--r-- | cn/pages/donation.html | 6 | ||||
| -rw-r--r-- | config.js | 4 | ||||
| -rw-r--r-- | landing.html | 6 | ||||
| -rw-r--r-- | landing/_config.yml | 2 | ||||
| -rw-r--r-- | landing/_includes/page-footer.html | 2 | ||||
| -rw-r--r-- | landing/index.cn.md | 2 | ||||
| -rw-r--r-- | landing/index.md | 2 | ||||
| -rw-r--r-- | landing/pages/donation.cn.md | 2 | ||||
| -rw-r--r-- | landing/pages/donation.md | 2 | ||||
| -rw-r--r-- | manual.md | 78 | ||||
| -rw-r--r-- | pages/donation.html | 6 | ||||
| -rw-r--r-- | zh/README.md | 12 | ||||
| -rw-r--r-- | zh/manual.md | 14 |
15 files changed, 81 insertions, 81 deletions
@@ -4,8 +4,8 @@ search: en <p> <div align="center"> - <a href="http://xmake.io"> - <img width="200" heigth="200" src="http://tboox.org/static/img/xmake/logo256c.png"> + <a href="https://xmake.io"> + <img width="200" heigth="200" src="https://tboox.org/static/img/xmake/logo256c.png"> </a> <h1>xmake</h1> @@ -40,7 +40,7 @@ search: en <a href="https://jq.qq.com/?_wv=1027&k=5hpwWFv"> <img src="https://img.shields.io/badge/chat-on%20QQ-ff69b4.svg?style=flat-square" alt="QQ" /> </a> - <a href="http://xmake.io/pages/donation.html#donate"> + <a href="https://xmake.io/pages/donation.html#donate"> <img src="https://img.shields.io/badge/donate-us-orange.svg?style=flat-square" alt="Donate" /> </a> </div> @@ -973,7 +973,7 @@ $ xmake package -o ../test/packages In this way, the test project can pass [add_packages](https://xmake.io/#/zh/manual?id=targetadd_packages) and [add_packagedirs](https://xmake.io/#/zh/manual?id= add_packagedirs) to configure and use the tbox.pkg package. -For a detailed description of the built-in package, you can also refer to the following related article, which is described in detail: [Dependency package addition and automatic detection mechanism] (http://tboox.org/cn/2016/08/06/add-package -and-autocheck/) +For a detailed description of the built-in package, you can also refer to the following related article, which is described in detail: [Dependency package addition and automatic detection mechanism](https://tboox.org/cn/2016/08/06/add-package-and-autocheck/) #### System Search Mode @@ -1068,7 +1068,7 @@ xmake will remotely pull the relevant source package, then automatically compile <img src="/assets/img/index/package_manage.png" width="80%" /> -For more information and progress on package dependency management see the related issues: [Remote package management] (https://github.com/xmake-io/xmake/issues/69) +For more information and progress on package dependency management see the related issues: [Remote package management](https://github.com/xmake-io/xmake/issues/69) ##### Currently Supported Features @@ -1091,7 +1091,7 @@ Here we briefly introduce the processing mechanism of the entire dependency pack ##### Semantic Version Settings -Xmake's dependency package management fully supports semantic version selection, for example: "~1.6.1". For a detailed description of the semantic version, see: [http://semver.org/] (http://semver.org/) +Xmake's dependency package management fully supports semantic version selection, for example: "~1.6.1". For a detailed description of the semantic version, see: [https://semver.org/](https://semver.org/) Some semantic versions are written: @@ -1100,7 +1100,7 @@ add_requires("tbox 1.6.*", "pcre 1.3.x", "libpng ^1.18") add_requires("libpng ~1.16", "zlib 1.1.2 || >=1.2.11 <1.3.0") ``` -The semantic version parser currently used by xmake is the [sv](https://github.com/uael/sv) library contributed by [uael](https://github.com/uael), which also has a description of the version. For detailed instructions, please refer to the following: [Version Description] (https://github.com/uael/sv#versions) +The semantic version parser currently used by xmake is the [sv](https://github.com/uael/sv) library contributed by [uael](https://github.com/uael), which also has a description of the version. For detailed instructions, please refer to the following: [Version Description](https://github.com/uael/sv#versions) Of course, if we have no special requirements for the current version of the dependency package, then we can write directly: @@ -1266,7 +1266,7 @@ The above myrepo directory is your own private package repository, built into yo add_repositories("my-repo myrepo") ``` -This can be referred to [benchbox] (https://github.com/tboox/benchbox) project, which has a built-in private repository. +This can be referred to [benchbox](https://github.com/tboox/benchbox) project, which has a built-in private repository. We can even build a package without directly building a package description into the project xmake.lua, which is useful for relying on one or two packages, for example: @@ -1487,7 +1487,7 @@ If we only want to generate xmake.lua file, we can run: $ xmake f -y ``` -If you want to known more information please see [Scan source codes and build project without makefile](http://tboox.org/2017/01/07/build-without-makefile/) +If you want to known more information please see [Scan source codes and build project without makefile](https://tboox.org/2017/01/07/build-without-makefile/) ## Backers diff --git a/cn/index.html b/cn/index.html index dd103ff1..bd679bf1 100644 --- a/cn/index.html +++ b/cn/index.html @@ -275,7 +275,7 @@ <ul> <li>邮箱：<a href="mailto:waruqi@gmail.com">waruqi@gmail.com</a></li> - <li>主页：<a href="http://www.tboox.org/cn">tboox.org</a></li> + <li>主页：<a href="https://www.tboox.org/cn">tboox.org</a></li> <li>社区：<a href="https://www.reddit.com/r/tboox/">Reddit论坛</a></li> <li>聊天：<a href="https://t.me/tbooxorg">Telegram群组</a>, <a href="https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge">Gitter聊天室</a></li> <li>源码：<a href="https://github.com/xmake-io/xmake">Github</a>, <a href="https://gitee.com/tboox/xmake">Gitee</a></li> @@ -286,10 +286,10 @@ <footer class="site-footer"> - <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="http://www.tboox.org">tboox.org</a>.</span> + <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="https://www.tboox.org">tboox.org</a>.</span> <span class="site-footer-power"> <span> - <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="http://pages.coding.me">Coding Pages</a>.--> + <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.coding.me">Coding Pages</a>.--> Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.github.com/">Github Pages</a>. </span> <span> diff --git a/cn/pages/donation.html b/cn/pages/donation.html index 0c0b504b..63a69ce9 100644 --- a/cn/pages/donation.html +++ b/cn/pages/donation.html @@ -65,7 +65,7 @@ <h2 id="paypal">Paypal</h2> -<p><a href="http://paypal.me/tboox/5"><img src="/assets/img/paypal.png" alt="Paypal Me" /></a></p> +<p><a href="https://paypal.me/tboox/5"><img src="/assets/img/paypal.png" alt="Paypal Me" /></a></p> <h2 id="section-2">支持者</h2> @@ -178,10 +178,10 @@ <footer class="site-footer"> - <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="http://www.tboox.org">tboox.org</a>.</span> + <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="https://www.tboox.org">tboox.org</a>.</span> <span class="site-footer-power"> <span> - <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="http://pages.coding.me">Coding Pages</a>.--> + <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.coding.me">Coding Pages</a>.--> Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.github.com/">Github Pages</a>. </span> <span> @@ -29,7 +29,7 @@ docute.init({ title: 'Manual', path: '/manual' }, { - title: 'Articles', path: 'http://www.tboox.org/category/#xmake' + title: 'Articles', path: 'https://www.tboox.org/category/#xmake' }, { title: 'Feedback', path: 'https://github.com/xmake-io/xmake/issues' @@ -52,7 +52,7 @@ docute.init({ title: '手册', path: '/zh/manual' }, { - title: '文章', path: 'http://www.tboox.org/cn/category/#xmake' + title: '文章', path: 'https://www.tboox.org/cn/category/#xmake' }, { title: '反馈', path: 'https://github.com/xmake-io/xmake/issues' diff --git a/landing.html b/landing.html index 4e0a3a0e..622b4b0d 100644 --- a/landing.html +++ b/landing.html @@ -275,7 +275,7 @@ <ul> <li>Email：<a href="mailto:waruqi@gmail.com">waruqi@gmail.com</a></li> - <li>Homepage：<a href="http://www.tboox.org">tboox.org</a></li> + <li>Homepage：<a href="https://www.tboox.org">tboox.org</a></li> <li>Community：<a href="https://www.reddit.com/r/tboox/">/r/tboox on reddit</a></li> <li>ChatRoom：<a href="https://t.me/tbooxorg">Char on telegram</a>, <a href="https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge">Chat on gitter</a></li> <li>Source Code：<a href="https://github.com/xmake-io/xmake">Github</a>, <a href="https://gitee.com/tboox/xmake">Gitee</a></li> @@ -283,10 +283,10 @@ <footer class="site-footer"> - <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="http://www.tboox.org">tboox.org</a>.</span> + <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="https://www.tboox.org">tboox.org</a>.</span> <span class="site-footer-power"> <span> - <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="http://pages.coding.me">Coding Pages</a>.--> + <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.coding.me">Coding Pages</a>.--> Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.github.com/">Github Pages</a>. </span> <span> diff --git a/landing/_config.yml b/landing/_config.yml index ae817c14..accb3abb 100644 --- a/landing/_config.yml +++ b/landing/_config.yml @@ -10,7 +10,7 @@ paginate: 1 # About/contact author: name: waruqi - url: http://www.tboox.org + url: https://www.tboox.org #Others markdown: kramdown diff --git a/landing/_includes/page-footer.html b/landing/_includes/page-footer.html index d1c0229a..6e18f2ff 100644 --- a/landing/_includes/page-footer.html +++ b/landing/_includes/page-footer.html @@ -2,7 +2,7 @@ <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="{{ site.author.url }}">tboox.org</a>.</span> <span class="site-footer-power"> <span> - <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="http://pages.coding.me">Coding Pages</a>.--> + <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.coding.me">Coding Pages</a>.--> Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.github.com/">Github Pages</a>. </span> <span> diff --git a/landing/index.cn.md b/landing/index.cn.md index 4b3783e5..fc07fa80 100644 --- a/landing/index.cn.md +++ b/landing/index.cn.md @@ -212,7 +212,7 @@ target("test") ## 联系方式 * 邮箱：[waruqi@gmail.com](mailto:waruqi@gmail.com) -* 主页：[tboox.org](http://www.tboox.org/cn) +* 主页：[tboox.org](https://www.tboox.org/cn) * 社区：[Reddit论坛](https://www.reddit.com/r/tboox/) * 聊天：[Telegram群组](https://t.me/tbooxorg), [Gitter聊天室](https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) * 源码：[Github](https://github.com/xmake-io/xmake), [Gitee](https://gitee.com/tboox/xmake) diff --git a/landing/index.md b/landing/index.md index c09c451f..b36086ab 100644 --- a/landing/index.md +++ b/landing/index.md @@ -212,7 +212,7 @@ Some projects using xmake: ## Contacts * Email：[waruqi@gmail.com](mailto:waruqi@gmail.com) -* Homepage：[tboox.org](http://www.tboox.org) +* Homepage：[tboox.org](https://www.tboox.org) * Community：[/r/tboox on reddit](https://www.reddit.com/r/tboox/) * ChatRoom：[Char on telegram](https://t.me/tbooxorg), [Chat on gitter](https://gitter.im/tboox/tboox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) * Source Code：[Github](https://github.com/xmake-io/xmake), [Gitee](https://gitee.com/tboox/xmake) diff --git a/landing/pages/donation.cn.md b/landing/pages/donation.cn.md index fa60e88e..18ee0ef3 100644 --- a/landing/pages/donation.cn.md +++ b/landing/pages/donation.cn.md @@ -19,7 +19,7 @@ xmake项目属于个人开源项目，它的发展需要您的帮助，如果您 ## Paypal -[](http://paypal.me/tboox/5) +[](https://paypal.me/tboox/5) ## 支持者 diff --git a/landing/pages/donation.md b/landing/pages/donation.md index 653cf811..c5adf687 100644 --- a/landing/pages/donation.md +++ b/landing/pages/donation.md @@ -11,7 +11,7 @@ If you would like to support the development of xmake, welcome to donate to us. ## Paypal -[](http://paypal.me/tboox/5) +[](https://paypal.me/tboox/5) ## Backers @@ -603,7 +603,7 @@ However, we can still modify the default configuration in xmake.lua by `$xmake f ###### Add package dependencies -Xmake's dependency package management fully supports semantic version selection, for example: "~1.6.1". For a detailed description of semantic versioning, see: [http://semver.org/] (http://semver.org/) +Xmake's dependency package management fully supports semantic version selection, for example: "~1.6.1". For a detailed description of semantic versioning, see: [https://semver.org/](https://semver.org/) Some examples: @@ -612,7 +612,7 @@ add_requires("tbox 1.6.*", "pcre 1.3.x", "libpng ^1.18") add_requires("libpng ~1.16", "zlib 1.1.2 || >=1.2.11 <1.3.0") ``` -The semantic version parser currently used by xmake is the [sv](https://github.com/uael/sv) library contributed by [uael](https://github.com/uael), which also has a description of the version. For detailed instructions, please refer to the following: [Version Description] (https://github.com/uael/sv#versions) +The semantic version parser currently used by xmake is the [sv](https://github.com/uael/sv) library contributed by [uael](https://github.com/uael), which also has a description of the version. For detailed instructions, please refer to the following: [Version Description](https://github.com/uael/sv#versions) Of course, if we have no special requirements for the version of the dependency package, we can omit the version: @@ -1393,7 +1393,7 @@ target("test") add_files("src/*.markdown") ``` -We can also specify the application of local files to the rules, see: [add_files] (#targetadd_files). +We can also specify the application of local files to the rules, see: [add_files](#targetadd_files). ##### target:on_load @@ -1863,7 +1863,7 @@ When the target passes the following interfaces, the related option dependencies * [add_cfuncs](#targetadd_cfuncs) * [add_cxxfuncs](#targetadd_cxxfuncs) -These interfaces, in fact, use some of the detection settings in the [option] (#option) option, for example: +These interfaces, in fact, use some of the detection settings in the [option](#option) option, for example: ```lua option("wchar") @@ -1952,7 +1952,7 @@ When the target passes the following interfaces, the related option dependencies ###### Customize detection and generate configuration header files -These interfaces, in fact, use some of the detection settings in the [option] (#option) option, for example: +These interfaces, in fact, use some of the detection settings in the [option](#option) option, for example: ```lua option("wchar") @@ -2197,7 +2197,7 @@ target("test") add_files("src/test/*.md", {rule = "markdown"}) ``` -For instructions on using custom build rules, see: [Building Rules] (#Building Rules). +For instructions on using custom build rules, see: [Building Rules](#Building Rules). And after the 2.1.9 version, you can use the force parameter to force the automatic detection of cxflags, cflags and other compile options, directly into the compiler, even if the compiler may not support, it will also be set: @@ -2209,7 +2209,7 @@ add_files("src/*.c", {force = {cxflags = "-DTEST", mflags = "-framework xxx"}}) ###### Remove source files -Through this interface, you can delete the specified file from the list of files added by the [add_files] (targetadd_files) interface, for example: +Through this interface, you can delete the specified file from the list of files added by the [add_files](targetadd_files) interface, for example: ```lua target("test") @@ -2219,7 +2219,7 @@ target("test") In the above example, you can add all files except `test.c` from the `src` directory. Of course, this can also be done by `add_files("src/*.c|test.c").To achieve the same purpose, but this way is more flexible. -For example, we can conditionally determine which files to delete, and this interface also supports the matching mode of [add_files] (targetadd_files), filtering mode, and bulk removal. +For example, we can conditionally determine which files to delete, and this interface also supports the matching mode of [add_files](targetadd_files), filtering mode, and bulk removal. ```lua target("test") @@ -2325,7 +2325,7 @@ target("test") add_includedirs("$(buildir)/include") ``` -Of course, it can also be set directly through interfaces such as [add_cxflags] (#targetadd_cxflags) or [add_mxflags] (#targetadd_mxflags), which is also possible. +Of course, it can also be set directly through interfaces such as [add_cxflags](#targetadd_cxflags) or [add_mxflags](#targetadd_mxflags), which is also possible. After 2.2.5, includedirs can be exported to dependent child targets via the extra `{public|interface = true}` property setting, for example: @@ -2607,7 +2607,7 @@ This interface is the interface shared by `target` and `option`, but the interfa | Interface Field | Description | Examples | | ------ | ------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | | target | header files, link libraries, and function interfaces are also specified | `add_cfuncs("libc", nil, {"signal.h", "setjmp.h"}, "signal", "setjmp", "sigsetjmp{sigjmp_buf buf ; sigsetjmp(buf, 0);}", "kill")` | -Option | only specifies the function interface, the header file depends on [add_cincludes] (#targetadd_cincludes) and other independent interfaces | `add_cincludes("setjmp.h")` `add_cfuncs("sigsetjmp")` | +Option | only specifies the function interface, the header file depends on [add_cincludes](#targetadd_cincludes) and other independent interfaces | `add_cincludes("setjmp.h")` `add_cfuncs("sigsetjmp")` | For `option`, this interface is very simple to use, similar to [add_cincludes](#targetadd_cincludes), for example: @@ -2707,7 +2707,7 @@ In this way, when compiling the test target, if the package exists, the macro de Users no longer need to call the [add_links](#targetadd_links), [add_includedirs](#targetadd_includedirs), [add_ldflags](#targetadd_ldflags) interfaces to configure the dependent library links. -For how to set up the package search directory, please refer to: [add_packagedirs] (#targetadd_packagedirs) interface +For how to set up the package search directory, please refer to: [add_packagedirs](#targetadd_packagedirs) interface After v2.2.2, this interface also supports packages defined by [add_requires](#add_requires) in remote dependency management. @@ -2892,7 +2892,7 @@ In the above code example, it can be seen that when the target applies the markd In the rule script, you can get the extended flag value set in the target by `target:values("markdown.flags")`. <p class="tip"> -The specific extension configuration name will be different according to different rules. Currently, you can refer to the description of related rules: [built-in rules] (#built-in rules) +The specific extension configuration name will be different according to different rules. Currently, you can refer to the description of related rules: [built-in rules](#built-in rules) </p> ##### target:add_values @@ -2912,19 +2912,19 @@ You can also set a different installation directory for the target in xmake.lua ###### Set the output directory of configuration files -Version 2.2.5 adds a new interface, mainly used for the output directory of the template configuration file set by the [add_configfiles] (#targetadd_configfiles) interface. +Version 2.2.5 adds a new interface, mainly used for the output directory of the template configuration file set by the [add_configfiles](#targetadd_configfiles) interface. ##### target:set_configvar ###### Set template configuration variable -2.2.5 version of the new interface, used to add some template configuration variables that need to be pre-compiled before compilation, generally used for [add_configfiles] (#targetadd_configfiles) interface. +2.2.5 version of the new interface, used to add some template configuration variables that need to be pre-compiled before compilation, generally used for [add_configfiles](#targetadd_configfiles) interface. ##### target:add_configfiles ###### Add template configuration files -2.2.5 version of the new interface, used to add some configuration files that need to be pre-processed before compiling, used to replace the old interface such as [set_config_header] (#targetset_config_header). +2.2.5 version of the new interface, used to add some configuration files that need to be pre-processed before compiling, used to replace the old interface such as [set_config_header](#targetset_config_header). Because this interface is more versatile, it is not only used to handle the automatic generation and preprocessing of config.h, but also to handle various file types, while `set_config_header` is only used to process header files and does not support template variable substitution. @@ -3688,7 +3688,7 @@ The first parameter sets the name of the code snippet as a label, and is display The above code implements the detection of the constexpr feature of C++. If the test passes, the constexpr option is enabled. Of course, this is just an example. -For the detection of compiler features, there is a more convenient and efficient detection module, providing more powerful detection support, see: [compiler.has_features] (#compiler-has_features) and [detect.check_cxsnippets] (#detect-check_cxsnippets) +For the detection of compiler features, there is a more convenient and efficient detection module, providing more powerful detection support, see: [compiler.has_features](#compiler-has_features) and [detect.check_cxsnippets](#detect-check_cxsnippets) If you want more flexible detection, you can do this in [option.on_check](#optionon_check) via [lib.detect.check_cxsnippets](#detect-check_cxsnippets). @@ -3697,7 +3697,7 @@ If you want more flexible detection, you can do this in [option.on_check](#optio ###### Add macro definition if the detection option is passed <p class="tip"> -After the 2.1.5 version has been deprecated, please use the [add_defines] (#targetadd_defines) interface instead. +After the 2.1.5 version has been deprecated, please use the [add_defines](#targetadd_defines) interface instead. </p> The detection options will not be set until they are passed. See the example in [add_cincludes](#optionadd_cincludes) for details. @@ -3707,7 +3707,7 @@ The detection options will not be set until they are passed. See the example in ###### If the detection option is passed, add the macro definition to the configuration header file. <p class="tip"> -After the 2.1.5 version has been deprecated, please use the [add_defines_h] (#targetadd_defines_h) interface instead. +After the 2.1.5 version has been deprecated, please use the [add_defines_h](#targetadd_defines_h) interface instead. </p> Similar to [add_defines_if_ok](#optionadd_defines_if_ok), the macro definitions are automatically added to the `config.h` header file after the test is passed. @@ -4074,7 +4074,7 @@ function main(...) end ``` -For more modules, see: [Built-in Module] (#Built-in Module) and [Extension Module] (Extension Module) +For more modules, see: [Built-in Module](#Built-in Module) and [Extension Module](Extension Module) Among them, the parameter in `main(...)` is specified by `task.run`, for example: @@ -4469,7 +4469,7 @@ target("nonpnp") add_files("driver/*.rc") ``` -For more information on WDK rules, see: [#159] (https://github.com/xmake-io/xmake/issues/159) +For more information on WDK rules, see: [#159](https://github.com/xmake-io/xmake/issues/159) ###### win.sdk.application @@ -4498,7 +4498,7 @@ Used to specify certain c++ source files to be compiled as c++.net. add_files("xmlhelper.cpp", {rule = "win.sdk.dotnet"}) ``` -For more information on WDK rules, see: [#159] (https://github.com/xmake-io/xmake/issues/159) +For more information on WDK rules, see: [#159](https://github.com/xmake-io/xmake/issues/159) ##### rule @@ -4772,7 +4772,7 @@ rule_end() The repository depends on the package definition description, the `package()` related interface definition, etc. There will be time to elaborate, so stay tuned. . -Please refer to the existing package description in the official repository: [xmake-repo] (https://github.com/xmake-io/xmake-repo) +Please refer to the existing package description in the official repository: [xmake-repo](https://github.com/xmake-io/xmake-repo) Here is a more representative example for reference: @@ -5051,7 +5051,7 @@ target("test") ###### Get the value of the built-in variable -[Built-in variables] (#built-in variables) can be obtained directly through this interface, without the need to add a `$()` package, which is much simpler to use, for example: +[Built-in variables](#built-in variables) can be obtained directly through this interface, without the need to add a `$()` package, which is much simpler to use, for example: ```lua print(val("host")) @@ -5463,7 +5463,7 @@ E.g: The results are as follows: - + The color-related descriptions are placed in `${ }`, and you can set several different properties at the same time, for example: @@ -5530,9 +5530,9 @@ Ignore the display, for example: The above two lines of code, I printed a classic beer symbol in the homebrew, the following line printed an ok gesture symbol, is not very dazzling. . - + -All emoji emoticons, as well as the corresponding keys in xmake, can be found in [emoji] (http://www.emoji-cheat-sheet.com/). . +All emoji emoticons, as well as the corresponding keys in xmake, can be found in [emoji](http://www.emoji-cheat-sheet.com/). . Version 2.1.7 supports 24-bit true color output, if the terminal supports it: @@ -5669,7 +5669,7 @@ os.cp("$(scriptdir)/*.h", "$(projectdir)/src/test/**.h", "$(buildir)/inc") The above code will: all the header files in the current `xmake.lua` directory, the header files in the project source test directory are all copied to the `$(buildir)` output directory. -Among them `$(scriptdir)`, `$(projectdir)` These variables are built-in variables of xmake. For details, see the related documentation of [built-in variables] (#built-in variables). +Among them `$(scriptdir)`, `$(projectdir)` These variables are built-in variables of xmake. For details, see the related documentation of [built-in variables](#built-in variables). The matching patterns in `*.h` and `**.h` are similar to those in [add_files](#targetadd_files), the former is a single-level directory matching, and the latter is a recursive multi-level directory matching. @@ -5882,7 +5882,7 @@ os.run("ls -l $(buildir)") <p class="warning"> Using this interface to execute shell commands can easily reduce the cross-platform build. For `os.run("cp ..")`, try to use `os.cp` instead. <br> -If you must use this interface to run the shell program, please use the [config.plat] (#config-plat) interface to determine the platform support. +If you must use this interface to run the shell program, please use the [config.plat](#config-plat) interface to determine the platform support. </p> For more advanced process operations and control, see the [process](#process) module interface. @@ -5979,7 +5979,7 @@ Used to get a temporary file path, just a path, the file needs to be created by Consistent with the result of [$(curdir)](#var-curdir), it is just a direct return to return a variable that can be maintained with subsequent strings. -Usage reference: [os.tmpdir] (#os-tmpdir). +Usage reference: [os.tmpdir](#os-tmpdir). ###### os.filesize @@ -5995,7 +5995,7 @@ print(os.filesize("/tmp/a")) Consistent with the result of [$(scriptdir)](#var-scriptdir), it is just a direct return to return a variable that can be maintained with subsequent strings. -Usage reference: [os.tmpdir] (#os-tmpdir). +Usage reference: [os.tmpdir](#os-tmpdir). ###### os.programdir @@ -6042,7 +6042,7 @@ The io operation module extends lua's built-in io module to provide more easy-to - Open file for reading and writing -This is a native interface for lua. For detailed usage, see Lua's official documentation: [The Complete I/O Model] (https://www.lua.org/pil/21.2.html) +This is a native interface for lua. For detailed usage, see Lua's official documentation: [The Complete I/O Model](https://www.lua.org/pil/21.2.html) If you want to read all the contents of the file, you can write: @@ -6320,7 +6320,7 @@ end ##### table -Table belongs to the module provided by Lua native. For the native interface, you can refer to: [lua official document] (http://www.lua.org/manual/5.1/manual.html#5.5) +Table belongs to the module provided by Lua native. For the native interface, you can refer to: [lua official document](https://www.lua.org/manual/5.1/manual.html#5.5) It has been extended in xmake to add some extension interfaces: @@ -6408,7 +6408,7 @@ table.slice({1, 2, 3, 4, 5, 6, 7, 8, 9}, 4, 8, 2) ##### string -The string module is a native module of lua. For details, see: [lua official manual] (http://www.lua.org/manual/5.1/manual.html#5.4) +The string module is a native module of lua. For details, see: [lua official manual](https://www.lua.org/manual/5.1/manual.html#5.4) It has been extended in xmake to add some extension interfaces: @@ -6495,7 +6495,7 @@ The result is: " hello xmake!" ##### process -This is the xmake extension's process control module for more flexible control of the process, compared to: [os.run] (#os-run) series is more flexible and lower level. +This is the xmake extension's process control module for more flexible control of the process, compared to: [os.run](#os-run) series is more flexible and lower level. | Interface | Description | Supported Versions | | ----------------------------------------------- | -------------------------------------------- | -------- | @@ -6557,7 +6557,7 @@ end ##### coroutine -The coroutine module is a native module of lua. For use, see: [lua official manual] (http://www.lua.org/manual/5.1/manual.html#5.2) +The coroutine module is a native module of lua. For use, see: [lua official manual](https://www.lua.org/manual/5.1/manual.html#5.2) #### Extension Modules @@ -6897,7 +6897,7 @@ end - Get compiled command line list -A little different from [compiler.compargv] (#compiler-compargv) is that this interface returns a list of parameters, table representation, more convenient to operate: +A little different from [compiler.compargv](#compiler-compargv) is that this interface returns a list of parameters, table representation, more convenient to operate: ```lua local program, argv = compiler.compargv("xxx.c", "xxx.o") @@ -7921,7 +7921,7 @@ function main(opt) Inside the windows platform to read the registry, to find the specified library file, the bottom layer is actually called -[find_library] (#detect-find_library) and other interfaces. +[find_library](#detect-find_library) and other interfaces. <p class="tip"> In order to speed up the efficiency of frequent lookups, this interface is self-contained by default. If you want to @@ -7955,7 +7955,7 @@ adding the `vcpkg::`, `conan::` package namespace. - Find tool This interface is also used to find executable programs, but more -advanced than [lib.detect.find_program] (#detect-find_program), the +advanced than [lib.detect.find_program](#detect-find_program), the function is also more powerful, it encapsulates the executable program, providing the concept of tools: @@ -8282,7 +8282,7 @@ This interface is relatively simple, is simply download files. ```lua import("net.http") -http.download("http://xmake.io", "/tmp/index.html") +http.download("https://xmake.io", "/tmp/index.html") ``` ##### privilege.sudo diff --git a/pages/donation.html b/pages/donation.html index 623214c4..2ee2244f 100644 --- a/pages/donation.html +++ b/pages/donation.html @@ -57,7 +57,7 @@ <h2 id="paypal">Paypal</h2> -<p><a href="http://paypal.me/tboox/5"><img src="/assets/img/paypal.png" alt="Paypal Me" /></a></p> +<p><a href="https://paypal.me/tboox/5"><img src="/assets/img/paypal.png" alt="Paypal Me" /></a></p> <h2 id="backers">Backers</h2> @@ -180,10 +180,10 @@ <footer class="site-footer"> - <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="http://www.tboox.org">tboox.org</a>.</span> + <span class="site-footer-owner">Copyright (c) 2015-2018 <a href="https://www.tboox.org">tboox.org</a>.</span> <span class="site-footer-power"> <span> - <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="http://pages.coding.me">Coding Pages</a>.--> + <!--Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.coding.me">Coding Pages</a>.--> Site powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://pages.github.com/">Github Pages</a>. </span> <span> diff --git a/zh/README.md b/zh/README.md index 8c291c06..785635f9 100644 --- a/zh/README.md +++ b/zh/README.md @@ -5,8 +5,8 @@ search: zh <p> <div align="center"> - <a href="http://xmake.io/cn"> - <img width="200" heigth="200" src="http://tboox.org/static/img/xmake/logo256c.png"> + <a href="https://xmake.io/cn"> + <img width="200" heigth="200" src="https://tboox.org/static/img/xmake/logo256c.png"> </a> <h1>xmake</h1> @@ -41,7 +41,7 @@ search: zh <a href="https://jq.qq.com/?_wv=1027&k=5hpwWFv"> <img src="https://img.shields.io/badge/chat-on%20QQ-ff69b4.svg?style=flat-square" alt="QQ" /> </a> - <a href="http://xmake.io/pages/donation.html#donate"> + <a href="https://xmake.io/pages/donation.html#donate"> <img src="https://img.shields.io/badge/donate-us-orange.svg?style=flat-square" alt="Donate" /> </a> </div> @@ -1034,7 +1034,7 @@ $ xmake package -o ../test/packages 这样，test工程就可以通过[add_packages](https://xmake.io/#/zh/manual?id=targetadd_packages)和[add_packagedirs](https://xmake.io/#/zh/manual?id=add_packagedirs)去配置和使用tbox.pkg包了。 -关于内置包的详细描述，还可以参考下相关文章，这里面有详细介绍：[依赖包的添加和自动检测机制](http://tboox.org/cn/2016/08/06/add-package-and-autocheck/) +关于内置包的详细描述，还可以参考下相关文章，这里面有详细介绍：[依赖包的添加和自动检测机制](https://tboox.org/cn/2016/08/06/add-package-and-autocheck/) #### 系统查找模式 @@ -1179,7 +1179,7 @@ $ xmake ##### 语义版本设置 -xmake的依赖包管理是完全支持语义版本选择的，例如："~1.6.1"，对于语义版本的具体描述见：[http://semver.org/](http://semver.org/) +xmake的依赖包管理是完全支持语义版本选择的，例如："~1.6.1"，对于语义版本的具体描述见：[https://semver.org/](https://semver.org/) 一些语义版本写法： @@ -1579,7 +1579,7 @@ $ xmake run $ xmake f -y ``` -更多相关介绍，请参考文章：[xmake新增智能代码扫描编译模式，无需手写任何make文件](http://tboox.org/cn/2017/01/07/build-without-makefile/) +更多相关介绍，请参考文章：[xmake新增智能代码扫描编译模式，无需手写任何make文件](https://tboox.org/cn/2017/01/07/build-without-makefile/) ## 支持项目 diff --git a/zh/manual.md b/zh/manual.md index 4d53be00..ab35a950 100644 --- a/zh/manual.md +++ b/zh/manual.md @@ -627,7 +627,7 @@ set_config("ld", "g++") ###### 添加需要的依赖包 -xmake的依赖包管理是完全支持语义版本选择的，例如："~1.6.1"，对于语义版本的具体描述见：[http://semver.org/](http://semver.org/) +xmake的依赖包管理是完全支持语义版本选择的，例如："~1.6.1"，对于语义版本的具体描述见：[https://semver.org/](https://semver.org/) 一些语义版本写法： @@ -5538,7 +5538,7 @@ xmake会同时支持这两种写法，内部会去自动智能检测，选择输 显示结果如下： - + 跟颜色相关的描述，都放置在 `${ }` 里面，可以同时设置多个不同的属性，例如： @@ -5605,7 +5605,7 @@ xmake会同时支持这两种写法，内部会去自动智能检测，选择输 上面两行代码，我打印了一个homebrew里面经典的啤酒符号，下面那行打印了一个ok的手势符号，是不是很炫哈。。 - + 所有的emoji表情，以及xmake里面对应的key，都可以通过[emoji符号](http://www.emoji-cheat-sheet.com/)里面找到。。 @@ -6397,7 +6397,7 @@ end ##### table -table属于lua原生提供的模块，对于原生接口使用可以参考：[lua官方文档](http://www.lua.org/manual/5.1/manual.html#5.5) +table属于lua原生提供的模块，对于原生接口使用可以参考：[lua官方文档](https://www.lua.org/manual/5.1/manual.html#5.5) xmake中对其进行了扩展，增加了一些扩展接口： @@ -6485,7 +6485,7 @@ table.slice({1, 2, 3, 4, 5, 6, 7, 8, 9}, 4, 8, 2) ##### string -字符串模块为lua原生自带的模块，具体使用见：[lua官方手册](http://www.lua.org/manual/5.1/manual.html#5.4) +字符串模块为lua原生自带的模块，具体使用见：[lua官方手册](https://www.lua.org/manual/5.1/manual.html#5.4) xmake中对其进行了扩展，增加了一些扩展接口： @@ -6634,7 +6634,7 @@ end ##### coroutine -协程模块是lua原生自带的模块，具使用见：[lua官方手册](http://www.lua.org/manual/5.1/manual.html#5.2) +协程模块是lua原生自带的模块，具使用见：[lua官方手册](https://www.lua.org/manual/5.1/manual.html#5.2) #### 扩展模块 @@ -8331,7 +8331,7 @@ local ok = check_cxsnippets({}, {types = {"wchar_t", "char*"}, includes = "stdio ```lua import("net.http") -http.download("http://xmake.io", "/tmp/index.html") +http.download("https://xmake.io", "/tmp/index.html") ``` ##### privilege.sudo |