Use new indentation-aware APIs in VC 200x exporter

src/actions/vstudio/vs2005_csproj.lua

@@ -180,7 +180,7 @@
 						_p(3,'<Link>%s</Link>', path.translate(link))
 					end
 					if #contents > 0 then
-						_p("%s", contents)
+						io.printf("%s", contents)
 					end
 					_p(2,'</%s>', info.action)
 				else

src/actions/vstudio/vs2010_vcxproj.lua

@@ -384,7 +384,7 @@
 		end)
 		if #contents > 0 then
 			_p(2,'<Lib>')
-			_p("%s", contents)
+			io.printf("%s", contents)
 			_p(2,'</Lib>')
 		end
 	end
@@ -529,7 +529,7 @@
 
 				if #contents > 0 then
 					_x(2,'<ClCompile Include=\"%s\">', path.translate(file.relpath))
-					_p("%s", contents)
+					io.printf("%s", contents)
 					_p(2,'</ClCompile>')
 				else
 					_x(2,'<ClCompile Include=\"%s\" />', path.translate(file.relpath))

src/base/io.lua

@@ -41,10 +41,10 @@
 
 	function io.captured()
 		if io._captured then
-			if not io._captured_string then
+			if not io._captured_string and #io._captured > 0 then
 				io._captured_string = table.concat(io._captured, io.eol)
 			end
-			return io._captured_string
+			return io._captured_string or ""
 		end
 	end
 

src/base/premake.lua

@@ -78,11 +78,21 @@
 ---
 -- Write a formatted string to the exported file, after decreasing the
 -- indentation level by one.
+--
+-- @param i
+--    If set to a number, the indentation level will be decreased by
+--    this amount. If nil, the indentation level is decremented and
+--    no output is written. Otherwise, pass to premake.w() as the
+--    formatting string, followed by any additional arguments.
 ---
 
-	function premake.pop(...)
+	function premake.pop(i, ...)
-		premake.indentation = premake.indentation - 1
+		if i == nil or type(i) == "number" then
-		premake.w(...)
+			premake.indentation = premake.indentation - (i or 1)
+		else
+			premake.indentation = premake.indentation - 1
+			premake.w(i, ...)
+		end
 	end
 
 
@@ -90,11 +100,21 @@
 ---
 -- Write a formatted string to the exported file, and increase the
 -- indentation level by one.
+--
+-- @param i
+--    If set to a number, the indentation level will be increased by
+--    this amount. If nil, the indentation level is incremented and
+--    no output is written. Otherwise, pass to premake.w() as the
+--    formatting string, followed by any additional arguments.
 ---
 
-	function premake.push(...)
+	function premake.push(i, ...)
-		premake.w(...)
+		if i == nil or type(i) == "number" then
-		premake.indentation = premake.indentation + 1
+			premake.indentation = premake.indentation + (i or 1)
+		else
+			premake.w(i, ...)
+			premake.indentation = premake.indentation + 1
+		end
 	end
 
 
@@ -264,3 +284,18 @@
 			_p('')
 		end
 	end
+
+
+
+---
+-- Write a formatted string to the exported file, after passing all
+-- arguments (except for the first, which is the formatting string)
+-- through premake.esc().
+---
+
+	function premake.x(msg, ...)
+		for i = 1, #arg do
+			arg[i] = premake.esc(arg[i])
+		end
+		premake.w(msg, unpack(arg))
+	end

tests/actions/vstudio/vc200x/test_assembly_refs.lua

@@ -44,12 +44,12 @@
 		links { "System.dll", "System.Data.dll" }
 		prepare()
 		test.capture [[
-		<AssemblyReference
+<AssemblyReference
-			RelativePath="System.dll"
+	RelativePath="System.dll"
-		/>
+/>
-		<AssemblyReference
+<AssemblyReference
-			RelativePath="System.Data.dll"
+	RelativePath="System.Data.dll"
-		/>
+/>
 		]]
 	end
 
@@ -62,9 +62,9 @@
 		links { "m", "System.dll" }
 		prepare()
 		test.capture [[
-		<AssemblyReference
+<AssemblyReference
-			RelativePath="System.dll"
+	RelativePath="System.dll"
-		/>
+/>
 		]]
 	end
 
@@ -77,8 +77,8 @@
 		links { "../nunit.framework.dll" }
 		prepare()
 		test.capture [[
-		<AssemblyReference
+<AssemblyReference
-			RelativePath="..\nunit.framework.dll"
+	RelativePath="..\nunit.framework.dll"
-		/>
+/>
 		]]
 	end

tests/actions/vstudio/vc200x/test_build_steps.lua

@@ -32,9 +32,9 @@
 	function suite.noCommandLine_onNoBuildSteps()
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCPreBuildEventTool"
+	Name="VCPreBuildEventTool"
-			/>
+/>
 		]]
 	end
 
@@ -47,10 +47,10 @@
 		prebuildcommands { "command_1", "command_2" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCPreBuildEventTool"
+	Name="VCPreBuildEventTool"
-				CommandLine="command_1&#x0D;&#x0A;command_2"
+	CommandLine="command_1&#x0D;&#x0A;command_2"
-			/>
+/>
 		]]
 	end
 
@@ -65,10 +65,10 @@
 		prebuildmessage "Pre-building..."
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCPreBuildEventTool"
+	Name="VCPreBuildEventTool"
-				Description="Pre-building..."
+	Description="Pre-building..."
-				CommandLine="command1"
+	CommandLine="command1"
-			/>
+/>
 		]]
 	end

tests/actions/vstudio/vc200x/test_compiler_block.lua

@@ -32,17 +32,17 @@
 	function suite.looksGood_onDefaultSettings()
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -56,10 +56,10 @@
 		includedirs { "include/lua", "include/zlib" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				AdditionalIncludeDirectories="include\lua;include\zlib"
+	AdditionalIncludeDirectories="include\lua;include\zlib"
 		]]
 	end
 
@@ -73,18 +73,18 @@
 		flags "Symbols"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				MinimalRebuild="true"
+	MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+	RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="4"
+	DebugInformationFormat="4"
-			/>
+/>
 		]]
 	end
 
@@ -99,17 +99,17 @@
 		optimize "On"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="3"
+	Optimization="3"
-				StringPooling="true"
+	StringPooling="true"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="3"
+	DebugInformationFormat="3"
-			/>
+/>
 		]]
 	end
 
@@ -123,17 +123,17 @@
 		debugformat "C7"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+	RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="1"
+	DebugInformationFormat="1"
-			/>
+/>
 		]]
 	end
 
@@ -151,18 +151,18 @@
 		pchsource "source/common.cpp"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+	UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="include/common.h"
+	PrecompiledHeaderThrough="include/common.h"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -175,18 +175,18 @@
 		floatingpoint "Fast"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
+	FloatingPointModel="2"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -194,18 +194,18 @@
 		floatingpoint "Strict"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				FloatingPointModel="1"
+	FloatingPointModel="1"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -218,17 +218,17 @@
 		targetname "foob"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\foob.pdb"
+	ProgramDataBaseFileName="$(OutDir)\foob.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -241,17 +241,17 @@
 		flags { "Symbols", "NoMinimalRebuild" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+	RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="4"
+	DebugInformationFormat="4"
-			/>
+/>
 		]]
 	end
 
@@ -263,18 +263,18 @@
 		flags { "NoBufferSecurityCheck" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				BufferSecurityCheck="false"
+	BufferSecurityCheck="false"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -286,18 +286,18 @@
 		language "C"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				CompileAs="1"
+	CompileAs="1"
-			/>
+/>
 		]]
 	end
 
@@ -310,18 +310,18 @@
 		flags { "Symbols" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				MinimalRebuild="true"
+	MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+	RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="4"
+	DebugInformationFormat="4"
-			/>
+/>
 		]]
 	end
 
@@ -334,17 +334,17 @@
 		warnings "Extra"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="4"
+	WarningLevel="4"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -357,18 +357,18 @@
 		flags { "FatalWarnings" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				WarnAsError="true"
+	WarnAsError="true"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -382,17 +382,17 @@
 		warnings "Off"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="0"
+	WarningLevel="0"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -405,18 +405,18 @@
 		_ACTION = "vs2005"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+	Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -430,17 +430,17 @@
 		warnings "Off"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="0"
+	WarningLevel="0"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -453,17 +453,17 @@
 		system "Xbox360"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLX360CompilerTool"
+	Name="VCCLX360CompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-			/>
+/>
 		]]
 	end
 
@@ -476,17 +476,17 @@
 		forceincludes { "stdafx.h", "include/sys.h" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				ForcedIncludeFiles="stdafx.h;include\sys.h"
+	ForcedIncludeFiles="stdafx.h;include\sys.h"
 		]]
 	end
 
@@ -494,17 +494,17 @@
 		forceusings { "stdafx.h", "include/sys.h" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				ForcedUsingFiles="stdafx.h;include\sys.h"
+	ForcedUsingFiles="stdafx.h;include\sys.h"
 		]]
 	end
 
@@ -517,10 +517,10 @@
 		flags { "NoRuntimeChecks" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
 		]]
 	end
 
@@ -534,11 +534,11 @@
 		flags { "MultiProcessorCompile" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+	AdditionalOptions="/MP"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
 		]]
 	end
 
@@ -553,12 +553,12 @@
 		flags { "Symbols", "ReleaseRuntime" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				MinimalRebuild="true"
+	MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
 		]]
 	end
 
@@ -566,12 +566,12 @@
 		flags { "Symbols", "ReleaseRuntime", "StaticRuntime" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				MinimalRebuild="true"
+	MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+	RuntimeLibrary="0"
 		]]
 	end
 
@@ -583,10 +583,10 @@
 		flags { "LinkTimeOptimization" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				WholeProgramOptimization="true"
+	WholeProgramOptimization="true"
 		]]
 
 	end
@@ -600,10 +600,10 @@
 		optimize "On"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="3"
+	Optimization="3"
-				StringPooling="true"
+	StringPooling="true"
 		]]
 	end
 
@@ -611,10 +611,10 @@
 		optimize "Size"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="1"
+	Optimization="1"
-				StringPooling="true"
+	StringPooling="true"
 		]]
 	end
 
@@ -622,10 +622,10 @@
 		optimize "Speed"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="2"
+	Optimization="2"
-				StringPooling="true"
+	StringPooling="true"
 		]]
 	end
 
@@ -633,10 +633,10 @@
 		optimize "Full"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="3"
+	Optimization="3"
-				StringPooling="true"
+	StringPooling="true"
 		]]
 	end
 
@@ -644,10 +644,10 @@
 		optimize "Off"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
 		]]
 	end
 
@@ -655,10 +655,10 @@
 		optimize "Debug"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
 		]]
 	end
 
@@ -671,16 +671,16 @@
 		flags { "OmitDefaultLibrary" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				Optimization="0"
+	Optimization="0"
-				BasicRuntimeChecks="3"
+	BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+	RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+	EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				WarningLevel="3"
+	WarningLevel="3"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				OmitDefaultLibName="true"
+	OmitDefaultLibName="true"
 		]]
 	end

tests/actions/vstudio/vc200x/test_configuration.lua

@@ -34,13 +34,13 @@
 	function suite.defaultSettings()
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|Win32"
+	Name="Debug|Win32"
-			OutputDirectory="."
+	OutputDirectory="."
-			IntermediateDirectory="obj\Debug"
+	IntermediateDirectory="obj\Debug"
-			ConfigurationType="1"
+	ConfigurationType="1"
-			CharacterSet="2"
+	CharacterSet="2"
-			>
+	>
 		]]
 	end
 
@@ -54,8 +54,8 @@
 		platforms { "x32" }
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|Win32"
+	Name="Debug|Win32"
 		]]
 	end
 
@@ -68,8 +68,8 @@
 		platforms { "x64" }
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|x64"
+	Name="Debug|x64"
 		]]
 	end
 
@@ -82,9 +82,9 @@
 		targetdir("../bin")
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|Win32"
+	Name="Debug|Win32"
-			OutputDirectory="..\bin"
+	OutputDirectory="..\bin"
 		]]
 	end
 
@@ -98,12 +98,12 @@
 		kind "Makefile"
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|Win32"
+	Name="Debug|Win32"
-			OutputDirectory="."
+	OutputDirectory="."
-			IntermediateDirectory="obj\Debug"
+	IntermediateDirectory="obj\Debug"
-			ConfigurationType="0"
+	ConfigurationType="0"
-			>
+	>
 		]]
 	end
 
@@ -111,11 +111,11 @@
 		kind "None"
 		prepare()
 		test.capture [[
-		<Configuration
+<Configuration
-			Name="Debug|Win32"
+	Name="Debug|Win32"
-			OutputDirectory="."
+	OutputDirectory="."
-			IntermediateDirectory="obj\Debug"
+	IntermediateDirectory="obj\Debug"
-			ConfigurationType="0"
+	ConfigurationType="0"
-			>
+	>
 		]]
 	end

tests/actions/vstudio/vc200x/test_excluded_configs.lua

@@ -49,9 +49,9 @@
 	function suite.normalLink_onIncludedConfig()
 		prepare("Zeus")
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
 		]]
 	end
 
@@ -60,10 +60,10 @@
 		system "PS3"
 		prepare("Zeus")
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				OutputFile="$(OutDir)\MyProject.elf"
+	OutputFile="$(OutDir)\MyProject.elf"
 		]]
 	end
 
@@ -77,10 +77,10 @@
 	function suite.explicitLink_onExcludedConfig()
 		prepare("Ares")
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
+	LinkLibraryDependencies="false"
-				AdditionalDependencies="MyProject2.lib"
+	AdditionalDependencies="MyProject2.lib"
 		]]
 	end
 
@@ -89,9 +89,9 @@
 		system "PS3"
 		prepare("Ares")
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				AdditionalDependencies="libMyProject2.a"
+	AdditionalDependencies="libMyProject2.a"
 		]]
 	end

tests/actions/vstudio/vc200x/test_external_compiler.lua

@@ -33,14 +33,14 @@
 	function suite.checkDefaults()
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
+	AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				CompileAs="0"
+	CompileAs="0"
-			/>
+/>
 		]]
 	end
 
@@ -53,11 +53,11 @@
 		includedirs { "../include", "include" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
+	AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
-				AdditionalIncludeDirectories="..\include;include"
+	AdditionalIncludeDirectories="..\include;include"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
 		]]
 	end
 
@@ -70,13 +70,13 @@
 		forceincludes { "stdafx.h", "include/sys.h" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCCLCompilerTool"
+	Name="VCCLCompilerTool"
-				AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
+	AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
-				UsePrecompiledHeader="0"
+	UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
-				DebugInformationFormat="0"
+	DebugInformationFormat="0"
-				CompileAs="0"
+	CompileAs="0"
-				ForcedIncludeFiles="stdafx.h;include\sys.h"
+	ForcedIncludeFiles="stdafx.h;include\sys.h"
 		]]
 	end

tests/actions/vstudio/vc200x/test_external_linker.lua

@@ -36,16 +36,16 @@
 		kind "ConsoleApp"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				OutputFile="$(OutDir)\MyProject.elf"
+	OutputFile="$(OutDir)\MyProject.elf"
-				LinkIncremental="0"
+	LinkIncremental="0"
-				GenerateManifest="false"
+	GenerateManifest="false"
-				ProgramDatabaseFile=""
+	ProgramDatabaseFile=""
-				RandomizedBaseAddress="1"
+	RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+	DataExecutionPrevention="0"
-			/>
+/>
 		]]
 	end
 
@@ -58,11 +58,11 @@
 		kind "StaticLib"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLibrarianTool"
+	Name="VCLibrarianTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				OutputFile="$(OutDir)\libMyProject.a"
+	OutputFile="$(OutDir)\libMyProject.a"
-			/>
+/>
 		]]
 	end
 
@@ -75,10 +75,10 @@
 		links { "fs_stub", "net_stub" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				AdditionalDependencies="-lfs_stub -lnet_stub"
+	AdditionalDependencies="-lfs_stub -lnet_stub"
 		]]
 	end
 
@@ -96,10 +96,10 @@
 		language "C++"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				OutputFile="$(OutDir)\MyProject.elf"
+	OutputFile="$(OutDir)\MyProject.elf"
 		]]
 	end
 
@@ -119,9 +119,9 @@
 		language "C++"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalOptions="-s"
+	AdditionalOptions="-s"
-				AdditionalDependencies="libMyProject2.a"
+	AdditionalDependencies="libMyProject2.a"
 		]]
 	end

tests/actions/vstudio/vc200x/test_files.lua

@@ -33,11 +33,11 @@
 		files { "hello.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
-			>
+		>
-		</File>
+	</File>
 		]]
 	end
 
@@ -50,19 +50,19 @@
 		files { "src/hello.cpp", "so_long.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<Filter
+	<Filter
-			Name="src"
+		Name="src"
-			>
+		>
-			<File
-				RelativePath="src\hello.cpp"
-				>
-			</File>
-		</Filter>
 		<File
-			RelativePath="so_long.cpp"
+			RelativePath="src\hello.cpp"
 			>
 		</File>
+	</Filter>
+	<File
+		RelativePath="so_long.cpp"
+		>
+	</File>
 		]]
 	end
 
@@ -75,23 +75,23 @@
 		files { "src/greetings/hello.cpp", "so_long.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
+	<Filter
+		Name="src"
+		>
 		<Filter
-			Name="src"
+			Name="greetings"
 			>
-			<Filter
+			<File
-				Name="greetings"
+				RelativePath="src\greetings\hello.cpp"
 				>
-				<File
+			</File>
-					RelativePath="src\greetings\hello.cpp"
-					>
-				</File>
-			</Filter>
 		</Filter>
-		<File
+	</Filter>
-			RelativePath="so_long.cpp"
+	<File
-			>
+		RelativePath="so_long.cpp"
-		</File>
+		>
+	</File>
 		]]
 	end
 
@@ -105,15 +105,15 @@
 		vpaths { ["Source Files"] = "**.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<Filter
+	<Filter
-			Name="Source Files"
+		Name="Source Files"
+		>
+		<File
+			RelativePath="src\hello.cpp"
 			>
-			<File
+		</File>
-				RelativePath="src\hello.cpp"
+	</Filter>
-				>
-			</File>
-		</Filter>
 		]]
 	end
 
@@ -128,11 +128,11 @@
 		files { "hello.lua" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.lua"
+		RelativePath="hello.lua"
-			>
+		>
-		</File>
+	</File>
 		]]
 	end
 
@@ -147,16 +147,16 @@
 		files { "hello.c" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.c"
+		RelativePath="hello.c"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				CompileAs="1"
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="1"
 		]]
 	end
 
@@ -166,16 +166,16 @@
 		files { "hello.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				CompileAs="2"
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
 		]]
 	end
 
@@ -189,16 +189,16 @@
 		pchsource "afxwin.cpp"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="afxwin.cpp"
+		RelativePath="afxwin.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				UsePrecompiledHeader="1"
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
 		]]
 	end
 
@@ -213,19 +213,19 @@
 		removefiles { "hello.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
+			ExcludedFromBuild="true"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				ExcludedFromBuild="true"
+			/>
-				>
+		</FileConfiguration>
-				<Tool
+	</File>
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-		</File>
 		]]
 	end
 
@@ -235,27 +235,27 @@
 		flags { "ExcludeFromBuild" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
+			ExcludedFromBuild="true"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				ExcludedFromBuild="true"
+			/>
-				>
+		</FileConfiguration>
-				<Tool
+		<FileConfiguration
-					Name="VCCLCompilerTool"
+			Name="Release|Win32"
-				/>
+			ExcludedFromBuild="true"
-			</FileConfiguration>
+			>
-			<FileConfiguration
+			<Tool
-				Name="Release|Win32"
+				Name="VCCLCompilerTool"
-				ExcludedFromBuild="true"
+			/>
-				>
+		</FileConfiguration>
-				<Tool
+	</File>
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-		</File>
 		]]
 	end
 
@@ -275,19 +275,19 @@
 			buildoutputs { "$(IntDir)/$(InputName).obj" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.x"
+		RelativePath="hello.x"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCustomBuildTool"
-				>
+				CommandLine="cxc -c &quot;$(InputFile)&quot; -o &quot;$(IntDir)/$(InputName).xo&quot;&#x0D;&#x0A;c2o -c &quot;$(IntDir)/$(InputName).xo&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
-				<Tool
+				Outputs="$(IntDir)/$(InputName).obj"
-					Name="VCCustomBuildTool"
+			/>
-					CommandLine="cxc -c &quot;$(InputFile)&quot; -o &quot;$(IntDir)/$(InputName).xo&quot;&#x0D;&#x0A;c2o -c &quot;$(IntDir)/$(InputName).xo&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
+		</FileConfiguration>
-					Outputs="$(IntDir)/$(InputName).obj"
-				/>
-			</FileConfiguration>
 		]]
 	end
 
@@ -303,19 +303,19 @@
 			buildoutputs { "%{cfg.objdir}/%{file.basename}.obj" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.x"
+		RelativePath="hello.x"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCustomBuildTool"
-				>
+				CommandLine="cxc -c hello.x -o ../tmp/Debug/hello.xo&#x0D;&#x0A;c2o -c ../tmp/Debug/hello.xo -o ../tmp/Debug/hello.obj"
-				<Tool
+				Outputs="../tmp/Debug/hello.obj"
-					Name="VCCustomBuildTool"
+			/>
-					CommandLine="cxc -c hello.x -o ../tmp/Debug/hello.xo&#x0D;&#x0A;c2o -c ../tmp/Debug/hello.xo -o ../tmp/Debug/hello.obj"
+		</FileConfiguration>
-					Outputs="../tmp/Debug/hello.obj"
-				/>
-			</FileConfiguration>
 		]]
 	end
 
@@ -329,35 +329,35 @@
 		files { "hello.cpp", "greetings/hello.cpp" }
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<Filter
+	<Filter
-			Name="greetings"
+		Name="greetings"
-			>
+		>
-			<File
-				RelativePath="greetings\hello.cpp"
-				>
-			</File>
-		</Filter>
 		<File
-			RelativePath="hello.cpp"
+			RelativePath="greetings\hello.cpp"
 			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\hello1.obj"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\hello1.obj"
-				/>
-			</FileConfiguration>
 		</File>
+	</Filter>
+	<File
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
+			>
+			<Tool
+				Name="VCCLCompilerTool"
+				ObjectFile="$(IntDir)\hello1.obj"
+			/>
+		</FileConfiguration>
+		<FileConfiguration
+			Name="Release|Win32"
+			>
+			<Tool
+				Name="VCCLCompilerTool"
+				ObjectFile="$(IntDir)\hello1.obj"
+			/>
+		</FileConfiguration>
+	</File>
 		]]
 	end
 
@@ -373,16 +373,16 @@
 
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				ForcedIncludeFiles="..\include\force1.h;..\include\force2.h"
-				<Tool
-					Name="VCCLCompilerTool"
-					ForcedIncludeFiles="..\include\force1.h;..\include\force2.h"
 		]]
 	end
 
@@ -398,16 +398,16 @@
 
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				AdditionalOptions="/Xc"
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalOptions="/Xc"
 		]]
 	end
 
@@ -422,16 +422,16 @@
 			optimize "On"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="3"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="3"
 		]]
 	end
 
@@ -442,16 +442,16 @@
 			optimize "Size"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="1"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="1"
 		]]
 	end
 
@@ -461,16 +461,16 @@
 			optimize "Speed"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="2"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
 		]]
 	end
 
@@ -480,16 +480,16 @@
 			optimize "Full"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="3"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="3"
 		]]
 	end
 
@@ -499,16 +499,16 @@
 			optimize "Off"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="0"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
 		]]
 	end
 
@@ -518,15 +518,15 @@
 			optimize "Debug"
 		prepare()
 		test.capture [[
-	<Files>
+<Files>
-		<File
+	<File
-			RelativePath="hello.cpp"
+		RelativePath="hello.cpp"
+		>
+		<FileConfiguration
+			Name="Debug|Win32"
 			>
-			<FileConfiguration
+			<Tool
-				Name="Debug|Win32"
+				Name="VCCLCompilerTool"
-				>
+				Optimization="0"
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
 		]]
 	end

tests/actions/vstudio/vc200x/test_linker_block.lua

@@ -34,15 +34,15 @@
 		kind "ConsoleApp"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				GenerateDebugInformation="false"
+	GenerateDebugInformation="false"
-				SubSystem="1"
+	SubSystem="1"
-				EntryPointSymbol="mainCRTStartup"
+	EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
+	TargetMachine="1"
-			/>
+/>
 		]]
 	end
 
@@ -55,15 +55,15 @@
 		kind "WindowedApp"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				GenerateDebugInformation="false"
+	GenerateDebugInformation="false"
-				SubSystem="2"
+	SubSystem="2"
-				EntryPointSymbol="mainCRTStartup"
+	EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
+	TargetMachine="1"
-			/>
+/>
 		]]
 	end
 
@@ -76,15 +76,15 @@
 		kind "SharedLib"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.dll"
+	OutputFile="$(OutDir)\MyProject.dll"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				GenerateDebugInformation="false"
+	GenerateDebugInformation="false"
-				SubSystem="2"
+	SubSystem="2"
-				ImportLibrary="MyProject.lib"
+	ImportLibrary="MyProject.lib"
-				TargetMachine="1"
+	TargetMachine="1"
-			/>
+/>
 		]]
 	end
 
@@ -97,10 +97,10 @@
 		kind "StaticLib"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLibrarianTool"
+	Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\MyProject.lib"
+	OutputFile="$(OutDir)\MyProject.lib"
-			/>
+/>
 		]]
 	end
 
@@ -113,12 +113,12 @@
 		flags "Symbols"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				GenerateDebugInformation="true"
+	GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
+	ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
 		]]
 	end
 
@@ -132,15 +132,15 @@
 		debugformat "C7"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				GenerateDebugInformation="true"
+	GenerateDebugInformation="true"
-				SubSystem="1"
+	SubSystem="1"
-				EntryPointSymbol="mainCRTStartup"
+	EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
+	TargetMachine="1"
-			/>
+/>
 		]]
 	end
 
@@ -153,11 +153,11 @@
 		files { "MyProject.def" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="2"
+	LinkIncremental="2"
-				ModuleDefinitionFile="MyProject.def"
+	ModuleDefinitionFile="MyProject.def"
 		]]
 	end
 
@@ -170,10 +170,10 @@
 		flags { "NoIncrementalLink" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
-				LinkIncremental="1"
+	LinkIncremental="1"
 		]]
 	end
 
@@ -187,11 +187,11 @@
 		linkoptions { "/ltcg", "/lZ" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLibrarianTool"
+	Name="VCLibrarianTool"
-				AdditionalOptions="/ltcg /lZ"
+	AdditionalOptions="/ltcg /lZ"
-				OutputFile="$(OutDir)\MyProject.lib"
+	OutputFile="$(OutDir)\MyProject.lib"
-			/>
+/>
 		]]
 	end
 
@@ -204,9 +204,9 @@
 		links { "GL", "GLU" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalDependencies="GL.lib GLU.lib"
+	AdditionalDependencies="GL.lib GLU.lib"
 		]]
 	end
 
@@ -223,9 +223,9 @@
 		language "C++"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				OutputFile="$(OutDir)\MyProject.exe"
+	OutputFile="$(OutDir)\MyProject.exe"
 		]]
 	end
 
@@ -243,10 +243,10 @@
 		language "C++"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
+	LinkLibraryDependencies="false"
-				AdditionalDependencies="MyProject2.lib"
+	AdditionalDependencies="MyProject2.lib"
 		]]
 	end
 
@@ -259,9 +259,9 @@
 		links { "My Lib" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalDependencies="&quot;My Lib.lib&quot;"
+	AdditionalDependencies="&quot;My Lib.lib&quot;"
 		]]
 	end
 
@@ -274,8 +274,8 @@
 		links { "kernel32", "System.dll", "System.Data.dll" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCLinkerTool"
+	Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib"
+	AdditionalDependencies="kernel32.lib"
 		]]
 	end

tests/actions/vstudio/vc200x/test_manifest_block.lua

@@ -33,9 +33,9 @@
 		files { "hello.c" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCManifestTool"
+	Name="VCManifestTool"
-			/>
+/>
 		]]
 	end
 
@@ -48,9 +48,9 @@
 		files { "hello.c", "project1.manifest", "goodbye.c", "project2.manifest" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCManifestTool"
+	Name="VCManifestTool"
-				AdditionalManifestFiles="project1.manifest;project2.manifest"
+	AdditionalManifestFiles="project1.manifest;project2.manifest"
-			/>
+/>
 		]]
 	end

tests/actions/vstudio/vc200x/test_nmake_settings.lua

@@ -33,19 +33,19 @@
 	function suite.onDefaultSettings()
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine=""
+	BuildCommandLine=""
-				ReBuildCommandLine=""
+	ReBuildCommandLine=""
-				CleanCommandLine=""
+	CleanCommandLine=""
-				Output="$(OutDir)MyProject"
+	Output="$(OutDir)MyProject"
-				PreprocessorDefinitions=""
+	PreprocessorDefinitions=""
-				IncludeSearchPath=""
+	IncludeSearchPath=""
-				ForcedIncludes=""
+	ForcedIncludes=""
-				AssemblySearchPath=""
+	AssemblySearchPath=""
-				ForcedUsingAssemblies=""
+	ForcedUsingAssemblies=""
-				CompileAsManaged=""
+	CompileAsManaged=""
-			/>
+/>
 		]]
 	end
 
@@ -58,12 +58,12 @@
 		targetextension ".exe"
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine=""
+	BuildCommandLine=""
-				ReBuildCommandLine=""
+	ReBuildCommandLine=""
-				CleanCommandLine=""
+	CleanCommandLine=""
-				Output="$(OutDir)MyProject.exe"
+	Output="$(OutDir)MyProject.exe"
 		]]
 	end
 
@@ -76,11 +76,11 @@
 		buildcommands { "command 1" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine="command 1"
+	BuildCommandLine="command 1"
-				ReBuildCommandLine=""
+	ReBuildCommandLine=""
-				CleanCommandLine=""
+	CleanCommandLine=""
 		]]
 	end
 
@@ -88,11 +88,11 @@
 		buildcommands { "command 1", "command 2" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine="command 1&#x0D;&#x0A;command 2"
+	BuildCommandLine="command 1&#x0D;&#x0A;command 2"
-				ReBuildCommandLine=""
+	ReBuildCommandLine=""
-				CleanCommandLine=""
+	CleanCommandLine=""
 		]]
 	end
 
@@ -100,11 +100,11 @@
 		rebuildcommands { "command 1" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine=""
+	BuildCommandLine=""
-				ReBuildCommandLine="command 1"
+	ReBuildCommandLine="command 1"
-				CleanCommandLine=""
+	CleanCommandLine=""
 		]]
 	end
 
@@ -112,10 +112,10 @@
 		cleancommands { "command 1" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCNMakeTool"
+	Name="VCNMakeTool"
-				BuildCommandLine=""
+	BuildCommandLine=""
-				ReBuildCommandLine=""
+	ReBuildCommandLine=""
-				CleanCommandLine="command 1"
+	CleanCommandLine="command 1"
 		]]
 	end

tests/actions/vstudio/vc200x/test_platforms.lua

@@ -10,16 +10,16 @@
 
 
 --
--- Setup 
+-- Setup
 --
 
 	local sln, prj
-	
+
 	function suite.setup()
 		_ACTION = "vs2008"
 		sln = test.createsolution()
 	end
-	
+
 	local function prepare()
 		prj = premake.solution.getproject(sln, 1)
 		vc200x.platforms(prj)
@@ -33,11 +33,11 @@
 	function suite.win32Listed_onNoPlatforms()
 		prepare()
 		test.capture [[
-	<Platforms>
+<Platforms>
-		<Platform
+	<Platform
-			Name="Win32"
+		Name="Win32"
-		/>
+	/>
-	</Platforms>
+</Platforms>
 		]]
 	end
 
@@ -51,11 +51,11 @@
 		platforms { "Static", "Dynamic" }
 		prepare()
 		test.capture [[
-	<Platforms>
+<Platforms>
-		<Platform
+	<Platform
-			Name="Win32"
+		Name="Win32"
-		/>
+	/>
-	</Platforms>
+</Platforms>
 		]]
 	end
 
@@ -68,14 +68,14 @@
 		platforms { "x32", "x64" }
 		prepare()
 		test.capture [[
-	<Platforms>
+<Platforms>
-		<Platform
+	<Platform
-			Name="Win32"
+		Name="Win32"
-		/>
+	/>
-		<Platform
+	<Platform
-			Name="x64"
+		Name="x64"
-		/>
+	/>
-	</Platforms>
+</Platforms>
 		]]
 	end
 
@@ -88,12 +88,12 @@
 		platforms { "PS3" }
 		prepare()
 		test.capture [[
-	<Platforms>
+<Platforms>
-		<Platform
+	<Platform
-			Name="Win32"
+		Name="Win32"
-		/>
+	/>
-	</Platforms>
+</Platforms>
-		]]		
+		]]
 	end
 
 
@@ -105,10 +105,10 @@
 		platforms { "Xbox360" }
 		prepare()
 		test.capture [[
-	<Platforms>
+<Platforms>
-		<Platform
+	<Platform
-			Name="Xbox 360"
+		Name="Xbox 360"
-		/>
+	/>
-	</Platforms>
+</Platforms>
-		]]		
+		]]
 	end

tests/actions/vstudio/vc200x/test_project_refs.lua

@@ -48,10 +48,10 @@
 		links { "MyProject" }
 		prepare()
 		test.capture [[
-		<ProjectReference
+<ProjectReference
-			ReferencedProjectIdentifier="{00112233-4455-6677-8888-99AABBCCDDEE}"
+	ReferencedProjectIdentifier="{00112233-4455-6677-8888-99AABBCCDDEE}"
-			RelativePathToProject=".\MyProject.vcproj"
+	RelativePathToProject=".\MyProject.vcproj"
-		/>
+/>
 		]]
 	end
 
@@ -69,10 +69,10 @@
 		location "build/MyProject"
 		prepare()
 		test.capture [[
-		<ProjectReference
+<ProjectReference
-			ReferencedProjectIdentifier="{00112233-4455-6677-8888-99AABBCCDDEE}"
+	ReferencedProjectIdentifier="{00112233-4455-6677-8888-99AABBCCDDEE}"
-			RelativePathToProject=".\build\MyProject\MyProject.vcproj"
+	RelativePathToProject=".\build\MyProject\MyProject.vcproj"
-		/>
+/>
 		]]
 	end
 

tests/actions/vstudio/vc200x/test_resource_compiler.lua

@@ -32,9 +32,9 @@
 	function suite.looksGood_onDefaultSettings()
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCResourceCompilerTool"
+	Name="VCResourceCompilerTool"
-			/>
+/>
 		]]
 	end
 
@@ -48,9 +48,9 @@
 		resincludedirs { "../res/include" }
 		prepare()
 		test.capture [[
-			<Tool
+<Tool
-				Name="VCResourceCompilerTool"
+	Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\res\include"
+	AdditionalIncludeDirectories="..\include;..\res\include"
-			/>
+/>
 		]]
 	end

tests/actions/vstudio/vc2010/test_link.lua

@@ -424,4 +424,4 @@
 			<TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>
 		</Lib>
 		]]
-	end
+	end