summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-05-21 00:57:44 +0800
committerruki <[email protected]>2022-05-21 00:57:44 +0800
commit1ebaa37d7fab7fd6a226e1a738709c4fbc020154 (patch)
treef46c5d0eab0b824396a5c07591b8c49c865bfa2b
parentd7862dfc6b51397d0b9a59ed336777066b551810 (diff)
add remote cache config
-rw-r--r--xmake/actions/service/xmake.lua1
-rw-r--r--xmake/modules/private/service/client_config.lua6
-rw-r--r--xmake/modules/private/service/server_config.lua6
3 files changed, 11 insertions, 2 deletions
diff --git a/xmake/actions/service/xmake.lua b/xmake/actions/service/xmake.lua
index 8a0ce6bdd..df4cae06b 100644
--- a/xmake/actions/service/xmake.lua
+++ b/xmake/actions/service/xmake.lua
@@ -43,6 +43,7 @@ task("service")
{nil, "disconnect", "k", nil, "Disconnect current project in the remote daemon service." },
{nil, "remote", "k", nil, "Start or connect the remote build service." },
{nil, "distcc", "k", nil, "Start or connect the distributed build service." },
+ {nil, "ccache", "k", nil, "Start or connect the remote c/c++ cache service." },
{nil, "sync", "k", nil, "Sync current project files in the remote daemon service." },
{nil, "clean", "k", nil, "Clean current project files in the remote daemon service." },
{nil, "add-user", "kv", nil, "Add user in the server.",
diff --git a/xmake/modules/private/service/client_config.lua b/xmake/modules/private/service/client_config.lua
index fd3a4bc33..156576fcf 100644
--- a/xmake/modules/private/service/client_config.lua
+++ b/xmake/modules/private/service/client_config.lua
@@ -46,12 +46,16 @@ function _generate_configfile()
-- with token authorization
token = token
},
+ remote_cache = {
+ connect = "127.0.0.1:9692",
+ token = token
+ },
distcc_build = {
hosts = {
-- optional configs
--
-- njob: max jobs
- {connect = "127.0.0.1:9692", token = token}
+ {connect = "127.0.0.1:9693", token = token}
}
}
diff --git a/xmake/modules/private/service/server_config.lua b/xmake/modules/private/service/server_config.lua
index a4929e079..a024c731c 100644
--- a/xmake/modules/private/service/server_config.lua
+++ b/xmake/modules/private/service/server_config.lua
@@ -48,8 +48,12 @@ function _generate_configfile()
listen = "0.0.0.0:9691",
workdir = path.join(servicedir, "remote_build"),
},
- distcc_build = {
+ remote_cache = {
listen = "0.0.0.0:9692",
+ workdir = path.join(servicedir, "remote_cache"),
+ },
+ distcc_build = {
+ listen = "0.0.0.0:9693",
workdir = path.join(servicedir, "distcc_build"),
toolchains = {
ndk = {