support phony and headeronly target for vs generator

1 files changed, 27 insertions, 33 deletions

diff --git a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
index c4628190f..7d285c154 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
@@ -45,21 +45,19 @@ 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: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
+        -- 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
+            table.insert(targets, 1, target)
+        elseif target:is_binary() then
+            local first_target = targets[1]
+            if not first_target or first_target:is_default() then
                 table.insert(targets, 1, target)
-            elseif target:is_binary() then
-                local first_target = targets[1]
-                if not first_target or first_target:is_default() then
-                    table.insert(targets, 1, target)
-                else
-                    table.insert(targets, target)
-                end
             else
                 table.insert(targets, target)
             end
+        else
+            table.insert(targets, target)
         end
     end
     for _, target in ipairs(targets) do
@@ -105,13 +103,11 @@ 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:is_phony() then
-            for _, mode in ipairs(vsinfo.modes) do
-                for _, arch in ipairs(vsinfo.archs) do
-                    local vs_arch = _vs_arch(arch)
-                    slnfile:print("{%s}.%s|%s.ActiveCfg = %s|%s", hash.uuid4(targetname), mode, arch, mode, vs_arch)
-                    slnfile:print("{%s}.%s|%s.Build.0 = %s|%s", hash.uuid4(targetname), mode, arch, mode, vs_arch)
-                end
+        for _, mode in ipairs(vsinfo.modes) do
+            for _, arch in ipairs(vsinfo.archs) do
+                local vs_arch = _vs_arch(arch)
+                slnfile:print("{%s}.%s|%s.ActiveCfg = %s|%s", hash.uuid4(targetname), mode, arch, mode, vs_arch)
+                slnfile:print("{%s}.%s|%s.Build.0 = %s|%s", hash.uuid4(targetname), mode, arch, mode, vs_arch)
             end
         end
     end
@@ -126,21 +122,19 @@ function _make_global(slnfile, vsinfo)
     slnfile:enter("GlobalSection(NestedProjects) = preSolution")
     local subgroups = {}
     for targetname, target in pairs(project.targets()) do
-        if not target:is_phony() then
-            local group_path = target:get("group")
-            if group_path then
-                -- target -> group
-                local group_name = path.filename(group_path)
-                slnfile:print("{%s} = {%s}", hash.uuid4(targetname), hash.uuid4(group_name))
-                -- group -> group -> ...
-                local group_names = path.split(group_path)
-                for idx, group_name in ipairs(group_names) do
-                    local key = group_name .. (group_name_sub or "")
-                    local group_name_sub = group_names[idx + 1]
-                    if group_name_sub and not subgroups[key] then
-                        slnfile:print("{%s} = {%s}", hash.uuid4(group_name_sub), hash.uuid4(group_name))
-                        subgroups[key] = true
-                    end
+        local group_path = target:get("group")
+        if group_path then
+            -- target -> group
+            local group_name = path.filename(group_path)
+            slnfile:print("{%s} = {%s}", hash.uuid4(targetname), hash.uuid4(group_name))
+            -- group -> group -> ...
+            local group_names = path.split(group_path)
+            for idx, group_name in ipairs(group_names) do
+                local key = group_name .. (group_name_sub or "")
+                local group_name_sub = group_names[idx + 1]
+                if group_name_sub and not subgroups[key] then
+                    slnfile:print("{%s} = {%s}", hash.uuid4(group_name_sub), hash.uuid4(group_name))
+                    subgroups[key] = true
                 end
             end
         end