AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1419 from starkos/fix/issue-1411

Browse Source 
Fix #1411: Remove "|"  from Codelite config names
This commit is contained in:
Samuel Surtees 2020-03-31 18:22:37 +10:00 committed by GitHub
commit 7cad09ed18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/codelite/codelite.lua
View File

@ -5,8 +5,9 @@
-- Modified by: Andrea Zanellato -- Modified by: Andrea Zanellato
-- Andrew Gough -- Andrew Gough
-- Manu Evans -- Manu Evans
-- Jason Perkins
-- Created: 2013/05/06 -- Created: 2013/05/06
-- Copyright: (c) 2008-2015 Jason Perkins and the Premake project -- Copyright: (c) 2008-2020 Jason Perkins and the Premake project
-- --
local p = premake local p = premake
@ -21,7 +22,8 @@
function codelite.cfgname(cfg) function codelite.cfgname(cfg)
local cfgname = cfg.buildcfg local cfgname = cfg.buildcfg
if codelite.workspace.multiplePlatforms then if codelite.workspace.multiplePlatforms then
cfgname = string.format("%s|%s", cfg.platform, cfg.buildcfg) -- Codelite breaks if "|" is used here, see #1411
cfgname = string.format("%s-%s", cfg.platform, cfg.buildcfg)
end end
return cfgname return cfgname
end end

31
modules/codelite/tests/test_codelite_workspace.lua
View File

@ -191,3 +191,34 @@
</CodeLite_Workspace> </CodeLite_Workspace>
]]) ]])
end end
---
-- Test handling of platforms
---
function suite.onPlatforms()
workspace "MyWorkspace"
platforms { "x86_64", "x86" }
prepare()
test.capture [[
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="MyWorkspace" Database="" SWTLW="No">
<Project Name="MyProject" Path="MyProject.project"/>
<BuildMatrix>
<WorkspaceConfiguration Name="x86_64-Debug" Selected="yes">
<Project Name="MyProject" ConfigName="x86_64-Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="x86-Debug" Selected="yes">
<Project Name="MyProject" ConfigName="x86-Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="x86_64-Release" Selected="yes">
<Project Name="MyProject" ConfigName="x86_64-Release"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="x86-Release" Selected="yes">
<Project Name="MyProject" ConfigName="x86-Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>
]]
end