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

Bug fixes and modernizing of VC 2010 exporter

Browse Source
This commit is contained in:
Jason Perkins 2014-06-12 18:39:39 -04:00
parent 07a4ad897d
commit bd49556345
4 changed files with 260 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -65,7 +65,7 @@
defaultTargets = string.format(' DefaultTargets="%s"', target) defaultTargets = string.format(' DefaultTargets="%s"', target)
end end
_p('<Project%s ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">', defaultTargets) p.push('<Project%s ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">', defaultTargets)
end end
@ -237,14 +237,14 @@
function m.itemDefinitionGroup(cfg) function m.itemDefinitionGroup(cfg)
if not vstudio.isMakefile(cfg) then if not vstudio.isMakefile(cfg) then
_p(1,'<ItemDefinitionGroup %s>', m.condition(cfg)) p.push('<ItemDefinitionGroup %s>', m.condition(cfg))
p.callArray(m.elements.itemDefinitionGroup, cfg) p.callArray(m.elements.itemDefinitionGroup, cfg)
_p(1,'</ItemDefinitionGroup>') p.pop('</ItemDefinitionGroup>')
else else
if cfg == project.getfirstconfig(cfg.project) then if cfg == project.getfirstconfig(cfg.project) then
_p(1,'<ItemDefinitionGroup>') p.w('<ItemDefinitionGroup>')
_p(1,'</ItemDefinitionGroup>') p.w('</ItemDefinitionGroup>')
end end
end end
end end
@ -294,9 +294,9 @@
end end
function m.clCompile(cfg) function m.clCompile(cfg)
_p(2,'<ClCompile>') p.push('<ClCompile>')
p.callArray(m.elements.clCompile, cfg) p.callArray(m.elements.clCompile, cfg)
_p(2,'</ClCompile>') p.pop('</ClCompile>')
end end
@ -528,7 +528,7 @@
if #contents > 0 then if #contents > 0 then
p.push('<ClCompile Include=\"%s\">', path.translate(file.relpath)) p.push('<ClCompile Include=\"%s\">', path.translate(file.relpath))
p.out(contents) p.outln(contents)
p.pop('</ClCompile>') p.pop('</ClCompile>')
else else
p.x('<ClCompile Include=\"%s\" />', path.translate(file.relpath)) p.x('<ClCompile Include=\"%s\" />', path.translate(file.relpath))
@ -622,7 +622,7 @@
if #contents > 0 then if #contents > 0 then
p.push('<%s Include=\"%s\">', rule, path.translate(file.relpath)) p.push('<%s Include=\"%s\">', rule, path.translate(file.relpath))
p.out(contents) p.outln(contents)
p.pop('</%s>', rule) p.pop('</%s>', rule)
else else
p.x('<%s Include=\"%s\" />', rule, path.translate(file.relpath)) p.x('<%s Include=\"%s\" />', rule, path.translate(file.relpath))
@ -666,7 +666,7 @@
if #contents > 0 then if #contents > 0 then
p.push('<ResourceCompile Include=\"%s\">', path.translate(file.relpath)) p.push('<ResourceCompile Include=\"%s\">', path.translate(file.relpath))
p.out(contents) p.outln(contents)
p.pop('</ResourceCompile>') p.pop('</ResourceCompile>')
else else
p.x('<ResourceCompile Include=\"%s\" />', path.translate(file.relpath)) p.x('<ResourceCompile Include=\"%s\" />', path.translate(file.relpath))
@ -799,7 +799,7 @@
if #cfg.usingdirs > 0 then if #cfg.usingdirs > 0 then
local dirs = project.getrelative(cfg.project, cfg.usingdirs) local dirs = project.getrelative(cfg.project, cfg.usingdirs)
dirs = path.translate(table.concat(dirs, ";")) dirs = path.translate(table.concat(dirs, ";"))
_x(3,'<AdditionalUsingDirectories>%s;%%(AdditionalUsingDirectories)</AdditionalUsingDirectories>', dirs) p.x('<AdditionalUsingDirectories>%s;%%(AdditionalUsingDirectories)</AdditionalUsingDirectories>', dirs)
end end
end end
@ -822,7 +822,7 @@
function m.basicRuntimeChecks(cfg) function m.basicRuntimeChecks(cfg)
if cfg.flags.NoRuntimeChecks then if cfg.flags.NoRuntimeChecks then
_p(3,'<BasicRuntimeChecks>Default</BasicRuntimeChecks>') p.w('<BasicRuntimeChecks>Default</BasicRuntimeChecks>')
end end
end end
@ -905,7 +905,7 @@
end end
end end
if value then if value then
_p(3,'<DebugInformationFormat>%s</DebugInformationFormat>', value) p.w('<DebugInformationFormat>%s</DebugInformationFormat>', value)
end end
end end
@ -952,23 +952,23 @@
function m.exceptionHandling(cfg) function m.exceptionHandling(cfg)
if cfg.flags.NoExceptions then if cfg.flags.NoExceptions then
_p(3,'<ExceptionHandling>false</ExceptionHandling>') p.w('<ExceptionHandling>false</ExceptionHandling>')
elseif cfg.flags.SEH then elseif cfg.flags.SEH then
_p(3,'<ExceptionHandling>Async</ExceptionHandling>') p.w('<ExceptionHandling>Async</ExceptionHandling>')
end end
end end
function m.excludedFromBuild(cfg, filecfg) function m.excludedFromBuild(cfg, filecfg)
if not filecfg or filecfg.flags.ExcludeFromBuild then if not filecfg or filecfg.flags.ExcludeFromBuild then
p.w('<ExcludedFromBuild %s>true</ExcludedFromBuild>', m.condition(cfg)) m.element("ExcludedFromBuild", m.condition(cfg), "true")
end end
end end
function m.floatingPointModel(cfg) function m.floatingPointModel(cfg)
if cfg.floatingpoint then if cfg.floatingpoint then
_p(3,'<FloatingPointModel>%s</FloatingPointModel>', cfg.floatingpoint) p.w('<FloatingPointModel>%s</FloatingPointModel>', cfg.floatingpoint)
end end
end end
@ -980,14 +980,14 @@
end end
if #cfg.forceusings > 0 then if #cfg.forceusings > 0 then
local usings = path.translate(project.getrelative(cfg.project, cfg.forceusings)) local usings = path.translate(project.getrelative(cfg.project, cfg.forceusings))
_x(3,'<ForcedUsingFiles>%s</ForcedUsingFiles>', table.concat(usings, ';')) m.element("ForcedUsingFiles", condition, table.concat(usings, ';'))
end end
end end
function m.functionLevelLinking(cfg) function m.functionLevelLinking(cfg)
if config.isOptimizedBuild(cfg) then if config.isOptimizedBuild(cfg) then
_p(3,'<FunctionLevelLinking>true</FunctionLevelLinking>') p.w('<FunctionLevelLinking>true</FunctionLevelLinking>')
end end
end end
@ -1079,7 +1079,7 @@
function m.intrinsicFunctions(cfg) function m.intrinsicFunctions(cfg)
if config.isOptimizedBuild(cfg) then if config.isOptimizedBuild(cfg) then
_p(3,'<IntrinsicFunctions>true</IntrinsicFunctions>') p.w('<IntrinsicFunctions>true</IntrinsicFunctions>')
end end
end end
@ -1142,7 +1142,7 @@
cfg.flags.MultiProcessorCompile or cfg.flags.MultiProcessorCompile or
cfg.debugformat == premake.C7 cfg.debugformat == premake.C7
then then
_p(3,'<MinimalRebuild>false</MinimalRebuild>') p.w('<MinimalRebuild>false</MinimalRebuild>')
end end
end end
@ -1157,7 +1157,7 @@
function m.multiProcessorCompilation(cfg) function m.multiProcessorCompilation(cfg)
if cfg.flags.MultiProcessorCompile then if cfg.flags.MultiProcessorCompile then
_p(3,'<MultiProcessorCompilation>true</MultiProcessorCompilation>') p.w('<MultiProcessorCompilation>true</MultiProcessorCompilation>')
end end
end end
@ -1193,7 +1193,7 @@
function m.omitDefaultLib(cfg) function m.omitDefaultLib(cfg)
if cfg.flags.OmitDefaultLibrary then if cfg.flags.OmitDefaultLibrary then
_p(3,'<OmitDefaultLibName>true</OmitDefaultLibName>') p.w('<OmitDefaultLibName>true</OmitDefaultLibName>')
end end
end end
@ -1201,7 +1201,7 @@
function m.omitFramePointers(cfg) function m.omitFramePointers(cfg)
if cfg.flags.NoFramePointer then if cfg.flags.NoFramePointer then
_p(3,'<OmitFramePointers>true</OmitFramePointers>') p.w('<OmitFramePointers>true</OmitFramePointers>')
end end
end end
@ -1245,10 +1245,10 @@
end end
else else
if not cfg.flags.NoPCH and cfg.pchheader then if not cfg.flags.NoPCH and cfg.pchheader then
_p(3,'<PrecompiledHeader>Use</PrecompiledHeader>') p.w('<PrecompiledHeader>Use</PrecompiledHeader>')
_x(3,'<PrecompiledHeaderFile>%s</PrecompiledHeaderFile>', cfg.pchheader) p.x('<PrecompiledHeaderFile>%s</PrecompiledHeaderFile>', cfg.pchheader)
else else
_p(3,'<PrecompiledHeader>NotUsing</PrecompiledHeader>') p.w('<PrecompiledHeader>NotUsing</PrecompiledHeader>')
end end
end end
end end
@ -1269,7 +1269,7 @@
function m.programDataBaseFileName(cfg) function m.programDataBaseFileName(cfg)
if cfg.flags.Symbols and cfg.debugformat ~= "c7" then if cfg.flags.Symbols and cfg.debugformat ~= "c7" then
local filename = cfg.buildtarget.basename local filename = cfg.buildtarget.basename
_p(3,'<ProgramDataBaseFileName>$(OutDir)%s.pdb</ProgramDataBaseFileName>', filename) p.w('<ProgramDataBaseFileName>$(OutDir)%s.pdb</ProgramDataBaseFileName>', filename)
end end
end end
@ -1334,7 +1334,7 @@
} }
local runtime = runtimes[config.getruntime(cfg)] local runtime = runtimes[config.getruntime(cfg)]
if runtime then if runtime then
_p(3,'<RuntimeLibrary>%s</RuntimeLibrary>', runtime) p.w('<RuntimeLibrary>%s</RuntimeLibrary>', runtime)
end end
end end
@ -1348,13 +1348,13 @@
function m.bufferSecurityCheck(cfg) function m.bufferSecurityCheck(cfg)
if cfg.flags.NoBufferSecurityCheck then if cfg.flags.NoBufferSecurityCheck then
_p(3,'<BufferSecurityCheck>false</BufferSecurityCheck>') p.w('<BufferSecurityCheck>false</BufferSecurityCheck>')
end end
end end
function m.stringPooling(cfg) function m.stringPooling(cfg)
if config.isOptimizedBuild(cfg) then if config.isOptimizedBuild(cfg) then
_p(3,'<StringPooling>true</StringPooling>') p.w('<StringPooling>true</StringPooling>')
end end
end end
@ -1395,14 +1395,14 @@
local map = { On = "true", Off = "false" } local map = { On = "true", Off = "false" }
local value = map[cfg.nativewchar] local value = map[cfg.nativewchar]
if value then if value then
_p(3,'<TreatWChar_tAsBuiltInType>%s</TreatWChar_tAsBuiltInType>', value) p.w('<TreatWChar_tAsBuiltInType>%s</TreatWChar_tAsBuiltInType>', value)
end end
end end
function m.treatWarningAsError(cfg) function m.treatWarningAsError(cfg)
if cfg.flags.FatalLinkWarnings and cfg.warnings ~= "Off" then if cfg.flags.FatalLinkWarnings and cfg.warnings ~= "Off" then
_p(3,'<TreatWarningAsError>true</TreatWarningAsError>') p.w('<TreatWarningAsError>true</TreatWarningAsError>')
end end
end end

2
src/actions/vstudio/vs2010_vcxproj_filters.lua
View File

@ -73,7 +73,7 @@
if #contents > 0 then if #contents > 0 then
p.push('<ItemGroup>') p.push('<ItemGroup>')
p.out(contents) p.outln(contents)
p.pop('</ItemGroup>') p.pop('</ItemGroup>')
end end
end end

442
tests/actions/vstudio/vc2010/test_compile_settings.lua
View File

@ -32,11 +32,11 @@
function suite.defaultSettings() function suite.defaultSettings()
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
</ClCompile> </ClCompile>
]] ]]
end end
@ -53,9 +53,9 @@
pchheader "include/afxwin.h" pchheader "include/afxwin.h"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>include/afxwin.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>include/afxwin.h</PrecompiledHeaderFile>
]] ]]
end end
@ -69,8 +69,8 @@
flags "NoPCH" flags "NoPCH"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
]] ]]
end end
@ -83,9 +83,9 @@
warnings "Extra" warnings "Extra"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
]] ]]
end end
@ -97,9 +97,9 @@
warnings "Off" warnings "Off"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel> <WarningLevel>TurnOffAllWarnings</WarningLevel>
]] ]]
end end
@ -113,9 +113,9 @@
warnings "Off" warnings "Off"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel> <WarningLevel>TurnOffAllWarnings</WarningLevel>
]] ]]
end end
@ -127,14 +127,14 @@
optimize "On" optimize "On"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
]] ]]
end end
@ -142,14 +142,14 @@
optimize "Size" optimize "Size"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>MinSpace</Optimization> <Optimization>MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
]] ]]
end end
@ -157,14 +157,14 @@
optimize "Speed" optimize "Speed"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
]] ]]
end end
@ -172,14 +172,14 @@
optimize "Full" optimize "Full"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
]] ]]
end end
@ -187,11 +187,11 @@
optimize "Off" optimize "Off"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
</ClCompile> </ClCompile>
]] ]]
end end
@ -199,11 +199,11 @@
optimize "Debug" optimize "Debug"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
</ClCompile> </ClCompile>
]] ]]
end end
@ -211,11 +211,11 @@
flags "NoFramePointer" flags "NoFramePointer"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
]] ]]
end end
@ -228,10 +228,10 @@
defines { "DEBUG", "_DEBUG" } defines { "DEBUG", "_DEBUG" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
]] ]]
end end
@ -244,11 +244,11 @@
buildoptions { "/xyz", "/abc" } buildoptions { "/xyz", "/abc" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalOptions>/xyz /abc %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/xyz /abc %(AdditionalOptions)</AdditionalOptions>
]] ]]
end end
@ -261,10 +261,10 @@
includedirs { "include/lua", "include/zlib" } includedirs { "include/lua", "include/zlib" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>include\lua;include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include\lua;include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
]] ]]
end end
@ -277,10 +277,10 @@
usingdirs { "include/lua", "include/zlib" } usingdirs { "include/lua", "include/zlib" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<AdditionalUsingDirectories>include\lua;include\zlib;%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>include\lua;include\zlib;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
]] ]]
end end
@ -292,11 +292,11 @@
flags "NoMinimalRebuild" flags "NoMinimalRebuild"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
]] ]]
end end
@ -308,11 +308,11 @@
debugformat "C7" debugformat "C7"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
]] ]]
end end
@ -325,11 +325,11 @@
flags { "StaticRuntime" } flags { "StaticRuntime" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
]] ]]
end end
@ -337,13 +337,13 @@
flags { "StaticRuntime", "Symbols" } flags { "StaticRuntime", "Symbols" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
]] ]]
end end
@ -356,10 +356,10 @@
flags { "FatalWarnings" } flags { "FatalWarnings" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
]] ]]
end end
@ -372,13 +372,13 @@
flags "Symbols" flags "Symbols"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
</ClCompile> </ClCompile>
]] ]]
end end
@ -392,11 +392,11 @@
debugformat "c7" debugformat "c7"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
]] ]]
end end
@ -409,11 +409,11 @@
vectorextensions "SSE" vectorextensions "SSE"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
]] ]]
end end
@ -421,11 +421,11 @@
vectorextensions "SSE2" vectorextensions "SSE2"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
]] ]]
end end
@ -433,11 +433,11 @@
flags "FloatFast" flags "FloatFast"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<FloatingPointModel>Fast</FloatingPointModel> <FloatingPointModel>Fast</FloatingPointModel>
]] ]]
end end
@ -445,11 +445,11 @@
flags "FloatStrict" flags "FloatStrict"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<FloatingPointModel>Strict</FloatingPointModel> <FloatingPointModel>Strict</FloatingPointModel>
]] ]]
end end
@ -462,11 +462,11 @@
flags "NativeWChar" flags "NativeWChar"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
]] ]]
end end
@ -474,11 +474,11 @@
flags "NoNativeWChar" flags "NoNativeWChar"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
]] ]]
end end
@ -491,11 +491,11 @@
flags "NoExceptions" flags "NoExceptions"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
]] ]]
end end
@ -503,11 +503,11 @@
flags "SEH" flags "SEH"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
]] ]]
end end
@ -515,11 +515,11 @@
flags "NoRTTI" flags "NoRTTI"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
]] ]]
end end
@ -527,11 +527,11 @@
flags "NoBufferSecurityCheck" flags "NoBufferSecurityCheck"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
]] ]]
end end
@ -545,10 +545,10 @@
architecture "x32" architecture "x32"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
]] ]]
end end
@ -562,10 +562,10 @@
architecture "x64" architecture "x64"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]] ]]
end end
@ -578,10 +578,10 @@
flags { "Symbols", "NoEditAndContinue" } flags { "Symbols", "NoEditAndContinue" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]] ]]
end end
@ -595,10 +595,10 @@
optimize "On" optimize "On"
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]] ]]
end end
@ -611,10 +611,10 @@
flags { "Symbols", "Managed" } flags { "Symbols", "Managed" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]] ]]
end end
@ -627,10 +627,10 @@
forceincludes { "stdafx.h", "include/sys.h" } forceincludes { "stdafx.h", "include/sys.h" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<ForcedIncludeFiles>stdafx.h;include\sys.h</ForcedIncludeFiles> <ForcedIncludeFiles>stdafx.h;include\sys.h</ForcedIncludeFiles>
]] ]]
end end
@ -638,10 +638,10 @@
forceusings { "stdafx.h", "include/sys.h" } forceusings { "stdafx.h", "include/sys.h" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<ForcedUsingFiles>stdafx.h;include\sys.h</ForcedUsingFiles> <ForcedUsingFiles>stdafx.h;include\sys.h</ForcedUsingFiles>
]] ]]
end end
@ -654,10 +654,10 @@
flags { "NoRuntimeChecks" } flags { "NoRuntimeChecks" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
]] ]]
end end
@ -670,12 +670,12 @@
flags { "MultiProcessorCompile" } flags { "MultiProcessorCompile" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
]] ]]
end end
@ -690,13 +690,13 @@
flags { "Symbols", "ReleaseRuntime", "StaticRuntime" } flags { "Symbols", "ReleaseRuntime", "StaticRuntime" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)MyProject.pdb</ProgramDataBaseFileName>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
]] ]]
end end
@ -709,10 +709,10 @@
flags { "OmitDefaultLibrary" } flags { "OmitDefaultLibrary" }
prepare() prepare()
test.capture [[ test.capture [[
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<OmitDefaultLibName>true</OmitDefaultLibName> <OmitDefaultLibName>true</OmitDefaultLibName>
]] ]]
end end

10
tests/actions/vstudio/vc2010/test_item_def_group.lua
View File

@ -32,7 +32,7 @@
function suite.structureIsCorrect_onDefaultValues() function suite.structureIsCorrect_onDefaultValues()
prepare() prepare()
test.capture [[ test.capture [[
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
]] ]]
end end
@ -45,8 +45,8 @@
kind "Makefile" kind "Makefile"
prepare() prepare()
test.capture [[ test.capture [[
<ItemDefinitionGroup> <ItemDefinitionGroup>
</ItemDefinitionGroup> </ItemDefinitionGroup>
]] ]]
end end
@ -54,8 +54,8 @@
kind "Makefile" kind "Makefile"
prepare() prepare()
test.capture [[ test.capture [[
<ItemDefinitionGroup> <ItemDefinitionGroup>
</ItemDefinitionGroup> </ItemDefinitionGroup>
]] ]]
end end