summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-05-12 00:23:47 +0800
committerruki <[email protected]>2022-05-12 00:23:47 +0800
commita898f0a01a9e75cce00948a259abcefb1c1f6cb8 (patch)
tree40bc84d5c8e2d3a35c9a372b725ad5438c5fe446
parent87a890de681c65b1cc58334a5affbab2b5fd1627 (diff)
rename to distcc build
-rw-r--r--xmake/modules/private/service/config.lua2
-rw-r--r--xmake/modules/private/service/distcc_build/client.lua (renamed from xmake/modules/private/service/distributed_build/client.lua)24
-rw-r--r--xmake/modules/private/service/distcc_build/server.lua (renamed from xmake/modules/private/service/distributed_build/server.lua)26
-rw-r--r--xmake/modules/private/service/distcc_build/session.lua (renamed from xmake/modules/private/service/distributed_build/session.lua)4
4 files changed, 28 insertions, 28 deletions
diff --git a/xmake/modules/private/service/config.lua b/xmake/modules/private/service/config.lua
index 20321bd04..9301ab818 100644
--- a/xmake/modules/private/service/config.lua
+++ b/xmake/modules/private/service/config.lua
@@ -62,7 +62,7 @@ function _generate_configfile()
distcc_build = {
server = {
listen = "0.0.0.0:9692",
- workdir = path.join(servicedir, "distributed_build"),
+ workdir = path.join(servicedir, "distcc_build"),
},
client = {
-- without authorization: "127.0.0.1:9691"
diff --git a/xmake/modules/private/service/distributed_build/client.lua b/xmake/modules/private/service/distcc_build/client.lua
index da263c796..f1036d44c 100644
--- a/xmake/modules/private/service/distributed_build/client.lua
+++ b/xmake/modules/private/service/distcc_build/client.lua
@@ -32,15 +32,15 @@ import("private.service.client")
import("private.service.stream", {alias = "socket_stream"})
-- define module
-local distributed_build_client = distributed_build_client or client()
-local super = distributed_build_client:class()
+local distcc_build_client = distcc_build_client or client()
+local super = distcc_build_client:class()
-- init client
-function distributed_build_client:init()
+function distcc_build_client:init()
super.init(self)
-- init address
- local address = assert(config.get("distributed_build.client.connect"), "config(distributed_build.client.connect): not found!")
+ local address = assert(config.get("distcc_build.client.connect"), "config(distcc_build.client.connect): not found!")
super.address_set(self, address)
-- get project directory
@@ -48,7 +48,7 @@ function distributed_build_client:init()
local projectfile = os.projectfile()
if projectfile and os.isfile(projectfile) and projectdir then
self._PROJECTDIR = projectdir
- self._WORKDIR = path.join(project_config.directory(), "distributed_build")
+ self._WORKDIR = path.join(project_config.directory(), "distcc_build")
else
raise("we need enter a project directory with xmake.lua first!")
end
@@ -58,14 +58,14 @@ function distributed_build_client:init()
end
-- connect to the remote server
-function distributed_build_client:connect()
+function distcc_build_client:connect()
if self:is_connected() then
print("%s: has been connected!", self)
return
end
-- we need user authorization?
- local token = config.get("distributed_build.client.token")
+ local token = config.get("distcc_build.client.token")
if not token and self:user() then
-- get user password
@@ -123,7 +123,7 @@ function distributed_build_client:connect()
end
-- disconnect server
-function distributed_build_client:disconnect()
+function distcc_build_client:disconnect()
if not self:is_connected() then
print("%s: has been disconnected!", self)
return
@@ -167,8 +167,8 @@ function distributed_build_client:disconnect()
end
-- get class
-function distributed_build_client:class()
- return distributed_build_client
+function distcc_build_client:class()
+ return distcc_build_client
end
-- is connected? we cannot depend on client:init when run action
@@ -180,7 +180,7 @@ function is_connected()
local projectdir = os.projectdir()
local projectfile = os.projectfile()
if projectfile and os.isfile(projectfile) and projectdir then
- local workdir = path.join(project_config.directory(), "distributed_build")
+ local workdir = path.join(project_config.directory(), "distcc_build")
local statusfile = path.join(workdir, "status.txt")
if os.isfile(statusfile) then
local status = io.load(statusfile)
@@ -192,7 +192,7 @@ function is_connected()
end
function main()
- local instance = distributed_build_client()
+ local instance = distcc_build_client()
instance:init()
return instance
end
diff --git a/xmake/modules/private/service/distributed_build/server.lua b/xmake/modules/private/service/distcc_build/server.lua
index 88b3d689c..770243044 100644
--- a/xmake/modules/private/service/distributed_build/server.lua
+++ b/xmake/modules/private/service/distcc_build/server.lua
@@ -23,22 +23,22 @@ import("private.service.config")
import("private.service.message")
import("private.service.server")
import("private.service.stream", {alias = "socket_stream"})
-import("private.service.distributed_build.session", {alias = "server_session"})
+import("private.service.distcc_build.session", {alias = "server_session"})
import("lib.detect.find_tool")
-- define module
-local distributed_build_server = distributed_build_server or server()
-local super = distributed_build_server:class()
+local distcc_build_server = distcc_build_server or server()
+local super = distcc_build_server:class()
-- init server
-function distributed_build_server:init(daemon)
+function distcc_build_server:init(daemon)
super.init(self, daemon)
if self:daemon() then
config.load()
end
-- init address
- local address = assert(config.get("distributed_build.server.listen"), "config(distributed_build.server.listen): not found!")
+ local address = assert(config.get("distcc_build.server.listen"), "config(distcc_build.server.listen): not found!")
super.address_set(self, address)
-- init handler
@@ -49,12 +49,12 @@ function distributed_build_server:init(daemon)
end
-- get class
-function distributed_build_server:class()
- return distributed_build_server
+function distcc_build_server:class()
+ return distcc_build_server
end
-- on handle message
-function distributed_build_server:_on_handle(stream, msg)
+function distcc_build_server:_on_handle(stream, msg)
local session_id = msg:session_id()
local session = self:_session(session_id)
vprint("%s: %s: <session %s>: on handle message(%d)", self, stream:sock(), session_id, msg:code())
@@ -102,7 +102,7 @@ function distributed_build_server:_on_handle(stream, msg)
end
-- get session
-function distributed_build_server:_session(session_id)
+function distcc_build_server:_session(session_id)
local session = self._SESSIONS[session_id]
if not session then
session = server_session(session_id)
@@ -112,16 +112,16 @@ function distributed_build_server:_session(session_id)
end
-- close session
-function distributed_build_server:_session_close(session_id)
+function distcc_build_server:_session_close(session_id)
self._SESSIONS[session_id] = nil
end
-function distributed_build_server:__tostring()
- return "<distributed_build_server>"
+function distcc_build_server:__tostring()
+ return "<distcc_build_server>"
end
function main(daemon)
- local instance = distributed_build_server()
+ local instance = distcc_build_server()
instance:init(daemon ~= nil)
return instance
end
diff --git a/xmake/modules/private/service/distributed_build/session.lua b/xmake/modules/private/service/distcc_build/session.lua
index 7d64948c6..a43a021fc 100644
--- a/xmake/modules/private/service/distributed_build/session.lua
+++ b/xmake/modules/private/service/distcc_build/session.lua
@@ -80,9 +80,9 @@ end
-- get work directory
function session:workdir()
- local workdir = config.get("distributed_build.server.workdir")
+ local workdir = config.get("distcc_build.server.workdir")
if not workdir then
- workdir = path.join(global.directory(), "service", "distributed_build")
+ workdir = path.join(global.directory(), "service", "distcc_build")
end
return path.join(workdir, "sessons", self:id())
end