Fixed tools output of MSC in the gmake generator

Author: samsinsane

modules/gmake/tests/test_gmake_tools.lua

@@ -59,3 +59,19 @@ endif
 RESCOMP = windres
 		]]
 	end
+
+	function suite.usesCorrectTools_msc()
+		gmake.cpp.tools(cfg, p.tools.msc)
+		test.capture [[
+ifeq ($(origin CC), default)
+  CC = cl
+endif
+ifeq ($(origin CXX), default)
+  CXX = cl
+endif
+ifeq ($(origin AR), default)
+  AR = lib
+endif
+RESCOMP = rc
+		]]
+	end

src/base/_foundation.lua

@@ -41,6 +41,7 @@
 	premake.MACOSX      = "macosx"
 	premake.MAKEFILE    = "Makefile"
 	premake.MBCS        = "MBCS"
+	premake.MSC         = "msc"
 	premake.NONE        = "None"
 	premake.DEFAULT     = "Default"
 	premake.OBJECTIVEC   = "Objective-C"

src/tools/msc.lua

@@ -481,8 +481,17 @@
 --    default value should be used.
 --
 
+	msc.tools = {
+		cc = "cl",
+		cxx = "cl",
+		ar = "lib",
+		rc = "rc"
+	}
+
 	function msc.gettoolname(cfg, tool)
-		return nil
+		local toolset, version = p.tools.canonical(cfg.toolset or p.MSC)
+		-- TODO: Support versioning?
+		return msc.tools[tool]
 	end
 
 

tests/tools/test_msc.lua

@@ -26,6 +26,29 @@
 	end
 
 
+--
+-- Check the selection of tools.
+--
+
+	function suite.tools_onDefaults()
+		prepare()
+		test.isequal("cl", msc.gettoolname(cfg, "cc"))
+		test.isequal("cl", msc.gettoolname(cfg, "cxx"))
+		test.isequal("lib", msc.gettoolname(cfg, "ar"))
+		test.isequal("rc", msc.gettoolname(cfg, "rc"))
+	end
+
+	function suite.tools_withMsc()
+		toolset "msc"
+		prepare()
+		test.isequal("cl", msc.gettoolname(cfg, "cc"))
+		test.isequal("cl", msc.gettoolname(cfg, "cxx"))
+		test.isequal("lib", msc.gettoolname(cfg, "ar"))
+		test.isequal("rc", msc.gettoolname(cfg, "rc"))
+	end
+
+
+
 --
 -- Check the optimization flags.
 --