Ensure outputs for lib and exp files are emitted for dlls on Windows

Author: nickclark2016

modules/ninja/ninja_cpp.lua

@@ -1162,8 +1162,33 @@ function m.linkTarget(cfg)
 	end
 
 	local hasPostBuild = #cfg.postbuildcommands > 0 or cfg.postbuildmessage
+
+	local implicitoutputs = {}
+
+	-- If this target is a shared library on Windows with NoImportLib not set, add an implicit output
+	-- for the .lib file
+	-- If this is on windows and building a shared library, emit a exp file as an implicit output
+	if cfg.system == p.WINDOWS and cfg.kind == p.SHAREDLIB then
+		local expFileName = cfg.buildtarget.name:gsub("%..-$", "") .. ".exp"
+		if expFileName then
+			local expFilePath = path.getrelative(cfg.workspace.location, cfg.buildtarget.directory) .. "/" .. expFileName
+			table.insert(implicitoutputs, expFilePath)
+		end
+
+		if not cfg.flags.NoImportLib then
+			local importLibName = cfg.buildtarget.name:gsub("%..-$", "") .. ".lib"
+			if importLibName then
+				local importLibPath = path.getrelative(cfg.workspace.location, cfg.buildtarget.directory) .. "/" .. importLibName
+				table.insert(implicitoutputs, importLibPath)
+			end
+		end
+	end
 
-	_p("build %s: %s %s%s", targetPath, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
+	if #implicitoutputs > 0 then
+		_p("build %s | %s: %s %s%s", targetPath, table.concat(implicitoutputs, " "), rule, table.concat(cfg._objectFiles, " "), implicitDeps)
+	else
+		_p("build %s: %s %s%s", targetPath, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
+	end
 
 	if cfg.kind ~= p.STATICLIB then
 		_p("  ldflags = $ldflags_%s", ninja.key(cfg))

modules/ninja/tests/test_ninja_project.lua

@@ -143,7 +143,6 @@ end
 		-- Get the actual project name for the test
 		local targetName = cfg.buildtarget.name
 
-		-- Verify output contains the actual target name for link, not .link suffix
 		test.capture(string.format([[
 build bin/Debug/%s: link obj/Debug/main.o
   ldflags = $ldflags_%s_Debug
@@ -184,3 +183,156 @@ build bin/Debug/%s: link obj/Debug/main.o
   ldflags = $ldflags_%s_Debug
 		]], targetName, prj.name))
 	end
+
+
+--
+-- Test that shared library on Windows without NoImportLib flag works correctly with GCC
+--
+	function suite.sharedLibWindowsGCC()
+		local wks = test.createWorkspace()
+		configurations { "Debug" }
+		toolset "gcc"
+		_OS = "windows"
+
+		local prj = test.createProject(wks)
+		kind "SharedLib"
+		language "C++"
+		files { "main.cpp" }
+
+		local cfg = test.getconfig(prj, "Debug")
+
+		-- Set up object files list (normally done by buildFiles)
+		cfg._objectFiles = { "obj/Debug/main.o" }
+
+		-- Call linkTarget and check output
+		ninja.cpp.linkTarget(cfg)
+
+		test.capture [[
+build bin/Debug/MyProject2.dll | bin/Debug/MyProject2.exp bin/Debug/MyProject2.lib: link obj/Debug/main.o
+  ldflags = $ldflags_MyProject2_Debug
+		]]
+	end
+
+
+--
+-- Test that shared library on Windows without NoImportLib flag works correctly with MSVC
+--
+	function suite.sharedLibWindowsMSVC()
+		local wks = test.createWorkspace()
+		configurations { "Debug" }
+		toolset "msc"
+		_OS = "windows"
+
+		local prj = test.createProject(wks)
+		kind "SharedLib"
+		language "C++"
+		files { "main.cpp" }
+
+		local cfg = test.getconfig(prj, "Debug")
+
+		-- Set up object files list (normally done by buildFiles)
+		cfg._objectFiles = { "obj/Debug/main.obj" }
+
+		-- Call linkTarget and check output
+		ninja.cpp.linkTarget(cfg)
+
+		test.capture [[
+build bin/Debug/MyProject2.dll | bin/Debug/MyProject2.exp bin/Debug/MyProject2.lib: link obj/Debug/main.obj
+  ldflags = $ldflags_MyProject2_Debug
+		]]
+	end
+
+
+--
+-- Test that shared library on Windows with NoImportLib flag works correctly with GCC
+--
+
+	function suite.sharedLibWindowsGCCNoImportLib()
+		local wks = test.createWorkspace()
+		configurations { "Debug" }
+		toolset "gcc"
+		_OS = "windows"
+
+		local prj = test.createProject(wks)
+		kind "SharedLib"
+		language "C++"
+		files { "main.cpp" }
+		flags { "NoImportLib" }
+
+		local cfg = test.getconfig(prj, "Debug")
+
+		-- Set up object files list (normally done by buildFiles)
+		cfg._objectFiles = { "obj/Debug/main.o" }
+
+		-- Call linkTarget and check output
+		ninja.cpp.linkTarget(cfg)
+
+		test.capture [[
+build bin/Debug/MyProject2.dll | bin/Debug/MyProject2.exp: link obj/Debug/main.o
+  ldflags = $ldflags_MyProject2_Debug
+		]]
+		
+	end
+
+
+--
+-- Test that shared library on Windows with NoImportLib flag works correctly with MSVC
+--
+
+	function suite.sharedLibWindowsMSVCNoImportLib()
+		local wks = test.createWorkspace()
+		configurations { "Debug" }
+		toolset "msc"
+		_OS = "windows"
+
+		local prj = test.createProject(wks)
+		kind "SharedLib"
+		language "C++"
+		files { "main.cpp" }
+		flags { "NoImportLib" }
+
+		local cfg = test.getconfig(prj, "Debug")
+
+		-- Set up object files list (normally done by buildFiles)
+		cfg._objectFiles = { "obj/Debug/main.obj" }
+
+		-- Call linkTarget and check output
+		ninja.cpp.linkTarget(cfg)
+
+		test.capture [[
+build bin/Debug/MyProject2.dll | bin/Debug/MyProject2.exp: link obj/Debug/main.obj
+  ldflags = $ldflags_MyProject2_Debug
+		]]
+
+	end
+
+
+--
+-- Test the shared library not on Windows does not create exp or lib files
+--
+
+	function suite.sharedLibNotWindows()
+		local wks = test.createWorkspace()
+		configurations { "Debug" }
+		toolset "gcc"
+		_OS = "linux"
+
+		local prj = test.createProject(wks)
+		kind "SharedLib"
+		language "C++"
+		files { "main.cpp" }
+
+		local cfg = test.getconfig(prj, "Debug")
+
+		-- Set up object files list (normally done by buildFiles)
+		cfg._objectFiles = { "obj/Debug/main.o" }
+
+		-- Call linkTarget and check output
+		ninja.cpp.linkTarget(cfg)
+
+		test.capture [[
+build bin/Debug/libMyProject2.so: link obj/Debug/main.o
+  ldflags = $ldflags_MyProject2_Debug
+		]]
+
+	end