Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CodeLite workspace folders (groups) #1092

Merged
merged 2 commits into from
May 24, 2018
Merged

CodeLite workspace folders (groups) #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec55c5
Implement CodeLite workspace folders
Gaztin May 21, 2018
5314379
Add tests for CodeLite workspace folders
Gaztin May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions modules/codelite/codelite_workspace.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
--
-- Header
--
_p('<?xml version="1.0" encoding="UTF-8"?>')
p.w('<?xml version="1.0" encoding="UTF-8"?>')

local tagsdb = ""
-- local tagsdb = "./" .. wks.name .. ".tags"
_p('<CodeLite_Workspace Name="%s" Database="%s" SWTLW="No">', wks.name, tagsdb)
p.push('<CodeLite_Workspace Name="%s" Database="%s" SWTLW="No">', wks.name, tagsdb)

--
-- Project list
Expand All @@ -45,15 +45,18 @@
prjpath = path.getrelative(prj.workspace.location, prjpath)

if (prj.name == wks.startproject) then
_x(1, '<Project Name="%s" Path="%s" Active="Yes"/>', prj.name, prjpath)
p.w('<Project Name="%s" Path="%s" Active="Yes"/>', prj.name, prjpath)
else
_x(1, '<Project Name="%s" Path="%s"/>', prj.name, prjpath)
p.w('<Project Name="%s" Path="%s"/>', prj.name, prjpath)
end
end,

onbranch = function(n)
-- TODO: not sure what situation this appears...?
-- premake5.lua emit's one of these for 'contrib', which is a top-level folder with the zip projects
onbranchenter = function(n)
p.push('<VirtualDirectory Name="%s">', n.name)
end,

onbranchexit = function(n)
p.pop('</VirtualDirectory>')
end,
})

Expand All @@ -78,23 +81,23 @@
end

-- for each workspace config
_p(1, '<BuildMatrix>')
p.push('<BuildMatrix>')
for cfg in workspace.eachconfig(wks) do

local cfgname = codelite.cfgname(cfg)
_p(2, '<WorkspaceConfiguration Name="%s" Selected="yes">', cfgname)
p.push('<WorkspaceConfiguration Name="%s" Selected="yes">', cfgname)

local tr = workspace.grouptree(wks)
tree.traverse(tr, {
onleaf = function(n)
local prj = n.project
_p(3, '<Project Name="%s" ConfigName="%s"/>', prj.name, cfgname)
p.w('<Project Name="%s" ConfigName="%s"/>', prj.name, cfgname)
end
})
_p(2, '</WorkspaceConfiguration>')
p.pop('</WorkspaceConfiguration>')

end
_p(1, '</BuildMatrix>')
p.pop('</BuildMatrix>')

_p('</CodeLite_Workspace>')
p.pop('</CodeLite_Workspace>')
end
39 changes: 39 additions & 0 deletions modules/codelite/tests/test_codelite_workspace.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,42 @@
</CodeLite_Workspace>
]])
end


function suite.onGroupedProjects()
wks.projects = {}
project "MyGrouplessProject"
group "MyGroup"
project "MyGroupedProject"
group "My/Nested/Group"
project "MyNestedGroupedProject"
prepare()
test.capture([[
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="MyWorkspace" Database="" SWTLW="No">
<VirtualDirectory Name="My">
<VirtualDirectory Name="Nested">
<VirtualDirectory Name="Group">
<Project Name="MyNestedGroupedProject" Path="MyNestedGroupedProject.project"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="MyGroup">
<Project Name="MyGroupedProject" Path="MyGroupedProject.project"/>
</VirtualDirectory>
<Project Name="MyGrouplessProject" Path="MyGrouplessProject.project"/>
<BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="yes">
<Project Name="MyNestedGroupedProject" ConfigName="Debug"/>
<Project Name="MyGroupedProject" ConfigName="Debug"/>
<Project Name="MyGrouplessProject" ConfigName="Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release" Selected="yes">
<Project Name="MyNestedGroupedProject" ConfigName="Release"/>
<Project Name="MyGroupedProject" ConfigName="Release"/>
<Project Name="MyGrouplessProject" ConfigName="Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>
]])
end