Add buildoptions, linkoptions support

Author: nickclark2016

modules/ninja/_preload.lua

@@ -33,7 +33,7 @@ newaction {
 		elseif target == p.EMSCRIPTEN then
 			return "emcc"
 		elseif target == p.WINDOWS then
-			return "v143"
+			return "msc"
 		else
 			return "gcc"
 		end

modules/ninja/ninja.lua

@@ -12,19 +12,14 @@ p.modules.ninja._VERSION = p._VERSION
 
 local ninja = p.modules.ninja
 
---
--- Escape a string so it can be written to a Ninja build file.
--- Ninja variables are expanded into shell commands, so we need to escape
--- shell special characters as well as Ninja special characters.
---
 function ninja.esc(value)
     value = value:gsub("%$", "$$")
     value = value:gsub(":", "$:")
     value = value:gsub("\n", "$\n")
-    value = value:gsub(" ", "$ ")
     value = value:gsub('%(', '\\(')
     value = value:gsub('%)', '\\)')
     value = value:gsub('"', '\\"')
+    value = value:gsub(" ", "\\ ")
 
     return value
 end

modules/ninja/ninja_cpp.lua

@@ -34,9 +34,7 @@ function m.generate(prj)
 	_p("") -- Empty line at end of file
 end
 
--- Generate all ninja rules (compile, link, etc.)
 function m.rules(prj)
-	-- Generate rules for each configuration to handle different toolsets
 	local rulesDone = {}
 
 	for cfg in project.eachconfig(prj) do
@@ -298,12 +296,18 @@ function m.getCFlags(cfg, toolset)
 
 	local defines = toolset.getdefines(cfg.defines)
 	flags = table.join(flags, defines)
+
+	local undefines = toolset.getundefines(cfg.undefines)
+	flags = table.join(flags, undefines)
 
 	local includedirs = toolset.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs)
 	flags = table.join(flags, includedirs)
 
 	local forceincludes = toolset.getforceincludes(cfg)
 	flags = table.join(flags, forceincludes)
+
+	local buildopts = cfg.buildoptions or {}
+	flags = table.join(flags, buildopts)
 
 	return flags
 end
@@ -317,12 +321,18 @@ function m.getCxxFlags(cfg, toolset)
 
 	local defines = toolset.getdefines(cfg.defines)
 	flags = table.join(flags, defines)
+
+	local undefines = toolset.getundefines(cfg.undefines)
+	flags = table.join(flags, undefines)
 
 	local includedirs = toolset.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs)
 	flags = table.join(flags, includedirs)
 
 	local forceincludes = toolset.getforceincludes(cfg)
 	flags = table.join(flags, forceincludes)
+
+	local buildopts = cfg.buildoptions or {}
+	flags = table.join(flags, buildopts)
 
 	return flags
 end
@@ -333,6 +343,9 @@ function m.getLdFlags(cfg, toolset)
 
 	local toolFlags = toolset.getldflags(cfg)
 	flags = table.join(flags, toolFlags)
+
+	local linkopts = cfg.linkoptions or {}
+	flags = table.join(flags, linkopts)
 
 	local libdirs = toolset.getLibraryDirectories(cfg)
 	flags = table.join(flags, libdirs)
@@ -471,7 +484,19 @@ function m.objectFile(cfg, node, filecfg)
 	local objdir = path.getrelative(cfg.workspace.location, cfg.objdir)
 	local ext = path.getextension(node.abspath):lower()
 
-	if path.iscppfile(node.abspath) or path.iscfile(node.abspath) then
+	local shouldCompile = false
+	
+	if filecfg and filecfg.compileas and filecfg.compileas ~= "Default" then
+		if p.languages.isc(filecfg.compileas) or p.languages.iscpp(filecfg.compileas) then
+			shouldCompile = true
+		end
+	else
+		if path.iscppfile(node.abspath) or path.iscfile(node.abspath) then
+			shouldCompile = true
+		end
+	end
+	
+	if shouldCompile then
 		local objname = filecfg.objname or path.getbasename(node.abspath)
 		local toolset = ninja.gettoolset(cfg)
 		local objext = toolset.gettooloutputext("cc")
@@ -485,20 +510,40 @@ function m.buildFile(cfg, node, filecfg, objFile, pchFile, prebuildTarget)
 	local ext = path.getextension(node.abspath):lower()
 	local rule = nil
 	local flags = ""
+	local extraFlags = {}
+	local toolset = ninja.gettoolset(cfg)
 
-	if path.iscfile(node.abspath) then
-		rule = "cc"
-		flags = "cflags_" .. ninja.key(cfg)
-	elseif path.iscppfile(node.abspath) then
-		rule = "cxx"
-		flags = "cxxflags_" .. ninja.key(cfg)
+	if filecfg and filecfg.compileas and filecfg.compileas ~= "Default" then
+		if p.languages.isc(filecfg.compileas) then
+			rule = "cc"
+			flags = "cflags_" .. ninja.key(cfg)
+			
+			if toolset.shared and toolset.shared.compileas and toolset.shared.compileas["C"] then
+				table.insert(extraFlags, toolset.shared.compileas["C"])
+			end
+		elseif p.languages.iscpp(filecfg.compileas) then
+			rule = "cxx"
+			flags = "cxxflags_" .. ninja.key(cfg)
+			
+			if toolset.shared and toolset.shared.compileas and toolset.shared.compileas["C++"] then
+				table.insert(extraFlags, toolset.shared.compileas["C++"])
+			end
+		end
+	else
+		if path.iscfile(node.abspath) then
+			rule = "cc"
+			flags = "cflags_" .. ninja.key(cfg)
+		elseif path.iscppfile(node.abspath) then
+			rule = "cxx"
+			flags = "cxxflags_" .. ninja.key(cfg)
+		end
 	end
 
 	if rule then
 		local relPath = path.getrelative(cfg.workspace.location, node.abspath)
 		local implicitDeps = ""
 
-		if pchFile and not filecfg.flags.NoPCH then
+		if pchFile and filecfg and not filecfg.flags.NoPCH then
 			implicitDeps = implicitDeps .. " | " .. pchFile
 		end
 
@@ -512,9 +557,17 @@ function m.buildFile(cfg, node, filecfg, objFile, pchFile, prebuildTarget)
 		_p("build %s: %s %s%s", objFile, rule, relPath, implicitDeps)
 
 		if rule == "cc" then
-			_p("  cflags = $%s", flags)
+			if #extraFlags > 0 then
+				_p("  cflags = $%s %s", flags, table.concat(extraFlags, " "))
+			else
+				_p("  cflags = $%s", flags)
+			end
 		else
-			_p("  cxxflags = $%s", flags)
+			if #extraFlags > 0 then
+				_p("  cxxflags = $%s %s", flags, table.concat(extraFlags, " "))
+			else
+				_p("  cxxflags = $%s", flags)
+			end
 		end
 	end
 end
@@ -595,13 +648,9 @@ function m.linkTarget(cfg)
 	end
 
 	local hasPostBuild = #cfg.postbuildcommands > 0 or cfg.postbuildmessage
-	local linkTargetName = targetPath
 
-	if hasPostBuild then
-		linkTargetName = targetPath .. ".link"
-	end
-	
-	_p("build %s: %s %s%s", linkTargetName, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
+	-- Always use the actual target name for the link rule
+	_p("build %s: %s %s%s", targetPath, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
 
 	if cfg.kind ~= p.STATICLIB then
 		_p("  ldflags = $ldflags_%s", ninja.key(cfg))
@@ -613,7 +662,7 @@ function m.linkTarget(cfg)
 	end
 
 	if hasPostBuild then
-		m.buildPostBuildEvents(cfg, linkTargetName, targetPath)
+		m.buildPostBuildEvents(cfg, targetPath)
 	end
 end
 
@@ -630,15 +679,15 @@ function m.buildPreBuildEvents(cfg)
 
 	if hasMessage and not hasCommands then
 		_p("build %s: prebuildmessage", prebuildTarget)
-		_p("  prebuildmessage = %s", cfg.prebuildmessage)
+		_p("  prebuildmessage = \"%s\"", cfg.prebuildmessage)
 	elseif hasCommands and not hasMessage then
 		local commands = os.translateCommandsAndPaths(cfg.prebuildcommands, cfg.project.basedir, cfg.project.location)
 		local cmdStr = table.concat(commands, " && ")
 		_p("build %s: prebuild", prebuildTarget)
 		_p("  prebuildcommands = %s", cmdStr)
 	else
 		local commands = os.translateCommandsAndPaths(cfg.prebuildcommands, cfg.project.basedir, cfg.project.location)
-		local cmdStr = "echo " .. ninja.esc(cfg.prebuildmessage) .. " && " .. table.concat(commands, " && ")
+		local cmdStr = "echo \"" .. cfg.prebuildmessage .. "\" && " .. table.concat(commands, " && ")
 		_p("build %s: prebuild", prebuildTarget)
 		_p("  prebuildcommands = %s", cmdStr)
 	end
@@ -659,42 +708,45 @@ function m.buildPreLinkEvents(cfg)
 
 	if hasMessage and not hasCommands then
 		_p("build %s: prelinkmessage", prelinkTarget)
-		_p("  prelinkmessage = %s", cfg.prelinkmessage)
+		_p("  prelinkmessage = \"%s\"", cfg.prelinkmessage)
 	elseif hasCommands and not hasMessage then
 		local commands = os.translateCommandsAndPaths(cfg.prelinkcommands, cfg.project.basedir, cfg.project.location)
 		local cmdStr = table.concat(commands, " && ")
 		_p("build %s: prelink", prelinkTarget)
 		_p("  prelinkcommands = %s", cmdStr)
 	else
 		local commands = os.translateCommandsAndPaths(cfg.prelinkcommands, cfg.project.basedir, cfg.project.location)
-		local cmdStr = "echo " .. ninja.esc(cfg.prelinkmessage) .. " && " .. table.concat(commands, " && ")
+		local cmdStr = "echo \"" .. cfg.prelinkmessage .. "\" && " .. table.concat(commands, " && ")
 		_p("build %s: prelink", prelinkTarget)
 		_p("  prelinkcommands = %s", cmdStr)
 	end
 
 	return prelinkTarget
 end
 
-function m.buildPostBuildEvents(cfg, linkTarget, finalTarget)
+function m.buildPostBuildEvents(cfg, targetPath)
 	local hasMessage = cfg.postbuildmessage ~= nil
 	local hasCommands = #cfg.postbuildcommands > 0
 
 	if not hasMessage and not hasCommands then
 		return
 	end
 
+	-- Create a phony intermediate target for the postbuild step
+	local postbuildPhony = path.getrelative(cfg.workspace.location, cfg.buildtarget.directory) .. "/" .. cfg.project.name .. ".postbuild"
+	
 	if hasMessage and not hasCommands then
-		_p("build %s: postbuildmessage %s", finalTarget, linkTarget)
-		_p("  postbuildmessage = %s", cfg.postbuildmessage)
+		_p("build %s: postbuildmessage | %s", postbuildPhony, targetPath)
+		_p("  postbuildmessage = \"%s\"", cfg.postbuildmessage)
 	elseif hasCommands and not hasMessage then
 		local commands = os.translateCommandsAndPaths(cfg.postbuildcommands, cfg.project.basedir, cfg.project.location)
 		local cmdStr = table.concat(commands, " && ")
-		_p("build %s: postbuild %s", finalTarget, linkTarget)
+		_p("build %s: postbuild | %s", postbuildPhony, targetPath)
 		_p("  postbuildcommands = %s", cmdStr)
 	else
 		local commands = os.translateCommandsAndPaths(cfg.postbuildcommands, cfg.project.basedir, cfg.project.location)
-		local cmdStr = "echo " .. ninja.esc(cfg.postbuildmessage) .. " && " .. table.concat(commands, " && ")
-		_p("build %s: postbuild %s", finalTarget, linkTarget)
+		local cmdStr = "echo \"" .. cfg.postbuildmessage .. "\" && " .. table.concat(commands, " && ")
+		_p("build %s: postbuild | %s", postbuildPhony, targetPath)
 		_p("  postbuildcommands = %s", cmdStr)
 	end
 end
@@ -707,7 +759,14 @@ function m.buildTargets(prj)
 		local targetPath = path.getrelative(cfg.workspace.location, cfg.buildtarget.directory) .. "/" .. cfg.buildtarget.name
 		local cfgName = ninja.key(cfg)
 
-		_p("build %s: phony %s", cfgName, targetPath)
+		-- If there are postbuild events, point to the postbuild target instead
+		local hasPostBuild = #cfg.postbuildcommands > 0 or cfg.postbuildmessage
+		if hasPostBuild then
+			local postbuildTarget = path.getrelative(cfg.workspace.location, cfg.buildtarget.directory) .. "/" .. cfg.project.name .. ".postbuild"
+			_p("build %s: phony %s", cfgName, postbuildTarget)
+		else
+			_p("build %s: phony %s", cfgName, targetPath)
+		end
 	end
 
 	_p("")
@@ -720,7 +779,15 @@ function m.projectPhonies(prj)
 	local firstCfg = project.getfirstconfig(prj)
 	if firstCfg then
 		local targetPath = path.getrelative(firstCfg.workspace.location, firstCfg.buildtarget.directory) .. "/" .. firstCfg.buildtarget.name
-		_p("build %s: phony %s", prj.name, targetPath)
+		
+		-- If there are postbuild events in the first config, point to the postbuild target
+		local hasPostBuild = #firstCfg.postbuildcommands > 0 or firstCfg.postbuildmessage
+		if hasPostBuild then
+			local postbuildTarget = path.getrelative(firstCfg.workspace.location, firstCfg.buildtarget.directory) .. "/" .. firstCfg.project.name .. ".postbuild"
+			_p("build %s: phony %s", prj.name, postbuildTarget)
+		else
+			_p("build %s: phony %s", prj.name, targetPath)
+		end
 	end
 
 	_p("")

modules/ninja/tests/_tests.lua

@@ -9,6 +9,7 @@ require("ninja")
 
 return {
     "test_build_rules.lua",
+    "test_ninja_compileas.lua",
     "test_ninja_config.lua",
     "test_ninja_custom_build.lua",
     "test_ninja_pch.lua",