Bladeren bron

update trybuild doc

ruki 5 jaren geleden
bovenliggende
commit
77375d032c

+ 1 - 1
getting_started.md

@@ -168,7 +168,7 @@ Download and use packages in [xmake-repo](https://github.com/xmake-io/xmake-repo
 
 ```lua
 add_requires("tbox >1.6.1", "libuv master", "vcpkg::ffmpeg", "brew::pcre2/libpcre2-8")
-add_requires("conan::OpenSSL/1.0.2n@conan/stable", {alias = "openssl", optional = true, debug = true}) 
+add_requires("conan::openssl/1.1.1g", {alias = "openssl", optional = true, debug = true}) 
 target("test")
     set_kind("binary")
     add_files("src/*.c")

+ 23 - 7
guide/other_features.md

@@ -1,5 +1,5 @@
 
-## Try building with another build system
+## Try building with another build system (TryBuild Mode)
 
 xmake v2.3.1 and above directly interface with other third-party build systems. Even if other projects do not use xmake.lua for maintenance, xmake can directly call other build tools to complete the compilation.
 
@@ -11,9 +11,9 @@ Then the user can directly use a third-party build tool to compile, so why use x
 
 Build systems currently supported:
 
-* autotools (cross-compiling environment for xmake)
+* autotools (support for cross-compiling with xmake)
 * xcodebuild
-* cmake
+* cmake (support for cross-compiling with xmake)
 * make
 * msbuild
 * scons
@@ -79,7 +79,7 @@ As we all know, although many projects maintained by autotools support cross-com
 
 Even if you run through a toolchain's cross-compilation, if you switch to another toolchain environment, it may take a long time, and if you use xmake, you usually only need two simple commands:
 
-!> At present autotools supports cross-compilation of xmake, and other build systems such as cmake will be added later.
+!> At present cmake/autotools supports cross-compilation of xmake.
 
 #### Cross compile android platform
 
@@ -107,24 +107,40 @@ $ ./configure --host aarch64-linux-android
 $ make
 ```
 
+If it is cmake, cross-compilation is not an easy task. For the android platform, this configuration is required.
+
+```bash
+$ cmake \
+     -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake \
+     -DANDROID_ABI=$ABI \
+     -DANDROID_NATIVE_API_LEVEL=$MINSDKVERSION \
+     $OTHER_ARGS
+```
+
+For the ios platform, I did not find a short-answer configuration method, but found a third-party ios toolchain configuration, which is very complicated: https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake
+
+For mingw, it is another way. I have been tossing about the environment for a long time, which is very tossing.
+
+After using xmake, whether it is cmake or autotools, cross-compilation is very simple, and the configuration method is exactly the same, streamlined and consistent.
+
 #### Cross compile iphoneos platform
 
 ```bash
-$ xmake f -p iphoneos --trybuild=autotools
+$ xmake f -p iphoneos --trybuild=[cmake|autotools]
 $ xmake
 ```
 
 #### Cross-compile mingw platform
 
 ```bash
-$ xmake f -p mingw --trybuild=autotools [--mingw=xxx]
+$ xmake f -p mingw --trybuild=[cmake|autotools] [--mingw=xxx]
 $ xmake
 ```
 
 #### Using other cross-compilation toolchains
 
 ```bash
-$ xmake f -p cross --trybuild=autotools --sdk=/xxxx
+$ xmake f -p cross --trybuild=[cmake|autotools] --sdk=/xxxx
 $ xmake
 ```
 

+ 1 - 1
mirror/getting_started.html

@@ -266,7 +266,7 @@ target("console")
 </code></pre>
 <p>Download and use packages in <a href="https://github.com/xmake-io/xmake-repo">xmake-repo</a> or third-party repositories:</p>
 <pre><code class="lang-lua">add_requires("tbox >1.6.1", "libuv master", "vcpkg::ffmpeg", "brew::pcre2/libpcre2-8")
-add_requires("conan::OpenSSL/1.0.2n@conan/stable", {alias = "openssl", optional = true, debug = true}) 
+add_requires("conan::openssl/1.1.1g", {alias = "openssl", optional = true, debug = true}) 
 target("test")
     set_kind("binary")
     add_files("src/*.c")

+ 17 - 7
mirror/guide/other_features.html

@@ -90,7 +90,7 @@
   line-height: 1;
 }
 </style>
-    <h2 id="trybuildingwithanotherbuildsystem">Try building with another build system</h2>
+    <h2 id="trybuildingwithanotherbuildsystemtrybuildmode">Try building with another build system (TryBuild Mode)</h2>
 <p>xmake v2.3.1 and above directly interface with other third-party build systems. Even if other projects do not use xmake.lua for maintenance, xmake can directly call other build tools to complete the compilation.</p>
 <p>Then the user can directly use a third-party build tool to compile, so why use xmake to call it? The main benefits are:</p>
 <ol>
@@ -100,9 +100,9 @@
 </ol>
 <p>Build systems currently supported:</p>
 <ul>
-<li>autotools (cross-compiling environment for xmake)</li>
+<li>autotools (support for cross-compiling with xmake)</li>
 <li>xcodebuild</li>
-<li>cmake</li>
+<li>cmake (support for cross-compiling with xmake)</li>
 <li>make</li>
 <li>msbuild</li>
 <li>scons</li>
@@ -147,7 +147,7 @@ $ xmake
 <h3 id="fastlycrosscompile">Fastly cross compile</h3>
 <p>As we all know, although many projects maintained by autotools support cross-compilation, the configuration process of cross-compilation is very complicated. There are still many differences in different toolchain processing methods, and many pits will be stepped in the middle.</p>
 <p>Even if you run through a toolchain&#39;s cross-compilation, if you switch to another toolchain environment, it may take a long time, and if you use xmake, you usually only need two simple commands:</p>
-<p>!> At present autotools supports cross-compilation of xmake, and other build systems such as cmake will be added later.</p>
+<p>!> At present cmake/autotools supports cross-compilation of xmake.</p>
 <h4 id="crosscompileandroidplatform">Cross compile android platform</h4>
 <pre><code class="lang-bash">$ xmake f -p android --trybuild=autotools [--ndk=xxx]
 $ xmake
@@ -166,16 +166,26 @@ $ export STRIP=$TOOLCHAIN/bin/aarch64-linux-android-strip
 $ ./configure --host aarch64-linux-android
 $ make
 </code></pre>
+<p>If it is cmake, cross-compilation is not an easy task. For the android platform, this configuration is required.</p>
+<pre><code class="lang-bash">$ cmake \
+     -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake \
+     -DANDROID_ABI=$ABI \
+     -DANDROID_NATIVE_API_LEVEL=$MINSDKVERSION \
+     $OTHER_ARGS
+</code></pre>
+<p>For the ios platform, I did not find a short-answer configuration method, but found a third-party ios toolchain configuration, which is very complicated: <a href="https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake">https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake</a></p>
+<p>For mingw, it is another way. I have been tossing about the environment for a long time, which is very tossing.</p>
+<p>After using xmake, whether it is cmake or autotools, cross-compilation is very simple, and the configuration method is exactly the same, streamlined and consistent.</p>
 <h4 id="crosscompileiphoneosplatform">Cross compile iphoneos platform</h4>
-<pre><code class="lang-bash">$ xmake f -p iphoneos --trybuild=autotools
+<pre><code class="lang-bash">$ xmake f -p iphoneos --trybuild=[cmake|autotools]
 $ xmake
 </code></pre>
 <h4 id="crosscompilemingwplatform">Cross-compile mingw platform</h4>
-<pre><code class="lang-bash">$ xmake f -p mingw --trybuild=autotools [--mingw=xxx]
+<pre><code class="lang-bash">$ xmake f -p mingw --trybuild=[cmake|autotools] [--mingw=xxx]
 $ xmake
 </code></pre>
 <h4 id="usingothercrosscompilationtoolchains">Using other cross-compilation toolchains</h4>
-<pre><code class="lang-bash">$ xmake f -p cross --trybuild=autotools --sdk=/xxxx
+<pre><code class="lang-bash">$ xmake f -p cross --trybuild=[cmake|autotools] --sdk=/xxxx
 $ xmake
 </code></pre>
 <p>For more cross compilation configuration details, please refer to the document: <a href="https://xmake.io/#/guide/configuration?id=cross-compilation">Cross Compilation</a>, except for an additional <code>--trybuild=</code> parameter, all other cross-compilation configuration parameters are completely universal.</p>

+ 1 - 1
mirror/package/system_package.html

@@ -144,7 +144,7 @@
 </code></pre>
 <h2 id="findtheconanpackage">Find the conan package</h2>
 <p>Xmake v2.2.6 and later versions also support finding the specified package from the conan:</p>
-<pre><code class="lang-lua">find_packages("conan::OpenSSL/1.0.2n@conan/stable")
+<pre><code class="lang-lua">find_packages("conan::openssl/1.1.1g")
 </code></pre>
 <h2 id="testcommandforfindingpackage">Test command for finding package</h2>
 <p>We can use the following command to quickly detect the package information specified on the system:</p>

+ 1 - 1
mirror/zh-cn/getting_started.html

@@ -265,7 +265,7 @@ target("console")
 </code></pre>
 <p>下载和使用在<a href="https://github.com/xmake-io/xmake-repo">xmake-repo</a>和第三方包仓库的依赖包:</p>
 <pre><code class="lang-lua">add_requires("tbox >1.6.1", "libuv master", "vcpkg::ffmpeg", "brew::pcre2/libpcre2-8")
-add_requires("conan::OpenSSL/1.0.2n@conan/stable", {alias = "openssl", optional = true, debug = true}) 
+add_requires("conan::openssl/1.1.1g", {alias = "openssl", optional = true, debug = true}) 
 target("test")
     set_kind("binary")
     add_files("src/*.c")

+ 17 - 7
mirror/zh-cn/guide/other_features.html

@@ -90,7 +90,7 @@
   line-height: 1;
 }
 </style>
-    <h2 id="">尝试使用其他构建系统构建</h2>
+    <h2 id="trybuild">尝试使用其他构建系统构建(TryBuild 模式)</h2>
 <p>xmake v2.3.1以上版本直接对接了其他第三方构建系统,即使其他项目中没有使用xmake.lua来维护,xmake也可以直接调用其他构建工具来完成编译。</p>
 <p>那用户直接调用使用第三方构建工具来编译不就行了,为啥还要用xmake去调用呢?主要有以下好处:</p>
 <ol>
@@ -102,7 +102,7 @@
 <ul>
 <li>autotools(已完全对接xmake的交叉编译环境)</li>
 <li>xcodebuild</li>
-<li>cmake</li>
+<li>cmake(已完全对接xmake的交叉编译环境)</li>
 <li>make</li>
 <li>msbuild</li>
 <li>scons</li>
@@ -145,9 +145,9 @@ $ xmake
 </code></pre>
 <p>另外,配置了<code>--trybuild=</code>参数手动指定了默认的构建系统,后续的build过程就不会额外提示用户选择了。</p>
 <h3 id="">实现快速交叉编译</h3>
-<p>众所周知,autotools维护的项目虽然很多都支持交叉编译,但是交叉编译的配置过程很复杂,不同的工具链处理方式还有很多的差异,中途会踩到很多的坑。</p>
+<p>众所周知,cmake/autotools维护的项目虽然很多都支持交叉编译,但是交叉编译的配置过程很复杂,不同的工具链处理方式还有很多的差异,中途会踩到很多的坑。</p>
 <p>即使跑通了一个工具链的交叉编译,如果切到另外一个工具链环境,可能又要折腾好久,而如果使用xmake,通常只需要两条简单的命令即可:</p>
-<p>!> 目前就autotools对接支持了xmake的交叉编译,后期还会对cmake等其他构建系统加上支持。</p>
+<p>!> 目前cmake/autotools都已对接支持了xmake的交叉编译。</p>
 <h4 id="android">交叉编译android平台</h4>
 <pre><code class="lang-bash">$ xmake f -p android --trybuild=autotools [--ndk=xxx]
 $ xmake
@@ -166,16 +166,26 @@ $ export STRIP=$TOOLCHAIN/bin/aarch64-linux-android-strip
 $ ./configure --host aarch64-linux-android
 $ make
 </code></pre>
+<p>如果是cmake呢,交叉编译也不省事,对于android平台,得这么配置。</p>
+<pre><code class="lang-bash">$ cmake \
+    -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake \
+    -DANDROID_ABI=$ABI \
+    -DANDROID_NATIVE_API_LEVEL=$MINSDKVERSION \
+    $OTHER_ARGS
+</code></pre>
+<p>而对于 ios 平台,没找到简答的配置方式,就找到个第三方的 ios 工具链配置,很复杂:<a href="https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake">https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake</a></p>
+<p>对于 mingw 又是另外一种方式,我又折腾了半天环境,很是折腾。</p>
+<p>而对接了xmake后,不管是cmake还是autotools,交叉编译都是非常简单的,而且配置方式也完全一样,精简一致。</p>
 <h4 id="iphoneos">交叉编译iphoneos平台</h4>
-<pre><code class="lang-bash">$ xmake f -p iphoneos --trybuild=autotools
+<pre><code class="lang-bash">$ xmake f -p iphoneos --trybuild=[cmake|autotools]
 $ xmake
 </code></pre>
 <h4 id="mingw">交叉编译mingw平台</h4>
-<pre><code class="lang-bash">$ xmake f -p mingw --trybuild=autotools [--mingw=xxx]
+<pre><code class="lang-bash">$ xmake f -p mingw --trybuild=[cmake|autotools] [--mingw=xxx]
 $ xmake
 </code></pre>
 <h4 id="">使用其他交叉编译工具链</h4>
-<pre><code class="lang-bash">$ xmake f -p cross --trybuild=autotools --sdk=/xxxx
+<pre><code class="lang-bash">$ xmake f -p cross --trybuild=[cmake|autotools] --sdk=/xxxx
 $ xmake
 </code></pre>
 <p>关于更多交叉编译的配置细节,请参考文档:<a href="https://xmake.io/#/zh-cn/guide/configuration?id=%e4%ba%a4%e5%8f%89%e7%bc%96%e8%af%91">交叉编译</a>,除了多了一个<code>--trybuild=</code>参数,其他交叉编译配置参数都是完全通用的。</p>

+ 1 - 1
mirror/zh-cn/package/system_package.html

@@ -144,7 +144,7 @@
 </code></pre>
 <h2 id="conan">查找conan包</h2>
 <p>xmake v2.2.6以后的版本,也支持从conan中查找指定的包:</p>
-<pre><code class="lang-lua">find_packages("conan::OpenSSL/1.0.2n@conan/stable")
+<pre><code class="lang-lua">find_packages("conan::openssl/1.1.1g")
 </code></pre>
 <h2 id="">查找包快速测试</h2>
 <p>我们可以使用下面的命令,快速检测系统上指定的包信息:</p>

+ 1 - 1
package/system_package.md

@@ -91,7 +91,7 @@ find_packages("vcpkg::zlib", "vcpkg::openssl")
 Xmake v2.2.6 and later versions also support finding the specified package from the conan:
 
 ```lua
-find_packages("conan::OpenSSL/1.0.2n@conan/stable")
+find_packages("conan::openssl/1.1.1g")
 ```
 
 ## Test command for finding package

+ 74 - 74
sitemap.xml

@@ -12,372 +12,372 @@
 
 <url>
   <loc>https://xmake.io/mirror/guide/project_examples.html</loc>
-  <lastmod>2020-09-24T11:55:11+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/other_features.html</loc>
-  <lastmod>2020-09-24T11:55:11+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/quickstart.html</loc>
-  <lastmod>2020-09-24T11:55:12+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/faq.html</loc>
-  <lastmod>2020-09-24T11:55:12+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/configuration.html</loc>
-  <lastmod>2020-09-24T11:55:12+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/syntax_description.html</loc>
-  <lastmod>2020-09-24T11:55:12+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:03+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/guide/installation.html</loc>
-  <lastmod>2020-09-24T11:55:12+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/plugin/plugin_development.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/plugin/more_plugins.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/plugin/builtin_plugins.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/old/zh/plugins.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/old/zh/manual.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/old/plugins.html</loc>
-  <lastmod>2020-09-24T11:55:13+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:04+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/old/manual.html</loc>
-  <lastmod>2020-09-24T11:55:14+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/awesome.html</loc>
-  <lastmod>2020-09-24T11:55:14+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/technical_support.html</loc>
-  <lastmod>2020-09-24T11:55:14+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/changelog.html</loc>
-  <lastmod>2020-09-24T11:55:14+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/contact.html</loc>
-  <lastmod>2020-09-24T11:55:14+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/introduction.html</loc>
-  <lastmod>2020-09-24T11:55:15+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:05+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/about/sponsor.html</loc>
-  <lastmod>2020-09-24T11:55:15+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/index.html</loc>
-  <lastmod>2020-09-24T11:55:15+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/project_examples.html</loc>
-  <lastmod>2020-09-24T11:55:15+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/other_features.html</loc>
-  <lastmod>2020-09-24T11:55:15+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/quickstart.html</loc>
-  <lastmod>2020-09-24T11:55:16+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/faq.html</loc>
-  <lastmod>2020-09-24T11:55:16+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:06+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/configuration.html</loc>
-  <lastmod>2020-09-24T11:55:16+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/syntax_description.html</loc>
-  <lastmod>2020-09-24T11:55:16+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/guide/installation.html</loc>
-  <lastmod>2020-09-24T11:55:16+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/plugin/plugin_development.html</loc>
-  <lastmod>2020-09-24T11:55:17+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/plugin/more_plugins.html</loc>
-  <lastmod>2020-09-24T11:55:17+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/plugin/builtin_plugins.html</loc>
-  <lastmod>2020-09-24T11:55:17+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/awesome.html</loc>
-  <lastmod>2020-09-24T11:55:17+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:07+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/technical_support.html</loc>
-  <lastmod>2020-09-24T11:55:17+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/changelog.html</loc>
-  <lastmod>2020-09-24T11:55:18+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/contact.html</loc>
-  <lastmod>2020-09-24T11:55:18+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/introduction.html</loc>
-  <lastmod>2020-09-24T11:55:18+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/about/sponsor.html</loc>
-  <lastmod>2020-09-24T11:55:18+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/index.html</loc>
-  <lastmod>2020-09-24T11:55:18+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:08+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/getting_started.html</loc>
-  <lastmod>2020-09-24T11:55:19+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/specification.html</loc>
-  <lastmod>2020-09-24T11:55:19+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/builtin_variables.html</loc>
-  <lastmod>2020-09-24T11:55:19+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/conditions.html</loc>
-  <lastmod>2020-09-24T11:55:19+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/custom_rule.html</loc>
-  <lastmod>2020-09-24T11:55:19+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/project_target.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:09+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/builtin_modules.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/custom_toolchain.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/plugin_task.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/package_dependencies.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/configuration_option.html</loc>
-  <lastmod>2020-09-24T11:55:20+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/extension_modules.html</loc>
-  <lastmod>2020-09-24T11:55:21+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/manual/global_interfaces.html</loc>
-  <lastmod>2020-09-24T11:55:21+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:10+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/theme/builtin_themes.html</loc>
-  <lastmod>2020-09-24T11:55:21+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/theme/switch_theme.html</loc>
-  <lastmod>2020-09-24T11:55:21+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/package/local_package.html</loc>
-  <lastmod>2020-09-24T11:55:21+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/package/system_package.html</loc>
-  <lastmod>2020-09-24T11:55:22+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/zh-cn/package/remote_package.html</loc>
-  <lastmod>2020-09-24T11:55:22+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/getting_started.html</loc>
-  <lastmod>2020-09-24T11:55:22+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:11+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/specification.html</loc>
-  <lastmod>2020-09-24T11:55:22+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/builtin_variables.html</loc>
-  <lastmod>2020-09-24T11:55:22+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/conditions.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/custom_rule.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/project_target.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/builtin_modules.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/custom_toolchain.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:12+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/plugin_task.html</loc>
-  <lastmod>2020-09-24T11:55:23+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/package_dependencies.html</loc>
-  <lastmod>2020-09-24T11:55:24+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/configuration_option.html</loc>
-  <lastmod>2020-09-24T11:55:24+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/extension_modules.html</loc>
-  <lastmod>2020-09-24T11:55:24+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/manual/global_interfaces.html</loc>
-  <lastmod>2020-09-24T11:55:24+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/theme/builtin_themes.html</loc>
-  <lastmod>2020-09-24T11:55:24+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:13+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/theme/switch_theme.html</loc>
-  <lastmod>2020-09-24T11:55:25+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:14+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/package/local_package.html</loc>
-  <lastmod>2020-09-24T11:55:25+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:14+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/package/system_package.html</loc>
-  <lastmod>2020-09-24T11:55:25+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:14+08:00</lastmod>
 </url>
 
 <url>
   <loc>https://xmake.io/mirror/package/remote_package.html</loc>
-  <lastmod>2020-09-24T11:55:25+08:00</lastmod>
+  <lastmod>2020-09-25T09:54:14+08:00</lastmod>
 </url>
 
 </urlset>

+ 1 - 1
zh-cn/getting_started.md

@@ -168,7 +168,7 @@ target("test")
 
 ```lua
 add_requires("tbox >1.6.1", "libuv master", "vcpkg::ffmpeg", "brew::pcre2/libpcre2-8")
-add_requires("conan::OpenSSL/1.0.2n@conan/stable", {alias = "openssl", optional = true, debug = true}) 
+add_requires("conan::openssl/1.1.1g", {alias = "openssl", optional = true, debug = true}) 
 target("test")
     set_kind("binary")
     add_files("src/*.c")

+ 23 - 7
zh-cn/guide/other_features.md

@@ -1,5 +1,5 @@
 
-## 尝试使用其他构建系统构建
+## 尝试使用其他构建系统构建(TryBuild 模式)
 
 xmake v2.3.1以上版本直接对接了其他第三方构建系统,即使其他项目中没有使用xmake.lua来维护,xmake也可以直接调用其他构建工具来完成编译。
 
@@ -13,7 +13,7 @@ xmake v2.3.1以上版本直接对接了其他第三方构建系统,即使其
 
 * autotools(已完全对接xmake的交叉编译环境)
 * xcodebuild
-* cmake
+* cmake(已完全对接xmake的交叉编译环境)
 * make
 * msbuild
 * scons
@@ -75,11 +75,11 @@ $ xmake
 
 ### 实现快速交叉编译
 
-众所周知,autotools维护的项目虽然很多都支持交叉编译,但是交叉编译的配置过程很复杂,不同的工具链处理方式还有很多的差异,中途会踩到很多的坑。
+众所周知,cmake/autotools维护的项目虽然很多都支持交叉编译,但是交叉编译的配置过程很复杂,不同的工具链处理方式还有很多的差异,中途会踩到很多的坑。
 
 即使跑通了一个工具链的交叉编译,如果切到另外一个工具链环境,可能又要折腾好久,而如果使用xmake,通常只需要两条简单的命令即可:
 
-!> 目前就autotools对接支持了xmake的交叉编译,后期还会对cmake等其他构建系统加上支持
+!> 目前cmake/autotools都已对接支持了xmake的交叉编译
 
 #### 交叉编译android平台
 
@@ -107,24 +107,40 @@ $ ./configure --host aarch64-linux-android
 $ make
 ```
 
+如果是cmake呢,交叉编译也不省事,对于android平台,得这么配置。
+
+```bash
+$ cmake \
+    -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake \
+    -DANDROID_ABI=$ABI \
+    -DANDROID_NATIVE_API_LEVEL=$MINSDKVERSION \
+    $OTHER_ARGS
+```
+
+而对于 ios 平台,没找到简答的配置方式,就找到个第三方的 ios 工具链配置,很复杂:https://github.com/leetal/ios-cmake/blob/master/ios.toolchain.cmake
+
+对于 mingw 又是另外一种方式,我又折腾了半天环境,很是折腾。
+
+而对接了xmake后,不管是cmake还是autotools,交叉编译都是非常简单的,而且配置方式也完全一样,精简一致。
+
 #### 交叉编译iphoneos平台
 
 ```bash
-$ xmake f -p iphoneos --trybuild=autotools
+$ xmake f -p iphoneos --trybuild=[cmake|autotools]
 $ xmake
 ```
 
 #### 交叉编译mingw平台
 
 ```bash
-$ xmake f -p mingw --trybuild=autotools [--mingw=xxx]
+$ xmake f -p mingw --trybuild=[cmake|autotools] [--mingw=xxx]
 $ xmake
 ```
 
 #### 使用其他交叉编译工具链
 
 ```bash
-$ xmake f -p cross --trybuild=autotools --sdk=/xxxx
+$ xmake f -p cross --trybuild=[cmake|autotools] --sdk=/xxxx
 $ xmake
 ```
 

+ 1 - 1
zh-cn/package/system_package.md

@@ -91,7 +91,7 @@ find_packages("vcpkg::zlib", "vcpkg::openssl")
 xmake v2.2.6以后的版本,也支持从conan中查找指定的包:
 
 ```lua
-find_packages("conan::OpenSSL/1.0.2n@conan/stable")
+find_packages("conan::openssl/1.1.1g")
 ```
 
 ## 查找包快速测试