aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <waruqi@gmail.com>2018-12-30 21:09:35 +0800
committerruki <waruqi@gmail.com>2018-12-30 21:09:35 +0800
commit9181527ae8dbe4ed790e04254cd496498683db68 (patch)
tree2cb4595fae9c934930091a082fcad9ae84375c61
parenta50ea9f95295127c98be170b36f6710abf0cc7d3 (diff)
downloadxmake-docs-9181527ae8dbe4ed790e04254cd496498683db68.tar.gz
xmake-docs-9181527ae8dbe4ed790e04254cd496498683db68.zip
update index
-rw-r--r--cn/index.html21
-rw-r--r--landing.html21
-rw-r--r--landing/index.cn.md19
-rw-r--r--landing/index.md19
4 files changed, 42 insertions, 38 deletions
diff --git a/cn/index.html b/cn/index.html
index bcd06854..a5d2becd 100644
--- a/cn/index.html
+++ b/cn/index.html
@@ -224,24 +224,24 @@
<span class="n">target</span><span class="p">(</span><span class="s2">"console"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"binary"</span><span class="p">)</span>
<span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.c"</span><span class="p">)</span>
- <span class="k">if</span> <span class="n">is_plat</span><span class="p">(</span><span class="s2">"windows"</span><span class="p">,</span> <span class="s2">"mingw"</span><span class="p">)</span> <span class="k">then</span>
- <span class="n">add_defines</span><span class="p">(</span><span class="s2">"XXX"</span><span class="p">)</span>
+ <span class="k">if</span> <span class="n">is_mode</span><span class="p">(</span><span class="s2">"debug"</span><span class="p">)</span> <span class="k">then</span>
+ <span class="n">add_defines</span><span class="p">(</span><span class="s2">"DEBUG"</span><span class="p">)</span>
<span class="k">end</span>
</code></pre>
</div>
-<p>自定义脚本:</p>
+<p>下载和使用远程依赖包:</p>
-<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
- <span class="n">set_kind</span><span class="p">(</span><span class="s2">"static"</span><span class="p">)</span>
- <span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.cpp"</span><span class="p">)</span>
- <span class="n">after_build</span><span class="p">(</span><span class="k">function</span> <span class="p">(</span><span class="n">target</span><span class="p">)</span>
- <span class="nb">print</span><span class="p">(</span><span class="s2">"build %s ok!"</span><span class="p">,</span> <span class="n">target</span><span class="p">:</span><span class="n">targetfile</span><span class="p">())</span>
- <span class="k">end</span><span class="p">)</span>
+<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">add_requires</span><span class="p">(</span><span class="s2">"libuv master"</span><span class="p">,</span> <span class="s2">"ffmpeg"</span><span class="p">,</span> <span class="s2">"zlib 1.20.*"</span><span class="p">)</span>
+<span class="n">add_requires</span><span class="p">(</span><span class="s2">"tbox &gt;1.6.1"</span><span class="p">,</span> <span class="p">{</span><span class="n">optional</span> <span class="o">=</span> <span class="kc">true</span><span class="p">,</span> <span class="n">debug</span> <span class="o">=</span> <span class="kc">true</span><span class="p">})</span>
+<span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
+ <span class="n">set_kind</span><span class="p">(</span><span class="s2">"shared"</span><span class="p">)</span>
+ <span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.c"</span><span class="p">)</span>
+ <span class="n">add_packages</span><span class="p">(</span><span class="s2">"libuv"</span><span class="p">,</span> <span class="s2">"ffmpeg"</span><span class="p">,</span> <span class="s2">"tbox"</span><span class="p">,</span> <span class="s2">"zlib"</span><span class="p">)</span>
</code></pre>
</div>
-<p>使用扩展模块:</p>
+<p>查找和使用本地已安装的包:</p>
<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"shared"</span><span class="p">)</span>
@@ -249,6 +249,7 @@
<span class="n">on_load</span><span class="p">(</span><span class="k">function</span> <span class="p">(</span><span class="n">target</span><span class="p">)</span>
<span class="n">import</span><span class="p">(</span><span class="s2">"lib.detect.find_package"</span><span class="p">)</span>
<span class="n">target</span><span class="p">:</span><span class="n">add</span><span class="p">(</span><span class="n">find_package</span><span class="p">(</span><span class="s2">"zlib"</span><span class="p">))</span>
+ <span class="n">target</span><span class="p">:</span><span class="n">add</span><span class="p">(</span><span class="n">find_package</span><span class="p">(</span><span class="s2">"openssl"</span><span class="p">))</span>
<span class="k">end</span><span class="p">)</span>
</code></pre>
</div>
diff --git a/landing.html b/landing.html
index 7b235f97..ddb086dc 100644
--- a/landing.html
+++ b/landing.html
@@ -224,24 +224,24 @@
<span class="n">target</span><span class="p">(</span><span class="s2">"console"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"binary"</span><span class="p">)</span>
<span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.c"</span><span class="p">)</span>
- <span class="k">if</span> <span class="n">is_plat</span><span class="p">(</span><span class="s2">"windows"</span><span class="p">,</span> <span class="s2">"mingw"</span><span class="p">)</span> <span class="k">then</span>
- <span class="n">add_defines</span><span class="p">(</span><span class="s2">"XXX"</span><span class="p">)</span>
+ <span class="k">if</span> <span class="n">is_mode</span><span class="p">(</span><span class="s2">"debug"</span><span class="p">)</span> <span class="k">then</span>
+ <span class="n">add_defines</span><span class="p">(</span><span class="s2">"DEBUG"</span><span class="p">)</span>
<span class="k">end</span>
</code></pre>
</div>
-<p>Custom script:</p>
+<p>Download and use remote packages:</p>
-<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
- <span class="n">set_kind</span><span class="p">(</span><span class="s2">"static"</span><span class="p">)</span>
- <span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.cpp"</span><span class="p">)</span>
- <span class="n">after_build</span><span class="p">(</span><span class="k">function</span> <span class="p">(</span><span class="n">target</span><span class="p">)</span>
- <span class="nb">print</span><span class="p">(</span><span class="s2">"build %s ok!"</span><span class="p">,</span> <span class="n">target</span><span class="p">:</span><span class="n">targetfile</span><span class="p">())</span>
- <span class="k">end</span><span class="p">)</span>
+<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">add_requires</span><span class="p">(</span><span class="s2">"libuv master"</span><span class="p">,</span> <span class="s2">"ffmpeg"</span><span class="p">,</span> <span class="s2">"zlib 1.20.*"</span><span class="p">)</span>
+<span class="n">add_requires</span><span class="p">(</span><span class="s2">"tbox &gt;1.6.1"</span><span class="p">,</span> <span class="p">{</span><span class="n">optional</span> <span class="o">=</span> <span class="kc">true</span><span class="p">,</span> <span class="n">debug</span> <span class="o">=</span> <span class="kc">true</span><span class="p">})</span>
+<span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
+ <span class="n">set_kind</span><span class="p">(</span><span class="s2">"shared"</span><span class="p">)</span>
+ <span class="n">add_files</span><span class="p">(</span><span class="s2">"src/*.c"</span><span class="p">)</span>
+ <span class="n">add_packages</span><span class="p">(</span><span class="s2">"libuv"</span><span class="p">,</span> <span class="s2">"ffmpeg"</span><span class="p">,</span> <span class="s2">"tbox"</span><span class="p">,</span> <span class="s2">"zlib"</span><span class="p">)</span>
</code></pre>
</div>
-<p>Extension Modules:</p>
+<p>Find and use local packages:</p>
<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"test"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"shared"</span><span class="p">)</span>
@@ -249,6 +249,7 @@
<span class="n">on_load</span><span class="p">(</span><span class="k">function</span> <span class="p">(</span><span class="n">target</span><span class="p">)</span>
<span class="n">import</span><span class="p">(</span><span class="s2">"lib.detect.find_package"</span><span class="p">)</span>
<span class="n">target</span><span class="p">:</span><span class="n">add</span><span class="p">(</span><span class="n">find_package</span><span class="p">(</span><span class="s2">"zlib"</span><span class="p">))</span>
+ <span class="n">target</span><span class="p">:</span><span class="n">add</span><span class="p">(</span><span class="n">find_package</span><span class="p">(</span><span class="s2">"openssl"</span><span class="p">))</span>
<span class="k">end</span><span class="p">)</span>
</code></pre>
</div>
diff --git a/landing/index.cn.md b/landing/index.cn.md
index 9daa56e8..2882b967 100644
--- a/landing/index.cn.md
+++ b/landing/index.cn.md
@@ -165,23 +165,23 @@ add_rules("mode.debug", "mode.release")
target("console")
set_kind("binary")
add_files("src/*.c")
- if is_plat("windows", "mingw") then
- add_defines("XXX")
+ if is_mode("debug") then
+ add_defines("DEBUG")
end
```
-自定义脚本:
+下载和使用远程依赖包:
```lua
+add_requires("libuv master", "ffmpeg", "zlib 1.20.*")
+add_requires("tbox >1.6.1", {optional = true, debug = true})
target("test")
- set_kind("static")
- add_files("src/*.cpp")
- after_build(function (target)
- print("build %s ok!", target:targetfile())
- end)
+ set_kind("shared")
+ add_files("src/*.c")
+ add_packages("libuv", "ffmpeg", "tbox", "zlib")
```
-使用扩展模块:
+查找和使用本地已安装的包:
```lua
target("test")
@@ -190,6 +190,7 @@ target("test")
on_load(function (target)
import("lib.detect.find_package")
target:add(find_package("zlib"))
+ target:add(find_package("openssl"))
end)
```
diff --git a/landing/index.md b/landing/index.md
index 453ae5a5..b25c189b 100644
--- a/landing/index.md
+++ b/landing/index.md
@@ -165,23 +165,23 @@ add_rules("mode.debug", "mode.release")
target("console")
set_kind("binary")
add_files("src/*.c")
- if is_plat("windows", "mingw") then
- add_defines("XXX")
+ if is_mode("debug") then
+ add_defines("DEBUG")
end
```
-Custom script:
+Download and use remote packages:
```lua
+add_requires("libuv master", "ffmpeg", "zlib 1.20.*")
+add_requires("tbox >1.6.1", {optional = true, debug = true})
target("test")
- set_kind("static")
- add_files("src/*.cpp")
- after_build(function (target)
- print("build %s ok!", target:targetfile())
- end)
+ set_kind("shared")
+ add_files("src/*.c")
+ add_packages("libuv", "ffmpeg", "tbox", "zlib")
```
-Extension Modules:
+Find and use local packages:
```lua
target("test")
@@ -190,6 +190,7 @@ target("test")
on_load(function (target)
import("lib.detect.find_package")
target:add(find_package("zlib"))
+ target:add(find_package("openssl"))
end)
```