Enable nested vsprops

Author: theComputeKid

modules/vstudio/tests/cs2005/test_additional_props.lua

@@ -47,6 +47,26 @@
 	end
 
 
+--
+-- Check handling of nested AdditionalProps.
+-- Elements are nested properly.
+--
+
+	function suite.propsAreNested()
+		vsprops {
+			RandomKey = {
+				RandomNestedKey = "NestedValue"
+			}
+		}
+		prepare()
+		test.capture [[
+		<RandomKey>
+			<RandomNestedKey>NestedValue</RandomNestedKey>
+		</RandomKey>
+		]]
+	end
+
+
 --
 -- Check handling of AdditionialProps.
 -- Element groups set multiple times are placed in the order in which they are set.
@@ -80,5 +100,3 @@
 		<ValueRequiringEscape>if (age &gt; 3 &amp;&amp; age &lt; 8)</ValueRequiringEscape>
 		]]
 	end
-
-

modules/vstudio/tests/vc2010/test_globals.lua

@@ -540,6 +540,44 @@ end
 	end
 
 
+	function suite.additionalPropsNested()
+		p.action.set("vs2022")
+		filter "Debug"
+			vsprops {
+				Key3 = {
+					NestedKey = "NestedValue"
+				}
+			}
+		filter "Release"
+			vsprops {
+				Key1 = "Value1",
+				Key2 = {
+					NestedKey = "NestedValue"
+				}
+			}
+		filter {}
+		prepare()
+		test.capture [[
+<PropertyGroup Label="Globals">
+	<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
+	<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
+	<Keyword>Win32Proj</Keyword>
+	<RootNamespace>MyProject</RootNamespace>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
+	<Key3>
+		<NestedKey>NestedValue</NestedKey>
+	</Key3>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
+	<Key1>Value1</Key1>
+	<Key2>
+		<NestedKey>NestedValue</NestedKey>
+	</Key2>
+</PropertyGroup>
+		]]
+	end
+
 	function suite.disableFastUpToDateCheck()
 		fastuptodate "Off"
 		prepare()

modules/vstudio/vs2005_dotnetbase.lua

@@ -247,13 +247,23 @@
 --
 
 	function dotnetbase.additionalProps(cfg)
-		for i = 1, #cfg.vsprops do
-			for key, value in spairs(cfg.vsprops[i]) do
-				_p(2, '<%s>%s</%s>', key, vs2005.esc(value), key)
+		local function recurseTableIfNeeded(tbl, i)
+			for key, value in spairs(tbl) do
+				if (type(value) == "table") then
+					_p(i, '<%s>', key)
+					recurseTableIfNeeded(value, i + 1)
+					_p(i, '</%s>', key)
+				else
+					_p(i, '<%s>%s</%s>', key, vs2005.esc(value), key)
+				end
 			end
 		end
+		for i = 1, #cfg.vsprops do
+			recurseTableIfNeeded(cfg.vsprops[i], 2)
+		end
 	end
 
+
 --
 -- Write the compiler flags for a particular configuration.
 --

modules/vstudio/vs2010_vcxproj.lua

@@ -2201,7 +2201,7 @@
 			if #includes > 0 then
 				m.element("ForcedIncludeFiles", condition, table.concat(includes, ';'))
 			end
-		end		
+		end
 	end
 
 	function m.forceUsings(cfg, condition)
@@ -2793,7 +2793,7 @@
 		if llvmdir and _ACTION >= "vs2019" then
 			m.element("LLVMInstallDir", nil, vstudio.path(cfg, llvmdir))
 		end
-		
+
 		if llvmversion and _ACTION >= "vs2019" then
 			m.element("LLVMToolsVersion", nil, llvmversion)
 		end
@@ -3128,11 +3128,20 @@
 
 
 	function m.additionalProps(prj, cfg)
-		for i = 1, #cfg.vsprops do
-			for key, value in spairs(cfg.vsprops[i]) do
-				m.element(key, nil, vs2010.esc(value))
+		local function recurseTableIfNeeded(tbl)
+			for key, value in spairs(tbl) do
+				if (type(value) == "table") then
+					p.push("<" .. key .. ">")
+						recurseTableIfNeeded(value)
+					p.pop("</" .. key .. ">")
+				else
+					m.element(key, nil, vs2010.esc(value))
+				end
 			end
 		end
+		for i = 1, #cfg.vsprops do
+			recurseTableIfNeeded(cfg.vsprops[i])
+		end
 	end
 
 
@@ -3481,7 +3490,7 @@
 
 	function m.linuxDebugInformationFormat(cfg)
 		if cfg.symbols then
-	
+
 			if cfg.symbols == p.OFF then
 				m.element("DebugInformationFormat", nil, "None")
 			elseif cfg.symbols == "Full" then
@@ -3524,7 +3533,7 @@
 			["gnu++17"] = "gnu++17",
 			["gnu++20"] = "gnu++20",
 		}
-		
+
 		if cpp_langmap[cfg.cppdialect] ~= nil then
 			m.element("CppLanguageStandard", nil, cpp_langmap[cfg.cppdialect])
 		end
@@ -3587,7 +3596,7 @@
 			["wsl"] = "WSL_1_0",
 			["wsl2"] = "WSL2_1_0",
 		}
-		
+
 		local clang_map = {
 			["remote"] = "Remote_Clang_1_0",
 			["wsl"] = "WSL_Clang_1_0",

website/docs/vsprops.md

@@ -14,6 +14,17 @@ If you want to output groups of values in any order, set multiple times.
 	}
 ```
 
+Nested values are also supported.
+
+```lua
+	vsprops {
+		Name1 = "value1",
+		Name2 = {
+			Name3 = "value3"
+		}
+	}
+```
+
 ### Parameters ###
 
 Name and value are strings