Code cleanup; finish converting to new indentation-aware output APIs
This commit is contained in:
parent
6be595f126
commit
de7b6e001d
@ -83,20 +83,20 @@
|
||||
end
|
||||
|
||||
local configs = {}
|
||||
_p(1,'<ItemGroup Label="ProjectConfigurations">')
|
||||
p.push('<ItemGroup Label="ProjectConfigurations">')
|
||||
for cfg in project.eachconfig(prj) do
|
||||
for _, arch in ipairs(platforms) do
|
||||
local prjcfg = vstudio.projectConfig(cfg, arch)
|
||||
if not configs[prjcfg] then
|
||||
configs[prjcfg] = prjcfg
|
||||
_x(2,'<ProjectConfiguration Include="%s">', vstudio.projectConfig(cfg, arch))
|
||||
_x(3,'<Configuration>%s</Configuration>', vstudio.projectPlatform(cfg))
|
||||
_p(3,'<Platform>%s</Platform>', arch)
|
||||
_p(2,'</ProjectConfiguration>')
|
||||
p.push('<ProjectConfiguration Include="%s">', vstudio.projectConfig(cfg, arch))
|
||||
p.x('<Configuration>%s</Configuration>', vstudio.projectPlatform(cfg))
|
||||
p.w('<Platform>%s</Platform>', arch)
|
||||
p.pop('</ProjectConfiguration>')
|
||||
end
|
||||
end
|
||||
end
|
||||
_p(1,'</ItemGroup>')
|
||||
p.pop('</ItemGroup>')
|
||||
end
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@
|
||||
local tools = string.format(' ToolsVersion="%s"', action.vstudio.toolsVersion)
|
||||
|
||||
local framework = prj.framework or action.vstudio.targetFramework or "4.0"
|
||||
_p(2,'<TargetFrameworkVersion>v%s</TargetFrameworkVersion>', framework)
|
||||
p.w('<TargetFrameworkVersion>v%s</TargetFrameworkVersion>', framework)
|
||||
end
|
||||
|
||||
|
||||
@ -130,7 +130,7 @@
|
||||
function m.globals(prj)
|
||||
m.propertyGroup(nil, "Globals")
|
||||
p.callArray(m.elements.globals, prj)
|
||||
_p(1,'</PropertyGroup>')
|
||||
p.pop('</PropertyGroup>')
|
||||
end
|
||||
|
||||
|
||||
@ -162,7 +162,7 @@
|
||||
function m.configurationProperties(cfg)
|
||||
m.propertyGroup(cfg, "Configuration")
|
||||
p.callArray(m.elements.configurationProperties, cfg)
|
||||
_p(1,'</PropertyGroup>')
|
||||
p.pop('</PropertyGroup>')
|
||||
end
|
||||
|
||||
function m.configurationPropertiesGroup(prj)
|
||||
@ -208,7 +208,7 @@
|
||||
if not vstudio.isMakefile(cfg) then
|
||||
m.propertyGroup(cfg)
|
||||
p.callArray(m.elements.outputProperties, cfg)
|
||||
_p(1,'</PropertyGroup>')
|
||||
p.pop('</PropertyGroup>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -233,7 +233,7 @@
|
||||
m.nmakeCommandLine(cfg, cfg.buildcommands, "Build")
|
||||
m.nmakeCommandLine(cfg, cfg.rebuildcommands, "ReBuild")
|
||||
m.nmakeCommandLine(cfg, cfg.cleancommands, "Clean")
|
||||
_p(1,'</PropertyGroup>')
|
||||
p.pop('</PropertyGroup>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -428,8 +428,7 @@
|
||||
m.additionalLinkOptions,
|
||||
}
|
||||
else
|
||||
return {
|
||||
}
|
||||
return {}
|
||||
end
|
||||
end
|
||||
|
||||
@ -453,27 +452,21 @@
|
||||
--
|
||||
|
||||
function m.manifest(cfg)
|
||||
-- no additional manifests in static lib
|
||||
if cfg.kind == premake.STATICLIB then
|
||||
return
|
||||
end
|
||||
if cfg.kind ~= p.STATICLIB then
|
||||
-- get the manifests files
|
||||
local manifests = {}
|
||||
for _, fname in ipairs(cfg.files) do
|
||||
if path.getextension(fname) == ".manifest" then
|
||||
table.insert(manifests, project.getrelative(cfg.project, fname))
|
||||
end
|
||||
end
|
||||
|
||||
-- get the manifests files
|
||||
local manifests = {}
|
||||
for _, fname in ipairs(cfg.files) do
|
||||
if path.getextension(fname) == ".manifest" then
|
||||
table.insert(manifests, project.getrelative(cfg.project, fname))
|
||||
if #manifests > 0 then
|
||||
p.push('<Manifest>')
|
||||
m.element("AdditionalManifestFiles", nil, "%s %%(AdditionalManifestFiles)", table.concat(manifests, " "))
|
||||
p.pop('</Manifest>')
|
||||
end
|
||||
end
|
||||
|
||||
-- when a project is not using manifest files, visual studio doesn't write the section.
|
||||
if #manifests == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
p.push('<Manifest>')
|
||||
m.element("AdditionalManifestFiles", nil, "%s %%(AdditionalManifestFiles)", table.concat(manifests, " "))
|
||||
p.pop('</Manifest>')
|
||||
end
|
||||
|
||||
|
||||
@ -491,12 +484,12 @@
|
||||
|
||||
if #steps > 0 then
|
||||
steps = os.translateCommands(steps, p.WINDOWS)
|
||||
_p(2,'<%s>', name)
|
||||
_x(3,'<Command>%s</Command>', table.implode(steps, "", "", "\r\n"))
|
||||
p.push('<%s>', name)
|
||||
p.x('<Command>%s</Command>', table.implode(steps, "", "", "\r\n"))
|
||||
if msg then
|
||||
_x(3,'<Message>%s</Message>', msg)
|
||||
p.x('<Message>%s</Message>', msg)
|
||||
end
|
||||
_p(2,'</%s>', name)
|
||||
p.pop('</%s>', name)
|
||||
end
|
||||
end
|
||||
|
||||
@ -555,21 +548,21 @@
|
||||
|
||||
local refs = config.getlinks(cfg, "system", "fullpath", "managed")
|
||||
if #refs > 0 then
|
||||
_p(1,'<ItemGroup>')
|
||||
p.push('<ItemGroup>')
|
||||
for i = 1, #refs do
|
||||
local value = refs[i]
|
||||
|
||||
-- If the link contains a '/' then it is a relative path to
|
||||
-- a local assembly. Otherwise treat it as a system assembly.
|
||||
if value:find('/', 1, true) then
|
||||
_x(2,'<Reference Include="%s">', path.getbasename(value))
|
||||
_x(3,'<HintPath>%s</HintPath>', path.translate(value))
|
||||
_p(2,'</Reference>')
|
||||
p.push('<Reference Include="%s">', path.getbasename(value))
|
||||
p.x('<HintPath>%s</HintPath>', path.translate(value))
|
||||
p.pop('</Reference>')
|
||||
else
|
||||
_x(2,'<Reference Include="%s" />', path.getbasename(value))
|
||||
p.x('<Reference Include="%s" />', path.getbasename(value))
|
||||
end
|
||||
end
|
||||
_p(1,'</ItemGroup>')
|
||||
p.pop('</ItemGroup>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -929,7 +922,7 @@
|
||||
function m.additionalLibraryDirectories(cfg)
|
||||
if #cfg.libdirs > 0 then
|
||||
local dirs = table.concat(vstudio.path(cfg, cfg.libdirs), ";")
|
||||
_x(3,'<AdditionalLibraryDirectories>%s;%%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>', dirs)
|
||||
p.x('<AdditionalLibraryDirectories>%s;%%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>', dirs)
|
||||
end
|
||||
end
|
||||
|
||||
@ -953,7 +946,7 @@
|
||||
function m.additionalLinkOptions(cfg)
|
||||
if #cfg.linkoptions > 0 then
|
||||
local opts = table.concat(cfg.linkoptions, " ")
|
||||
_x(3, '<AdditionalOptions>%s %%(AdditionalOptions)</AdditionalOptions>', opts)
|
||||
p.x('<AdditionalOptions>%s %%(AdditionalOptions)</AdditionalOptions>', opts)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1005,14 +998,14 @@
|
||||
|
||||
function m.characterSet(cfg)
|
||||
if not vstudio.isMakefile(cfg) then
|
||||
_p(2,'<CharacterSet>%s</CharacterSet>', iif(cfg.flags.Unicode, "Unicode", "MultiByte"))
|
||||
p.w('<CharacterSet>%s</CharacterSet>', iif(cfg.flags.Unicode, "Unicode", "MultiByte"))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.wholeProgramOptimization(cfg)
|
||||
if cfg.flags.LinkTimeOptimization then
|
||||
_p(2,'<WholeProgramOptimization>true</WholeProgramOptimization>')
|
||||
p.w('<WholeProgramOptimization>true</WholeProgramOptimization>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1050,7 +1043,7 @@
|
||||
|
||||
function m.compileAs(cfg)
|
||||
if cfg.project.language == "C" then
|
||||
_p(3,'<CompileAs>CompileAsC</CompileAs>')
|
||||
p.w('<CompileAs>CompileAsC</CompileAs>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1065,7 +1058,7 @@
|
||||
None = "Makefile",
|
||||
Utility = "Utility",
|
||||
}
|
||||
_p(2,'<ConfigurationType>%s</ConfigurationType>', types[cfg.kind])
|
||||
p.w('<ConfigurationType>%s</ConfigurationType>', types[cfg.kind])
|
||||
end
|
||||
|
||||
|
||||
@ -1100,11 +1093,11 @@
|
||||
|
||||
function m.deploy(cfg)
|
||||
if cfg.system == premake.XBOX360 then
|
||||
_p(2,'<Deploy>')
|
||||
_p(3,'<DeploymentType>CopyToHardDrive</DeploymentType>')
|
||||
_p(3,'<DvdEmulationType>ZeroSeekTimes</DvdEmulationType>')
|
||||
_p(3,'<DeploymentFiles>$(RemoteRoot)=$(ImagePath);</DeploymentFiles>')
|
||||
_p(2,'</Deploy>')
|
||||
p.push('<Deploy>')
|
||||
p.w('<DeploymentType>CopyToHardDrive</DeploymentType>')
|
||||
p.w('<DvdEmulationType>ZeroSeekTimes</DvdEmulationType>')
|
||||
p.w('<DeploymentFiles>$(RemoteRoot)=$(ImagePath);</DeploymentFiles>')
|
||||
p.pop('</Deploy>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1135,7 +1128,7 @@
|
||||
cfg.clr == p.OFF and
|
||||
cfg.system ~= premake.XBOX360
|
||||
then
|
||||
_p(3,'<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>')
|
||||
p.w('<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1212,20 +1205,20 @@
|
||||
|
||||
|
||||
function m.generateDebugInformation(cfg)
|
||||
_p(3,'<GenerateDebugInformation>%s</GenerateDebugInformation>', tostring(cfg.flags.Symbols ~= nil))
|
||||
p.w('<GenerateDebugInformation>%s</GenerateDebugInformation>', tostring(cfg.flags.Symbols ~= nil))
|
||||
end
|
||||
|
||||
|
||||
function m.generateManifest(cfg)
|
||||
if cfg.flags.NoManifest then
|
||||
_p(2,'<GenerateManifest>false</GenerateManifest>')
|
||||
p.w('<GenerateManifest>false</GenerateManifest>')
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.generateMapFile(cfg)
|
||||
if cfg.flags.Maps then
|
||||
_p(3,'<GenerateMapFile>true</GenerateMapFile>')
|
||||
p.w('<GenerateMapFile>true</GenerateMapFile>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1244,30 +1237,30 @@
|
||||
|
||||
function m.ignoreImportLibrary(cfg)
|
||||
if cfg.kind == premake.SHAREDLIB and cfg.flags.NoImportLib then
|
||||
_p(2,'<IgnoreImportLibrary>true</IgnoreImportLibrary>');
|
||||
p.w('<IgnoreImportLibrary>true</IgnoreImportLibrary>');
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.imageXex(cfg)
|
||||
if cfg.system == premake.XBOX360 then
|
||||
_p(2,'<ImageXex>')
|
||||
p.push('<ImageXex>')
|
||||
if cfg.configfile then
|
||||
_p(3,'<ConfigurationFile>%s</ConfigurationFile>', cfg.configfile)
|
||||
p.w('<ConfigurationFile>%s</ConfigurationFile>', cfg.configfile)
|
||||
else
|
||||
_p(3,'<ConfigurationFile>')
|
||||
_p(3,'</ConfigurationFile>')
|
||||
p.w('<ConfigurationFile>')
|
||||
p.w('</ConfigurationFile>')
|
||||
end
|
||||
_p(3,'<AdditionalSections>')
|
||||
_p(3,'</AdditionalSections>')
|
||||
_p(2,'</ImageXex>')
|
||||
p.w('<AdditionalSections>')
|
||||
p.w('</AdditionalSections>')
|
||||
p.pop('</ImageXex>')
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.imageXexOutput(cfg)
|
||||
if cfg.system == premake.XBOX360 then
|
||||
_x(2,'<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>')
|
||||
p.x('<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1288,7 +1281,7 @@
|
||||
|
||||
|
||||
function m.importDefaultProps(prj)
|
||||
_p(1,'<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" />')
|
||||
p.w('<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" />')
|
||||
end
|
||||
|
||||
|
||||
@ -1310,7 +1303,7 @@
|
||||
|
||||
function m.importLibrary(cfg)
|
||||
if cfg.kind == premake.SHAREDLIB then
|
||||
_x(3,'<ImportLibrary>%s</ImportLibrary>', path.translate(cfg.linktarget.relpath))
|
||||
p.x('<ImportLibrary>%s</ImportLibrary>', path.translate(cfg.linktarget.relpath))
|
||||
end
|
||||
end
|
||||
|
||||
@ -1325,7 +1318,7 @@
|
||||
|
||||
function m.intDir(cfg)
|
||||
local objdir = vstudio.path(cfg, cfg.objdir)
|
||||
_x(2,'<IntDir>%s\\</IntDir>', objdir)
|
||||
p.x('<IntDir>%s\\</IntDir>', objdir)
|
||||
end
|
||||
|
||||
|
||||
@ -1354,15 +1347,15 @@
|
||||
|
||||
if isWin then
|
||||
if isMakefile then
|
||||
_p(2,'<Keyword>MakeFileProj</Keyword>')
|
||||
p.w('<Keyword>MakeFileProj</Keyword>')
|
||||
else
|
||||
if isManaged then
|
||||
m.targetFramework(prj)
|
||||
_p(2,'<Keyword>ManagedCProj</Keyword>')
|
||||
p.w('<Keyword>ManagedCProj</Keyword>')
|
||||
else
|
||||
_p(2,'<Keyword>Win32Proj</Keyword>')
|
||||
p.w('<Keyword>Win32Proj</Keyword>')
|
||||
end
|
||||
_p(2,'<RootNamespace>%s</RootNamespace>', prj.name)
|
||||
p.w('<RootNamespace>%s</RootNamespace>', prj.name)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1379,7 +1372,7 @@
|
||||
|
||||
function m.linkIncremental(cfg)
|
||||
if cfg.kind ~= premake.STATICLIB then
|
||||
_p(2,'<LinkIncremental>%s</LinkIncremental>', tostring(config.canLinkIncremental(cfg)))
|
||||
p.w('<LinkIncremental>%s</LinkIncremental>', tostring(config.canLinkIncremental(cfg)))
|
||||
end
|
||||
end
|
||||
|
||||
@ -1389,9 +1382,9 @@
|
||||
-- that has been excluded from the build. As a workaround, disable dependency
|
||||
-- linking and list all siblings explicitly
|
||||
if explicit then
|
||||
_p(2,'<ProjectReference>')
|
||||
_p(3,'<LinkLibraryDependencies>false</LinkLibraryDependencies>')
|
||||
_p(2,'</ProjectReference>')
|
||||
p.push('<ProjectReference>')
|
||||
p.w('<LinkLibraryDependencies>false</LinkLibraryDependencies>')
|
||||
p.pop('</ProjectReference>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1410,7 +1403,7 @@
|
||||
function m.moduleDefinitionFile(cfg)
|
||||
local df = config.findfile(cfg, ".def")
|
||||
if df then
|
||||
_p(3,'<ModuleDefinitionFile>%s</ModuleDefinitionFile>', df)
|
||||
p.w('<ModuleDefinitionFile>%s</ModuleDefinitionFile>', df)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1426,7 +1419,7 @@
|
||||
if #commands > 0 then
|
||||
commands = os.translateCommands(commands, p.WINDOWS)
|
||||
commands = table.concat(premake.esc(commands), p.eol())
|
||||
_p(2, '<NMake%sCommandLine>%s</NMake%sCommandLine>', phase, commands, phase)
|
||||
p.w('<NMake%sCommandLine>%s</NMake%sCommandLine>', phase, commands, phase)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1439,7 +1432,7 @@
|
||||
end
|
||||
|
||||
function m.nmakeOutput(cfg)
|
||||
_p(2,'<NMakeOutput>$(OutDir)%s</NMakeOutput>', cfg.buildtarget.name)
|
||||
p.w('<NMakeOutput>$(OutDir)%s</NMakeOutput>', cfg.buildtarget.name)
|
||||
end
|
||||
|
||||
|
||||
@ -1469,8 +1462,8 @@
|
||||
|
||||
function m.optimizeReferences(cfg)
|
||||
if config.isOptimizedBuild(cfg) then
|
||||
_p(3,'<EnableCOMDATFolding>true</EnableCOMDATFolding>')
|
||||
_p(3,'<OptimizeReferences>true</OptimizeReferences>')
|
||||
p.w('<EnableCOMDATFolding>true</EnableCOMDATFolding>')
|
||||
p.w('<OptimizeReferences>true</OptimizeReferences>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -1486,13 +1479,13 @@
|
||||
|
||||
function m.outDir(cfg)
|
||||
local outdir = vstudio.path(cfg, cfg.buildtarget.directory)
|
||||
_x(2,'<OutDir>%s\\</OutDir>', outdir)
|
||||
p.x('<OutDir>%s\\</OutDir>', outdir)
|
||||
end
|
||||
|
||||
|
||||
function m.outputFile(cfg)
|
||||
if cfg.system == premake.XBOX360 then
|
||||
_p(2,'<OutputFile>$(OutDir)%s</OutputFile>', cfg.buildtarget.name)
|
||||
p.w('<OutputFile>$(OutDir)%s</OutputFile>', cfg.buildtarget.name)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1500,7 +1493,7 @@
|
||||
function m.executablePath(cfg)
|
||||
local dirs = vstudio.path(cfg, cfg.bindirs)
|
||||
if #dirs > 0 then
|
||||
_x(2,'<ExecutablePath>%s;$(ExecutablePath)</ExecutablePath>', path.translate(table.concat(dirs, ";")))
|
||||
p.x('<ExecutablePath>%s;$(ExecutablePath)</ExecutablePath>', path.translate(table.concat(dirs, ";")))
|
||||
end
|
||||
end
|
||||
|
||||
@ -1574,13 +1567,13 @@
|
||||
|
||||
|
||||
function m.projectGuid(prj)
|
||||
_p(2,'<ProjectGuid>{%s}</ProjectGuid>', prj.uuid)
|
||||
p.w('<ProjectGuid>{%s}</ProjectGuid>', prj.uuid)
|
||||
end
|
||||
|
||||
|
||||
function m.projectName(prj)
|
||||
if prj.name ~= prj.filename then
|
||||
_x(2,'<ProjectName>%s</ProjectName>', prj.name)
|
||||
p.x('<ProjectName>%s</ProjectName>', prj.name)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1595,15 +1588,15 @@
|
||||
label = string.format(' Label="%s"', label)
|
||||
end
|
||||
|
||||
_p(1,'<PropertyGroup%s%s>', cond or "", label or "")
|
||||
p.push('<PropertyGroup%s%s>', cond or "", label or "")
|
||||
end
|
||||
|
||||
|
||||
|
||||
function m.propertySheets(cfg)
|
||||
_p(1,'<ImportGroup Label="PropertySheets" %s>', m.condition(cfg))
|
||||
_p(2,'<Import Project="$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props" Condition="exists(\'$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props\')" Label="LocalAppDataPlatform" />')
|
||||
_p(1,'</ImportGroup>')
|
||||
p.push('<ImportGroup Label="PropertySheets" %s>', m.condition(cfg))
|
||||
p.w('<Import Project="$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props" Condition="exists(\'$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props\')" Label="LocalAppDataPlatform" />')
|
||||
p.pop('</ImportGroup>')
|
||||
end
|
||||
|
||||
|
||||
@ -1695,7 +1688,7 @@
|
||||
function m.subSystem(cfg)
|
||||
if cfg.system ~= premake.XBOX360 then
|
||||
local subsystem = iif(cfg.kind == premake.CONSOLEAPP, "Console", "Windows")
|
||||
_p(3,'<SubSystem>%s</SubSystem>', subsystem)
|
||||
p.w('<SubSystem>%s</SubSystem>', subsystem)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1703,23 +1696,23 @@
|
||||
function m.targetExt(cfg)
|
||||
local ext = cfg.buildtarget.extension
|
||||
if ext ~= "" then
|
||||
_x(2,'<TargetExt>%s</TargetExt>', ext)
|
||||
p.x('<TargetExt>%s</TargetExt>', ext)
|
||||
else
|
||||
_p(2,'<TargetExt>')
|
||||
_p(2,'</TargetExt>')
|
||||
p.w('<TargetExt>')
|
||||
p.w('</TargetExt>')
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.targetName(cfg)
|
||||
_x(2,'<TargetName>%s%s</TargetName>', cfg.buildtarget.prefix, cfg.buildtarget.basename)
|
||||
p.x('<TargetName>%s%s</TargetName>', cfg.buildtarget.prefix, cfg.buildtarget.basename)
|
||||
end
|
||||
|
||||
|
||||
function m.treatLinkerWarningAsErrors(cfg)
|
||||
if cfg.flags.FatalLinkWarnings then
|
||||
local el = iif(cfg.kind == premake.STATICLIB, "Lib", "Linker")
|
||||
_p(3,'<Treat%sWarningAsErrors>true</Treat%sWarningAsErrors>', el, el)
|
||||
p.w('<Treat%sWarningAsErrors>true</Treat%sWarningAsErrors>', el, el)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1760,26 +1753,26 @@
|
||||
|
||||
function m.useDebugLibraries(cfg)
|
||||
local runtime = config.getruntime(cfg)
|
||||
_p(2,'<UseDebugLibraries>%s</UseDebugLibraries>', tostring(runtime:endswith("Debug")))
|
||||
p.w('<UseDebugLibraries>%s</UseDebugLibraries>', tostring(runtime:endswith("Debug")))
|
||||
end
|
||||
|
||||
|
||||
function m.useOfMfc(cfg)
|
||||
if cfg.flags.MFC then
|
||||
_p(2,'<UseOfMfc>%s</UseOfMfc>', iif(cfg.flags.StaticRuntime, "Static", "Dynamic"))
|
||||
p.w('<UseOfMfc>%s</UseOfMfc>', iif(cfg.flags.StaticRuntime, "Static", "Dynamic"))
|
||||
end
|
||||
end
|
||||
|
||||
function m.useOfAtl(cfg)
|
||||
if cfg.atl then
|
||||
_p(2,'<UseOfATL>%s</UseOfATL>', cfg.atl)
|
||||
p.w('<UseOfATL>%s</UseOfATL>', cfg.atl)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
function m.userMacros(cfg)
|
||||
_p(1,'<PropertyGroup Label="UserMacros" />')
|
||||
p.w('<PropertyGroup Label="UserMacros" />')
|
||||
end
|
||||
|
||||
|
||||
|
@ -44,10 +44,10 @@
|
||||
links { "System.dll", "System.Data.dll" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
</ItemGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -60,9 +60,9 @@
|
||||
links { "m", "System.dll" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -75,10 +75,10 @@
|
||||
links { "../nunit.framework.dll" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework">
|
||||
<HintPath>..\nunit.framework.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework">
|
||||
<HintPath>..\nunit.framework.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
]]
|
||||
end
|
||||
|
@ -43,9 +43,9 @@
|
||||
prebuildcommands { "command1" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PreBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PreBuildEvent>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -53,9 +53,9 @@
|
||||
postbuildcommands { "command1" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PostBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PostBuildEvent>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -64,12 +64,12 @@
|
||||
postbuildcommands { "command2" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PreBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
<Command>command2</Command>
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>command1</Command>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
<Command>command2</Command>
|
||||
</PostBuildEvent>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
function suite.splits_onMultipleCommands()
|
||||
postbuildcommands { "command1", "command2" }
|
||||
prepare()
|
||||
test.capture ("\t\t<PostBuildEvent>\n\t\t\t<Command>command1\r\ncommand2</Command>\n\t\t</PostBuildEvent>\n")
|
||||
test.capture ("<PostBuildEvent>\n\t<Command>command1\r\ncommand2</Command>\n</PostBuildEvent>\n")
|
||||
end
|
||||
|
||||
|
||||
@ -94,9 +94,9 @@
|
||||
postbuildcommands { '\' " < > &' }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PostBuildEvent>
|
||||
<Command>' " < > &</Command>
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
<Command>' " < > &</Command>
|
||||
</PostBuildEvent>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -110,9 +110,9 @@
|
||||
postbuildmessage "Post-building..."
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PostBuildEvent>
|
||||
<Command>command1</Command>
|
||||
<Message>Post-building...</Message>
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
<Command>command1</Command>
|
||||
<Message>Post-building...</Message>
|
||||
</PostBuildEvent>
|
||||
]]
|
||||
end
|
||||
|
@ -33,11 +33,11 @@
|
||||
function suite.structureIsCorrect_onDefaultValues()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -50,8 +50,8 @@
|
||||
kind "ConsoleApp"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -59,8 +59,8 @@
|
||||
kind "WindowedApp"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -68,8 +68,8 @@
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -77,8 +77,8 @@
|
||||
kind "StaticLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -90,9 +90,9 @@
|
||||
flags "Symbols"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -104,10 +104,10 @@
|
||||
flags "Unicode"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -120,10 +120,10 @@
|
||||
clr "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>true</CLRSupport>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>true</CLRSupport>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -131,9 +131,9 @@
|
||||
clr "Off"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -141,10 +141,10 @@
|
||||
clr "Unsafe"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>true</CLRSupport>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>true</CLRSupport>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -152,10 +152,10 @@
|
||||
clr "Safe"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>Safe</CLRSupport>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>Safe</CLRSupport>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -163,10 +163,10 @@
|
||||
clr "Pure"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>Pure</CLRSupport>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CLRSupport>Pure</CLRSupport>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -179,10 +179,10 @@
|
||||
flags "MFC"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfMfc>Dynamic</UseOfMfc>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfMfc>Dynamic</UseOfMfc>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -190,10 +190,10 @@
|
||||
flags { "MFC", "StaticRuntime" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -205,10 +205,10 @@
|
||||
atl "Dynamic"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfATL>Dynamic</UseOfATL>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfATL>Dynamic</UseOfATL>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -216,10 +216,10 @@
|
||||
atl "Static"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfATL>Static</UseOfATL>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<UseOfATL>Static</UseOfATL>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -233,9 +233,9 @@
|
||||
flags { "Symbols", "ReleaseRuntime" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -251,12 +251,12 @@
|
||||
kind "Makefile"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -264,12 +264,12 @@
|
||||
kind "None"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -281,9 +281,9 @@
|
||||
kind "Utility"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Utility</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Utility</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -295,10 +295,10 @@
|
||||
flags { "LinkTimeOptimization" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
]]
|
||||
end
|
||||
|
@ -49,11 +49,11 @@
|
||||
function suite.normalLink_onIncludedConfig()
|
||||
prepare("Zeus")
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -68,14 +68,14 @@
|
||||
function suite.explicitLink_onExcludedConfig()
|
||||
prepare("Ares")
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bin\Ares\Debug\MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bin\Ares\Debug\MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
]]
|
||||
end
|
||||
|
@ -32,11 +32,11 @@
|
||||
function suite.structureIsCorrect_onDefaultValues()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -49,12 +49,12 @@
|
||||
clr "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -68,12 +68,12 @@
|
||||
framework "4.5"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -82,13 +82,13 @@
|
||||
clr "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<Keyword>ManagedCProj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -100,9 +100,9 @@
|
||||
system "Linux"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -118,11 +118,11 @@
|
||||
system "Linux"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -135,10 +135,10 @@
|
||||
kind "Makefile"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>MakeFileProj</Keyword>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>MakeFileProj</Keyword>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -146,10 +146,10 @@
|
||||
kind "None"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>MakeFileProj</Keyword>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>MakeFileProj</Keyword>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -163,12 +163,12 @@
|
||||
filename "MyProject_2012"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
<ProjectName>MyProject</ProjectName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
<ProjectName>MyProject</ProjectName>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -183,11 +183,11 @@
|
||||
_ACTION = "vs2013"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>MyProject</RootNamespace>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
@ -31,12 +31,12 @@
|
||||
function suite.defaultSettings()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ImageXex>
|
||||
<ConfigurationFile>
|
||||
</ConfigurationFile>
|
||||
<AdditionalSections>
|
||||
</AdditionalSections>
|
||||
</ImageXex>
|
||||
<ImageXex>
|
||||
<ConfigurationFile>
|
||||
</ConfigurationFile>
|
||||
<AdditionalSections>
|
||||
</AdditionalSections>
|
||||
</ImageXex>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -47,10 +47,10 @@
|
||||
configfile "testconfig.xml"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ImageXex>
|
||||
<ConfigurationFile>testconfig.xml</ConfigurationFile>
|
||||
<AdditionalSections>
|
||||
</AdditionalSections>
|
||||
</ImageXex>
|
||||
<ImageXex>
|
||||
<ConfigurationFile>testconfig.xml</ConfigurationFile>
|
||||
<AdditionalSections>
|
||||
</AdditionalSections>
|
||||
</ImageXex>
|
||||
]]
|
||||
end
|
||||
|
@ -35,11 +35,11 @@
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -52,13 +52,13 @@
|
||||
optimize "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -71,10 +71,10 @@
|
||||
kind "ConsoleApp"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -82,10 +82,10 @@
|
||||
kind "WindowedApp"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -93,11 +93,11 @@
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -105,10 +105,10 @@
|
||||
kind "StaticLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -121,14 +121,14 @@
|
||||
flags "NoImplicitLink"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -140,9 +140,9 @@
|
||||
flags "Symbols"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -156,10 +156,10 @@
|
||||
links { "lua", "zlib" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>lua.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>lua.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -172,10 +172,10 @@
|
||||
libdirs { "../lib", "../lib64" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\lib;..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\lib;..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -191,11 +191,11 @@
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -211,15 +211,15 @@
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bin\Debug\MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bin\Debug\MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -235,10 +235,10 @@
|
||||
libdirs { "../lib", "../lib64" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -251,11 +251,11 @@
|
||||
implibdir "../lib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>..\lib\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>..\lib\MyProject.lib</ImportLibrary>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -270,11 +270,11 @@
|
||||
linkoptions { "/kupo" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<AdditionalOptions>/kupo %(AdditionalOptions)</AdditionalOptions>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<AdditionalOptions>/kupo %(AdditionalOptions)</AdditionalOptions>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -283,13 +283,13 @@
|
||||
linkoptions { "/kupo" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/kupo %(AdditionalOptions)</AdditionalOptions>
|
||||
</Lib>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/kupo %(AdditionalOptions)</AdditionalOptions>
|
||||
</Lib>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -302,11 +302,11 @@
|
||||
optimize "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -319,12 +319,12 @@
|
||||
files { "hello.cpp", "hello.def" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<ModuleDefinitionFile>hello.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<ModuleDefinitionFile>hello.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -337,10 +337,10 @@
|
||||
links { "kernel32", "System.dll", "System.Data.dll" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -354,9 +354,9 @@
|
||||
system "Xbox360"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Link>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -369,10 +369,10 @@
|
||||
links { "user32" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<Link>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -386,11 +386,11 @@
|
||||
flags { "FatalLinkWarnings" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -399,13 +399,13 @@
|
||||
flags { "FatalLinkWarnings" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Lib>
|
||||
<TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>
|
||||
</Lib>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
</Link>
|
||||
<Lib>
|
||||
<TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>
|
||||
</Lib>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -418,11 +418,11 @@
|
||||
flags { "Maps" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
</Link>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
</Link>
|
||||
]]
|
||||
end
|
||||
|
@ -33,9 +33,9 @@
|
||||
function suite.structureIsCorrect_onDefaultValues()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -59,9 +59,9 @@
|
||||
targetextension ".exe"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject.exe</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject.exe</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -74,10 +74,10 @@
|
||||
buildcommands { "command 1" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeBuildCommandLine>command 1</NMakeBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeBuildCommandLine>command 1</NMakeBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -85,11 +85,11 @@
|
||||
buildcommands { "command 1", "command 2" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeBuildCommandLine>command 1
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeBuildCommandLine>command 1
|
||||
command 2</NMakeBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -97,10 +97,10 @@ command 2</NMakeBuildCommandLine>
|
||||
rebuildcommands { "command 1" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeReBuildCommandLine>command 1</NMakeReBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeReBuildCommandLine>command 1</NMakeReBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -108,9 +108,9 @@ command 2</NMakeBuildCommandLine>
|
||||
cleancommands { "command 1" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeCleanCommandLine>command 1</NMakeCleanCommandLine>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
|
||||
<NMakeCleanCommandLine>command 1</NMakeCleanCommandLine>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
@ -32,13 +32,13 @@
|
||||
function suite.structureIsCorrect_onDefaultValues()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -68,15 +68,15 @@
|
||||
system "Xbox360"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<OutputFile>$(OutDir)MyProject.exe</OutputFile>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<OutputFile>$(OutDir)MyProject.exe</OutputFile>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -85,14 +85,14 @@
|
||||
kind "StaticLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<OutputFile>$(OutDir)MyProject.lib</OutputFile>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.lib</TargetExt>
|
||||
<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<OutputFile>$(OutDir)MyProject.lib</OutputFile>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.lib</TargetExt>
|
||||
<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -105,8 +105,8 @@
|
||||
kind "StaticLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -118,8 +118,8 @@
|
||||
optimize "On"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -131,9 +131,9 @@
|
||||
targetdir "../bin"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>..\bin\</OutDir>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>..\bin\</OutDir>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -145,10 +145,10 @@
|
||||
objdir "../tmp"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>..\tmp\Debug\</IntDir>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>..\tmp\Debug\</IntDir>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -160,11 +160,11 @@
|
||||
targetname "MyTarget"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyTarget</TargetName>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyTarget</TargetName>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -177,9 +177,9 @@
|
||||
flags "NoImportLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IgnoreImportLibrary>true</IgnoreImportLibrary>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IgnoreImportLibrary>true</IgnoreImportLibrary>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -188,9 +188,9 @@
|
||||
flags "NoImportLib"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -203,13 +203,13 @@
|
||||
flags "NoManifest"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -222,14 +222,14 @@
|
||||
targetextension ""
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>
|
||||
</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>
|
||||
</TargetExt>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -243,14 +243,14 @@
|
||||
cleanextensions { ".temp1", ".temp2" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<ExtensionsToDeleteOnClean>*.temp1;*.temp2;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<ExtensionsToDeleteOnClean>*.temp1;*.temp2;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -263,14 +263,14 @@
|
||||
sysincludedirs { "$(DXSDK_DIR)/Include" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<IncludePath>$(DXSDK_DIR)\Include;$(IncludePath)</IncludePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<IncludePath>$(DXSDK_DIR)\Include;$(IncludePath)</IncludePath>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -278,13 +278,13 @@
|
||||
syslibdirs { "$(DXSDK_DIR)/lib/x86" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LibraryPath>$(DXSDK_DIR)\lib\x86;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>MyProject</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LibraryPath>$(DXSDK_DIR)\lib\x86;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
@ -32,16 +32,16 @@
|
||||
function suite.win32Listed_onNoPlatforms()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
]]
|
||||
end
|
||||
|
||||
@ -60,24 +60,24 @@
|
||||
architecture "x86_64"
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug 32b|Win32">
|
||||
<Configuration>Debug 32b</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 32b|x64">
|
||||
<Configuration>Debug 32b</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 64b|Win32">
|
||||
<Configuration>Debug 64b</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 64b|x64">
|
||||
<Configuration>Debug 64b</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release 32b|Win32">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug 32b|Win32">
|
||||
<Configuration>Debug 32b</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 32b|x64">
|
||||
<Configuration>Debug 32b</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 64b|Win32">
|
||||
<Configuration>Debug 64b</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug 64b|x64">
|
||||
<Configuration>Debug 64b</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release 32b|Win32">
|
||||
]]
|
||||
end
|
||||
|
||||
@ -91,15 +91,15 @@
|
||||
platforms { "x86", "x86_64" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
]]
|
||||
end
|
||||
|
@ -32,8 +32,8 @@
|
||||
function suite.structureIsCorrect_onDefaultValues()
|
||||
prepare()
|
||||
test.capture [[
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
]]
|
||||
end
|
||||
|
Reference in New Issue
Block a user