summaryrefslogtreecommitdiff
path: root/xmake/plugins/project
diff options
context:
space:
mode:
Diffstat (limited to 'xmake/plugins/project')
-rw-r--r--xmake/plugins/project/clang/compile_commands.lua2
-rw-r--r--xmake/plugins/project/clang/compile_flags.lua2
-rw-r--r--xmake/plugins/project/cmake/cmakelists.lua2
-rw-r--r--xmake/plugins/project/make/makefile.lua8
-rw-r--r--xmake/plugins/project/ninja/build_ninja.lua2
-rw-r--r--xmake/plugins/project/vstudio/impl/vs200x.lua2
-rw-r--r--xmake/plugins/project/vstudio/impl/vs200x_solution.lua4
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x.lua2
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x_solution.lua6
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua6
10 files changed, 18 insertions, 18 deletions
diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index 41d83bd57..9c25789d5 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -175,7 +175,7 @@ function _make_all(jsonfile)
-- make commands
_g.firstline = true
for _, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
_make_target(jsonfile, target)
end
end
diff --git a/xmake/plugins/project/clang/compile_flags.lua b/xmake/plugins/project/clang/compile_flags.lua
index 9662943e3..f85ed631b 100644
--- a/xmake/plugins/project/clang/compile_flags.lua
+++ b/xmake/plugins/project/clang/compile_flags.lua
@@ -78,7 +78,7 @@ function _make_all()
_g.firstline = true
for _, target in pairs(project.targets()) do
local isdefault = target:get("default")
- if not target:isphony() and (isdefault == nil or isdefault == true) then
+ if not target:is_phony() and (isdefault == nil or isdefault == true) then
_make_target(target)
end
end
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index 502b5bc51..022e9fd88 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -477,7 +477,7 @@ function _add_target(cmakelists, target)
-- is phony target?
local targetkind = target:kind()
- if target:isphony() then
+ if target:is_phony() then
return _add_target_phony(cmakelists, target)
elseif targetkind == "binary" then
_add_target_binary(cmakelists, target)
diff --git a/xmake/plugins/project/make/makefile.lua b/xmake/plugins/project/make/makefile.lua
index 68098563d..6a8d18650 100644
--- a/xmake/plugins/project/make/makefile.lua
+++ b/xmake/plugins/project/make/makefile.lua
@@ -214,7 +214,7 @@ end
function _make_target(makefile, target, targetflags)
-- is phony target?
- if target:isphony() then
+ if target:is_phony() then
return _make_phony(makefile, target)
end
@@ -226,7 +226,7 @@ function _make_target(makefile, target, targetflags)
-- make dependence for the dependent targets
for _, depname in ipairs(target:get("deps")) do
local dep = project.target(depname)
- makefile:write(" " .. (dep:isphony() and depname or dep:targetfile()))
+ makefile:write(" " .. (dep:is_phony() and depname or dep:targetfile()))
end
-- make dependence for objects
@@ -359,7 +359,7 @@ function _make_all(makefile)
-- make variables for target
local targetflags = {}
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
-- make target linker
local program = _get_program_from_target(target, target:linker():kind())
@@ -426,7 +426,7 @@ function _clean_target(makefile, target)
makefile:print("")
-- make body
- if not target:isphony() then
+ if not target:is_phony() then
-- remove the target file
_remove(makefile, target:targetfile())
diff --git a/xmake/plugins/project/ninja/build_ninja.lua b/xmake/plugins/project/ninja/build_ninja.lua
index 9ca2d8e42..041639a40 100644
--- a/xmake/plugins/project/ninja/build_ninja.lua
+++ b/xmake/plugins/project/ninja/build_ninja.lua
@@ -228,7 +228,7 @@ end
function _add_build_for_target(ninjafile, target)
-- is phony target?
- if target:isphony() then
+ if target:is_phony() then
return _add_build_for_phony(ninjafile, target)
end
diff --git a/xmake/plugins/project/vstudio/impl/vs200x.lua b/xmake/plugins/project/vstudio/impl/vs200x.lua
index f9251dbe3..d1f220c8a 100644
--- a/xmake/plugins/project/vstudio/impl/vs200x.lua
+++ b/xmake/plugins/project/vstudio/impl/vs200x.lua
@@ -44,7 +44,7 @@ function make(outputdir, vsinfo)
-- make vsprojs
for _, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
vs200x_vcproj.make(vsinfo, target)
end
end
diff --git a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
index f2585764c..48b10445f 100644
--- a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
+++ b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua
@@ -36,7 +36,7 @@ function _make_projects(slnfile, vsinfo)
-- make all targets
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
-- enter project
slnfile:enter("Project(\"{%s}\") = \"%s\", \"%s\\%s.vcproj\", \"{%s}\"", vctool, targetname, targetname, targetname, hash.uuid4(targetname))
@@ -68,7 +68,7 @@ function _make_global(slnfile, vsinfo)
-- add project configuration platforms
slnfile:enter("GlobalSection(ProjectConfigurationPlatforms) = postSolution")
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
slnfile:print("{%s}.$(mode)|Win32.ActiveCfg = $(mode)|Win32", hash.uuid4(targetname))
slnfile:print("{%s}.$(mode)|Win32.Build.0 = $(mode)|Win32", hash.uuid4(targetname))
end
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua
index cbc93e2c9..968cac080 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x.lua
@@ -283,7 +283,7 @@ function make(outputdir, vsinfo)
-- save targets
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
-- make target with the given mode and arch
targets[targetname] = targets[targetname] or {}
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
index 4aeaa204a..fdd948561 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
@@ -45,7 +45,7 @@ function _make_projects(slnfile, vsinfo)
local targets = {}
local vctool = "8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942"
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
-- we need set startup project for default or binary target
-- @see https://github.com/xmake-io/xmake/issues/1249
if target:get("default") == true then
@@ -105,7 +105,7 @@ function _make_global(slnfile, vsinfo)
-- add project configuration platforms
slnfile:enter("GlobalSection(ProjectConfigurationPlatforms) = postSolution")
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
for _, mode in ipairs(vsinfo.modes) do
for _, arch in ipairs(vsinfo.archs) do
local vs_arch = _vs_arch(arch)
@@ -126,7 +126,7 @@ function _make_global(slnfile, vsinfo)
slnfile:enter("GlobalSection(NestedProjects) = preSolution")
local subgroups = {}
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
local group_path = target:get("group")
if group_path then
-- target -> group
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index e5cbaa196..8d36cdbe7 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -270,7 +270,7 @@ function _make_vsinfo_groups()
local groups = {}
local group_deps = {}
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
local group_path = target:get("group")
if group_path then
local group_name = path.filename(group_path)
@@ -375,7 +375,7 @@ function main(outputdir, vsinfo)
-- save targets
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
-- make target with the given mode and arch
targets[targetname] = targets[targetname] or {}
@@ -443,7 +443,7 @@ function main(outputdir, vsinfo)
-- @see https://github.com/xmake-io/xmake/issues/1249
local targetnames = {}
for targetname, target in pairs(project.targets()) do
- if not target:isphony() then
+ if not target:is_phony() then
if target:get("default") == true then
table.insert(targetnames, 1, targetname)
elseif target:kind() == "binary" then