summaryrefslogtreecommitdiff
path: root/xmake/core
diff options
context:
space:
mode:
authorLiu <[email protected]>2019-12-02 21:32:50 +0800
committerLiu <[email protected]>2019-12-02 21:33:15 +0800
commit30d4183095aa5dcdb9cbe00b1b48e45ca31424fe (patch)
treeb8e47b54d84dab64cc9a65e101fcc947e52ea6cc /xmake/core
parent45b739d927c89d93d85f626ab77dee70746c1cd3 (diff)
clear tail white space
Diffstat (limited to 'xmake/core')
-rw-r--r--xmake/core/package/package.lua2
-rw-r--r--xmake/core/project/option.lua4
-rw-r--r--xmake/core/project/target.lua2
-rw-r--r--xmake/core/sandbox/modules/import/core/project/project.lua2
4 files changed, 5 insertions, 5 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 3349239a9..0e44ab58b 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -267,7 +267,7 @@ function _instance:lock(opt)
if self:filelock():trylock(opt) then
return true
elseif option.get("diagnosis") then
- utils.warning("the current package is being accessed by other processes, please waiting!")
+ utils.warning("the current package is being accessed by other processes, please waiting!")
end
local ok, errors = self:filelock():lock(opt)
if not ok then
diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua
index 292adacba..7507daef6 100644
--- a/xmake/core/project/option.lua
+++ b/xmake/core/project/option.lua
@@ -79,13 +79,13 @@ function _instance:_do_check()
-- get conditions
local links = self:get("links")
- local snippets = self:get(kind .. "snippets")
+ local snippets = self:get(kind .. "snippets")
local types = self:get(kind .. "types")
local funcs = self:get(kind .. "funcs")
local includes = self:get(kind .. "includes")
-- TODO it is deprecated
- local snippet = self:get(kind .. "snippet")
+ local snippet = self:get(kind .. "snippet")
if snippet then
snippets = table.join(snippets or {}, snippet)
end
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 0c3802347..70af2acbb 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -748,7 +748,7 @@ end
function _instance:targetdir()
-- the target directory
- local targetdir = self:get("targetdir")
+ local targetdir = self:get("targetdir")
if not targetdir then
-- get build directory
diff --git a/xmake/core/sandbox/modules/import/core/project/project.lua b/xmake/core/sandbox/modules/import/core/project/project.lua
index 83bb9fead..a92031395 100644
--- a/xmake/core/sandbox/modules/import/core/project/project.lua
+++ b/xmake/core/sandbox/modules/import/core/project/project.lua
@@ -169,7 +169,7 @@ function sandbox_core_project.lock(opt)
if sandbox_core_project.trylock(opt) then
return true
elseif baseoption.get("diagnosis") then
- utils.warning("the current project is being accessed by other processes, please waiting!")
+ utils.warning("the current project is being accessed by other processes, please waiting!")
end
local ok, errors = sandbox_core_project.filelock():lock(opt)
if not ok then