add is_default

11 files changed, 16 insertions, 22 deletions

diff --git a/xmake/actions/build/build.lua b/xmake/actions/build/build.lua
index 42d78ad19..a8029e24c 100644
--- a/xmake/actions/build/build.lua
+++ b/xmake/actions/build/build.lua
@@ -189,8 +189,7 @@ function get_batchjobs(targetname)
         local depset = hashset.new()
         local targets = {}
         for _, target in pairs(project.targets()) do
-            local default = target:get("default")
-            if default == nil or default == true or option.get("all") then
+            if target:is_default() or option.get("all") then
                 for _, depname in ipairs(target:get("deps")) do
                     depset:insert(depname)
                 end
diff --git a/xmake/actions/build/build_files.lua b/xmake/actions/build/build_files.lua
index c02537b2b..ca061b2c8 100644
--- a/xmake/actions/build/build_files.lua
+++ b/xmake/actions/build/build_files.lua
@@ -124,8 +124,7 @@ function _get_batchjobs(targetname, filepatterns)
         local depset = hashset.new()
         local targets = {}
         for _, target in pairs(project.targets()) do
-            local default = target:get("default")
-            if default == nil or default == true or option.get("all") then
+            if target:is_default() or option.get("all") then
                 for _, depname in ipairs(target:get("deps")) do
                     depset:insert(depname)
                 end
diff --git a/xmake/actions/install/install.lua b/xmake/actions/install/install.lua
index 16d9ed329..1a71bda40 100644
--- a/xmake/actions/install/install.lua
+++ b/xmake/actions/install/install.lua
@@ -122,8 +122,7 @@ function main(targetname)
     else
         -- install default or all targets
         for _, target in ipairs(project.ordertargets()) do
-            local default = target:get("default")
-            if default == nil or default == true or targetname == "__all" then
+            if target:is_default() or targetname == "__all" then
                 _install_target(target)
             end
         end
diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua
index 68481f339..7d61ecaa4 100644
--- a/xmake/actions/install/main.lua
+++ b/xmake/actions/install/main.lua
@@ -37,8 +37,7 @@ function _check_targets(targetname)
     else
         -- install default or all targets
         for _, target in pairs(project.targets()) do
-            local default = target:get("default")
-            if default == nil or default == true or targetname == "__all" then
+            if target:is_default() or targetname == "__all" then
                 table.insert(targets, target)
             end
         end
diff --git a/xmake/actions/package/main.lua b/xmake/actions/package/main.lua
index 624b90d5a..39078392b 100644
--- a/xmake/actions/package/main.lua
+++ b/xmake/actions/package/main.lua
@@ -231,8 +231,7 @@ function main()
     else
         -- package default or all targets
         for _, target in ipairs(project.ordertargets()) do
-            local default = target:get("default")
-            if default == nil or default == true or option.get("all") then
+            if target:is_default() or option.get("all") then
                 _package_target(target)
             end
         end
diff --git a/xmake/actions/run/main.lua b/xmake/actions/run/main.lua
index fd6510aba..b187357f5 100644
--- a/xmake/actions/run/main.lua
+++ b/xmake/actions/run/main.lua
@@ -160,8 +160,7 @@ function _check_targets(targetname)
     else
         -- install default or all targets
         for _, target in ipairs(project.ordertargets()) do
-            local default = target:get("default")
-            if (default == nil or default == true or option.get("all")) and target:kind() == "binary" then
+            if (target:is_default() or option.get("all")) and target:is_binary() then
                 table.insert(targets, target)
             end
         end
@@ -205,8 +204,7 @@ function main()
     else
         -- run default or all binary targets
         for _, target in ipairs(project.ordertargets()) do
-            local default = target:get("default")
-            if (default == nil or default == true or option.get("all")) and target:kind() == "binary" then
+            if (target:is_default() or option.get("all")) and target:kind() == "binary" then
                 _run(target)
             end
         end
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 0c3287eee..22ffa5cf4 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -645,6 +645,11 @@ function _instance:is_phony()
     return not targetkind or targetkind == "phony"
 end
 
+-- is binary target?
+function _instance:is_binary()
+    return self:kind() == "binary"
+end
+
 -- is default target?
 function _instance:is_default()
     local default = self:get("default")
diff --git a/xmake/plugins/project/clang/compile_flags.lua b/xmake/plugins/project/clang/compile_flags.lua
index f85ed631b..3f521b916 100644
--- a/xmake/plugins/project/clang/compile_flags.lua
+++ b/xmake/plugins/project/clang/compile_flags.lua
@@ -74,11 +74,9 @@ end
 
 -- make all
 function _make_all()
-    -- make flags
     _g.firstline = true
     for _, target in pairs(project.targets()) do
-        local isdefault = target:get("default")
-        if not target:is_phony() and (isdefault == nil or isdefault == true) then
+        if not target:is_phony() and target:is_default() then
             _make_target(target)
         end
     end
diff --git a/xmake/plugins/project/make/makefile.lua b/xmake/plugins/project/make/makefile.lua
index 6a8d18650..75afafa92 100644
--- a/xmake/plugins/project/make/makefile.lua
+++ b/xmake/plugins/project/make/makefile.lua
@@ -392,8 +392,7 @@ function _make_all(makefile)
     -- make all
     local default = ""
     for targetname, target in pairs(project.targets()) do
-        local isdefault = target:get("default")
-        if isdefault == nil or isdefault == true then
+        if target:is_default() then
             default = default .. " " .. targetname
         end
     end
diff --git a/xmake/plugins/project/ninja/build_ninja.lua b/xmake/plugins/project/ninja/build_ninja.lua
index 041639a40..72bb44a1d 100644
--- a/xmake/plugins/project/ninja/build_ninja.lua
+++ b/xmake/plugins/project/ninja/build_ninja.lua
@@ -306,8 +306,7 @@ function _add_build_for_targets(ninjafile)
     -- build default
     local default = ""
     for targetname, target in pairs(project.targets()) do
-        local isdefault = target:get("default")
-        if isdefault == nil or isdefault == true then
+        if target:is_default() then
             default = default .. " " .. targetname
         end
     end
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 8d36cdbe7..d1d9895bb 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -446,7 +446,7 @@ function main(outputdir, vsinfo)
         if not target:is_phony() then
             if target:get("default") == true then
                 table.insert(targetnames, 1, targetname)
-            elseif target:kind() == "binary" then
+            elseif target:is_binary() then
                 local first_target = targetnames[1] and project.target(targetnames[1])
                 if not first_target or first_target:get("default") ~= true then
                     table.insert(targetnames, 1, targetname)