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

Made VC200x compiler block easier for add-ons to extend with external toolsets

Browse Source
This commit is contained in:
Jason Perkins 2012-02-11 08:18:19 -05:00
parent 7c2736369f
commit fe00186ca3
4 changed files with 135 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/actions/vstudio/vs200x_vcproj.lua
View File

@ -187,16 +187,19 @@
_p(3,'<Tool')
_p(4,'Name="%s"', vc200x.compilertool(cfg))
if cfg.system == premake.PS3 then
vc200x.VCCLCompilerTool_ps3_ng(cfg)
-- Decide between the built-in compiler or an external toolset;
-- PS3 uses the external toolset
local toolset = vc200x.toolset(cfg)
if toolset then
vc200x.VCCLExternalCompilerTool(cfg, toolset)
else
vc200x.VCCLCompilerTool_windows(cfg)
vc200x.VCCLBuiltInCompilerTool(cfg)
end
_p(3,'/>')
end
function vc200x.VCCLCompilerTool_windows(cfg)
function vc200x.VCCLBuiltInCompilerTool(cfg)
if #cfg.buildoptions > 0 then
_x(4,'AdditionalOptions="%s"', table.concat(cfg.buildoptions, " "))
end
@ -207,10 +210,7 @@
_p(4,'OmitFramePointers="%s"', bool(true))
end
if #cfg.includedirs > 0 then
local dirs = table.concat(project.getrelative(cfg.project, cfg.includedirs), ";")
_x(4,'AdditionalIncludeDirectories="%s"', path.translate(dirs))
end
vc200x.additionalIncludeDirectories(cfg)
if #cfg.defines > 0 then
_x(4,'PreprocessorDefinitions="%s"', table.concat(cfg.defines, ";"))
@ -309,8 +309,8 @@
end
function vc200x.VCCLCompilerTool_ps3_ng(cfg)
local buildoptions = table.join(premake.snc.getcflags(cfg), premake.snc.getcxxflags(cfg), cfg.buildoptions)
function vc200x.VCCLExternalCompilerTool(cfg, toolset)
local buildoptions = table.join(toolset.getcflags(cfg), toolset.getcxxflags(cfg), cfg.buildoptions)
if not cfg.flags.NoPCH and cfg.pchheader then
_p(4,'UsePrecompiledHeader="%s"', iif(_ACTION < "vs2005", 3, 2))
@ -324,9 +324,7 @@
_x(4,'AdditionalOptions="%s"', table.concat(buildoptions, " "))
end
if #cfg.includedirs > 0 then
_x(4,'AdditionalIncludeDirectories="%s"', path.translate(table.concat(cfg.includedirs, ";")))
end
vc200x.additionalIncludeDirectories(cfg)
if #cfg.defines > 0 then
_x(4,'PreprocessorDefinitions="%s"', table.concat(cfg.defines, ";"))
@ -660,27 +658,28 @@
"VCPostBuildEventTool",
"DebuggerTool",
}
else
return {
"VCPreBuildEventTool",
"VCCustomBuildTool",
"VCXMLDataGeneratorTool",
"VCWebServiceProxyGeneratorTool",
"VCMIDLTool",
"VCCLCompilerTool",
"VCManagedResourceCompilerTool",
"VCResourceCompilerTool",
"VCPreLinkEventTool",
"VCLinkerTool",
"VCALinkTool",
"VCManifestTool",
"VCXDCMakeTool",
"VCBscMakeTool",
"VCFxCopTool",
"VCAppVerifierTool",
"VCWebDeploymentTool",
"VCPostBuildEventTool"
}
end
return {
"VCPreBuildEventTool",
"VCCustomBuildTool",
"VCXMLDataGeneratorTool",
"VCWebServiceProxyGeneratorTool",
"VCMIDLTool",
"VCCLCompilerTool",
"VCManagedResourceCompilerTool",
"VCResourceCompilerTool",
"VCPreLinkEventTool",
"VCLinkerTool",
"VCALinkTool",
"VCManifestTool",
"VCXDCMakeTool",
"VCBscMakeTool",
"VCFxCopTool",
"VCAppVerifierTool",
"VCWebDeploymentTool",
"VCPostBuildEventTool"
}
end
@ -788,7 +787,20 @@
--
-- Write out the <AdditionalLibraryDirectories> block, used by the
-- Write out the <AdditionalIncludeDirectories> element, used by the
-- various compiler tool variations.
--
function vc200x.additionalIncludeDirectories(cfg)
if #cfg.includedirs > 0 then
local dirs = project.getrelative(cfg.project, cfg.includedirs)
_x(4,'AdditionalIncludeDirectories="%s"', path.translate(table.concat(dirs, ";")))
end
end
--
-- Write out the <AdditionalLibraryDirectories> element, used by the
-- various linker tool variations.
--
@ -850,6 +862,21 @@
end
--
-- Output the correct project version attribute for the current action.
--
function vc200x.projectversion()
local map = {
vs2002 = '7.0',
vs2003 = '7.1',
vs2005 = '8.0',
vs2008 = '9.0'
}
_p(1,'Version="%s0"', map[_ACTION])
end
--
-- Return the debugging symbols level for a configuration.
--
@ -876,17 +903,17 @@
--
-- Output the correct project version attribute for the current action.
-- Identify the toolset to use for a given configuration. Returns nil to
-- use the built-in Visual Studio compiler, or a toolset interface to
-- use the alternate external compiler setup.
--
function vc200x.projectversion()
local map = {
vs2002 = '7.0',
vs2003 = '7.1',
vs2005 = '8.0',
vs2008 = '9.0'
}
_p(1,'Version="%s0"', map[_ACTION])
function vc200x.toolset(cfg)
if cfg.system == premake.PS3 then
return premake.snc
else
return nil
end
end

23
tests/actions/vstudio/vc200x/test_compiler_block.lua
View File

@ -1,6 +1,6 @@
--
-- tests/actions/vstudio/vc200x/test_compiler_block.lua
-- Validate generation of filter blocks in Visual Studio 200x C/C++ projects.
-- Validate generation the VCCLCompiler element in Visual Studio 200x C/C++ projects.
-- Copyright (c) 2011-2012 Jason Perkins and the Premake project
--
@ -301,7 +301,7 @@
--
-- Verify the basic structure when targeting the Xbox360.
-- Xbox 360 uses the same structure, but changes the element name.
--
function suite.looksGood_onXbox360()
@ -321,22 +321,3 @@
/>
]]
end
--
-- Verify the basic structure when targeting the PS3.
--
function suite.looksGood_onPS3()
system "PS3"
prepare()
test.capture [[
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
DebugInformationFormat="0"
CompileAs="0"
/>
]]
end

61
tests/actions/vstudio/vc200x/test_external_compiler.lua Normal file
View File

@ -0,0 +1,61 @@
--
-- tests/actions/vstudio/vc200x/test_external_compiler.lua
-- Validate generation the VCCLCompiler element for external tools in VS 200x C/C++ projects.
-- Copyright (c) 2011-2012 Jason Perkins and the Premake project
--
T.vs200x_external_compiler = { }
local suite = T.vs200x_external_compiler
local vc200x = premake.vstudio.vc200x
--
-- Setup/teardown
--
local sln, prj, cfg
function suite.setup()
_ACTION = "vs2008"
sln, prj = test.createsolution()
system "PS3"
end
local function prepare()
cfg = premake5.project.getconfig(prj, "Debug")
vc200x.VCCLCompilerTool_ng(cfg)
end
--
-- Verify the basic structure with no extra flags or settings.
--
function suite.checkDefaults()
prepare()
test.capture [[
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
DebugInformationFormat="0"
CompileAs="0"
/>
]]
end
--
-- Make sure that include directories are project relative.
--
function suite.includeDirsAreProjectRelative()
includedirs { "../include", "include" }
prepare()
test.capture [[
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
AdditionalIncludeDirectories="..\include;include"
]]
end

3
tests/premake4.lua
View File

@ -102,8 +102,9 @@
-- Visual Studio 2002-2008 C/C++ projects
dofile("actions/vstudio/vc200x/test_compiler_block.lua")
dofile("actions/vstudio/vc200x/test_debug_settings.lua")
dofile("actions/vstudio/vc200x/test_configuration.lua")
dofile("actions/vstudio/vc200x/test_debug_settings.lua")
dofile("actions/vstudio/vc200x/test_external_compiler.lua")
dofile("actions/vstudio/vc200x/test_files.lua")
dofile("actions/vstudio/vc200x/test_linker_block.lua")
dofile("actions/vstudio/vc200x/test_manifest_block.lua")