Browse Source

V2.7.1 (#82)

* 基于 xmake2.7.1 构建 docker 镜像,并依据自己的使用体验完善文档细节内容

* 依据自己的使用体验完善文档细节内容,移除了 docker 相关的文档手册

* 依据自己的使用体验完善文档细节内容,移除了 docker 相关的文档手册

* 完善v2.7.1中文文档

* 完善v2.7.1中文文档

* v2.7.1 文档完善

* Improve v2.7.1 documentation

* Update quickstart.md

* Update quickstart.md

* Improve the distributed compilation documentation

Co-authored-by: ruki <[email protected]>
肥猫零零七 3 năm trước cách đây
mục cha
commit
40511b4b2e
3 tập tin đã thay đổi với 16 bổ sung3 xóa
  1. 1 0
      .gitignore
  2. 7 1
      features/distcc_build.md
  3. 8 2
      zh-cn/features/distcc_build.md

+ 1 - 0
.gitignore

@@ -34,3 +34,4 @@ doc
 install.log
 build
 .vscode
+.history/**

+ 7 - 1
features/distcc_build.md

@@ -8,6 +8,7 @@ For cross-compilation, as long as the cross-toolchain supports, we do not requir
 ### Start the service
 
 We can specify the `--distcc` parameter to enable the distributed compilation service. Of course, if this parameter is not specified, xmake will enable all server-configured services by default.
+Here we assume that there are 2 machines as a distributed compilation server cluster, the ip addresses are 192.168.22.168, 192.168.22.169, and the two servers execute the following scripts respectively
 
 ```console
 $ xmake service --distcc
@@ -72,10 +73,15 @@ $cat ~/.xmake/service/client.conf
     distcc_build = {
         hosts = {
             {
-                connect = "127.0.0.1:9693",
+                connect = "192.168.22.168:9693",
+                token = "590234653af52e91b9e438ed860f1a2b"
+            },
+            {
+                connect = "192.168.22.169:9693",
                 token = "590234653af52e91b9e438ed860f1a2b"
             }
         }
+        }
     }
 }
 ```

+ 8 - 2
zh-cn/features/distcc_build.md

@@ -8,6 +8,7 @@ Xmake 提供了内置的分布式编译服务,通常它可以跟 本地编译
 ### 开启服务
 
 我们可以指定 `--distcc` 参数来开启分布式编译服务,当然如果不指定这个参数,xmake 会默认开启所有服务端配置的服务。
+这里我们假设有 2 台机器作为分布式的编译服务器集群,ip 地址分别是 192.168.22.168,192.168.22.169,两台服务器分别执行下面的脚本
 
 ```console
 $ xmake service --distcc
@@ -41,7 +42,7 @@ generating the config file to /Users/ruki/.xmake/service/client.conf ..
 <distcc_build_server>: listening 0.0.0.0:9693 ..
 ```
 
-然后,我们编辑它,修复服务器的监听端口(可选)。
+然后,我们编辑它,修复每台服务器的监听端口(可选)。
 
 ```bash
 $ cat ~/.xmake/service/server.conf
@@ -72,10 +73,15 @@ $cat ~/.xmake/service/client.conf
     distcc_build = {
         hosts = {
             {
-                connect = "127.0.0.1:9693",
+                connect = "192.168.22.168:9693",
+                token = "590234653af52e91b9e438ed860f1a2b"
+            },
+            {
+                connect = "192.168.22.169:9693",
                 token = "590234653af52e91b9e438ed860f1a2b"
             }
         }
+        
     }
 }
 ```