Merge pull request #2404 from nickclark2016/feature/rename-gmake

nickclark2016 · web-flow · commit eb418abada93 · 2024-12-31T23:19:52.000-05:00
Rename gmake to gmakelegacy
diff --git a/modules/gmake/_manifest.lua b/modules/gmake/_manifest.lua
diff --git a/modules/gmake2/_preload.lua b/modules/gmake2/_preload.lua
@@ -37,6 +37,10 @@
 			dotnet = { "mono", "msnet", "pnet" }
 		},
 
+		aliases = {
+			"gmake",
+		},
+
 		onInitialize = function()
 			require("gmake2")
 			p.modules.gmake2.cpp.initialize()
diff --git a/modules/gmakelegacy/_manifest.lua b/modules/gmakelegacy/_manifest.lua
@@ -0,0 +1,9 @@
+return {
+	"_preload.lua",
+	"gmakelegacy.lua",
+	"gmakelegacy_cpp.lua",
+	"gmakelegacy_csharp.lua",
+	"gmakelegacy_makefile.lua",
+	"gmakelegacy_utility.lua",
+	"gmakelegacy_workspace.lua",
+}
diff --git a/modules/gmakelegacy/_preload.lua b/modules/gmakelegacy/_preload.lua
@@ -23,8 +23,8 @@
 ---
 
 	newaction {
-		trigger         = "gmake",
-		shortname       = "GNU Make",
+		trigger         = "gmakelegacy",
+		shortname       = "GNU Make (Legacy)",
 		description     = "Generate GNU makefiles for POSIX, MinGW, and Cygwin",
 		toolset         = defaultToolset(),
 
@@ -36,36 +36,36 @@
 		},
 
 		onWorkspace = function(wks)
-			p.escaper(p.make.esc)
+			p.escaper(p.makelegacy.esc)
 			wks.projects = table.filter(wks.projects, function(prj) return p.action.supports(prj.kind) and prj.kind ~= p.NONE end)
-			p.generate(wks, p.make.getmakefilename(wks, false), p.make.generate_workspace)
+			p.generate(wks, p.makelegacy.getmakefilename(wks, false), p.makelegacy.generate_workspace)
 		end,
 
 		onProject = function(prj)
-			p.escaper(p.make.esc)
-			local makefile = p.make.getmakefilename(prj, true)
+			p.escaper(p.makelegacy.esc)
+			local makefile = p.makelegacy.getmakefilename(prj, true)
 
 			if not p.action.supports(prj.kind) or prj.kind == p.NONE then
 				return
 			elseif prj.kind == p.UTILITY then
-				p.generate(prj, makefile, p.make.utility.generate)
+				p.generate(prj, makefile, p.makelegacy.utility.generate)
 			elseif prj.kind == p.MAKEFILE then
-				p.generate(prj, makefile, p.make.makefile.generate)
+				p.generate(prj, makefile, p.makelegacy.makefile.generate)
 			else
 				if project.isdotnet(prj) then
-					p.generate(prj, makefile, p.make.cs.generate)
+					p.generate(prj, makefile, p.makelegacy.cs.generate)
 				elseif project.isc(prj) or project.iscpp(prj) then
-					p.generate(prj, makefile, p.make.cpp.generate)
+					p.generate(prj, makefile, p.makelegacy.cpp.generate)
 				end
 			end
 		end,
 
 		onCleanWorkspace = function(wks)
-			p.clean.file(wks, p.make.getmakefilename(wks, false))
+			p.clean.file(wks, p.makelegacy.getmakefilename(wks, false))
 		end,
 
 		onCleanProject = function(prj)
-			p.clean.file(prj, p.make.getmakefilename(prj, true))
+			p.clean.file(prj, p.makelegacy.getmakefilename(prj, true))
 		end
 	}
 
@@ -75,5 +75,5 @@
 --
 
 	return function(cfg)
-		return (_ACTION == "gmake")
+		return (_ACTION == "gmakelegacy")
 	end
diff --git a/modules/gmakelegacy/gmakelegacy.lua b/modules/gmakelegacy/gmakelegacy.lua
@@ -6,13 +6,13 @@
 
 	local p = premake
 
-	p.modules.gmake = {}
-	p.modules.gmake._VERSION = p._VERSION
+	p.modules.gmakelegacy = {}
+	p.modules.gmakelegacy._VERSION = p._VERSION
 
 	-- for backwards compatibility.
-	p.make = p.modules.gmake
+	p.makelegacy = p.modules.gmakelegacy
 
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 --
@@ -293,10 +293,10 @@
 	end
 
 
-	include("gmake_cpp.lua")
-	include("gmake_csharp.lua")
-	include("gmake_makefile.lua")
-	include("gmake_utility.lua")
-	include("gmake_workspace.lua")
+	include("gmakelegacy_cpp.lua")
+	include("gmakelegacy_csharp.lua")
+	include("gmakelegacy_makefile.lua")
+	include("gmakelegacy_utility.lua")
+	include("gmakelegacy_workspace.lua")
 
-	return p.modules.gmake
+	return p.modules.gmakelegacy
diff --git a/modules/gmakelegacy/gmakelegacy_cpp.lua b/modules/gmakelegacy/gmakelegacy_cpp.lua
@@ -6,10 +6,10 @@
 
 	local p = premake
 
-	p.make.cpp = {}
+	p.makelegacy.cpp = {}
 
-	local make = p.make
-	local cpp = p.make.cpp
+	local make = p.makelegacy
+	local cpp = p.makelegacy.cpp
 	local project = p.project
 	local config = p.config
 	local fileconfig = p.fileconfig
diff --git a/modules/gmakelegacy/gmakelegacy_csharp.lua b/modules/gmakelegacy/gmakelegacy_csharp.lua
@@ -5,9 +5,9 @@
 --
 
 	local p = premake
-	p.make.cs = {}
-	local make = p.make
-	local cs = p.make.cs
+	p.makelegacy.cs = {}
+	local make = p.makelegacy
+	local cs = p.makelegacy.cs
 	local project = p.project
 	local config = p.config
 	local fileconfig = p.fileconfig
@@ -236,15 +236,15 @@
 		for cfg in p.eachconfig(prj) do
 			_x('ifneq (,$(findstring %s,$(config)))', cfg.name:lower())
 			for target, source in pairs(cfgpairs[cfg]) do
-				p.make_copyrule(source, target)
+				p.makelegacy_copyrule(source, target)
 			end
 			_p('endif')
 			_p('')
 		end
 
 		_p('# Copied file rules')
 		for target, source in pairs(copypairs) do
-			p.make_copyrule(source, target)
+			p.makelegacy_copyrule(source, target)
 		end
 
 		_p('# Embedded file rules')
diff --git a/modules/gmakelegacy/gmakelegacy_makefile.lua b/modules/gmakelegacy/gmakelegacy_makefile.lua
@@ -5,10 +5,10 @@
 --
 
 	local p = premake
-	p.make.makefile = {}
+	p.makelegacy.makefile = {}
 
-	local make       = p.make
-	local makefile   = p.make.makefile
+	local make       = p.makelegacy
+	local makefile   = p.makelegacy.makefile
 	local project    = p.project
 	local config     = p.config
 	local fileconfig = p.fileconfig
diff --git a/modules/gmakelegacy/gmakelegacy_utility.lua b/modules/gmakelegacy/gmakelegacy_utility.lua
@@ -5,10 +5,10 @@
 --
 
 	local p = premake
-	p.make.utility = {}
+	p.makelegacy.utility = {}
 
-	local make       = p.make
-	local utility    = p.make.utility
+	local make       = p.makelegacy
+	local utility    = p.makelegacy.utility
 	local project    = p.project
 	local config     = p.config
 	local fileconfig = p.fileconfig
diff --git a/modules/gmakelegacy/gmakelegacy_workspace.lua b/modules/gmakelegacy/gmakelegacy_workspace.lua
@@ -5,7 +5,7 @@
 --
 
 	local p = premake
-	local make = p.make
+	local make = p.makelegacy
 	local tree = p.tree
 	local project = p.project
 
diff --git a/modules/gmakelegacy/tests/_tests.lua b/modules/gmakelegacy/tests/_tests.lua
@@ -1,4 +1,4 @@
-require ("gmake")
+require ("gmakelegacy")
 
 return {
 	-- Makefile tests
diff --git a/modules/gmakelegacy/tests/cpp/test_clang.lua b/modules/gmakelegacy/tests/cpp/test_clang.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_clang")
-	local make = p.make
-	local cpp = p.make.cpp
+	local make = p.makelegacy
+	local cpp = p.makelegacy.cpp
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_file_rules.lua b/modules/gmakelegacy/tests/cpp/test_file_rules.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_cpp_file_rules")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_flags.lua b/modules/gmakelegacy/tests/cpp/test_flags.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_flags")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_ldflags.lua b/modules/gmakelegacy/tests/cpp/test_ldflags.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_ldflags")
-	local make = p.make
+	local make = p.makelegacy
 
 
 --
diff --git a/modules/gmakelegacy/tests/cpp/test_make_linking.lua b/modules/gmakelegacy/tests/cpp/test_make_linking.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_linking")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_make_pch.lua b/modules/gmakelegacy/tests/cpp/test_make_pch.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_pch")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_objects.lua b/modules/gmakelegacy/tests/cpp/test_objects.lua
@@ -21,7 +21,7 @@
 
 	local function prepare()
 		prj = test.getproject(wks, 1)
-		p.make.cppObjects(prj)
+		p.makelegacy.cppObjects(prj)
 	end
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_target_rules.lua b/modules/gmakelegacy/tests/cpp/test_target_rules.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_cpp_target_rules")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_tools.lua b/modules/gmakelegacy/tests/cpp/test_tools.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_tools")
-	local make = p.make
-	local cpp = p.make.cpp
+	local make = p.makelegacy
+	local cpp = p.makelegacy.cpp
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cpp/test_wiidev.lua b/modules/gmakelegacy/tests/cpp/test_wiidev.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_wiidev")
-	local make = p.make
+	local make = p.makelegacy
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cs/test_embed_files.lua b/modules/gmakelegacy/tests/cs/test_embed_files.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_cs_embed_files")
-	local make = p.make
-	local cs = p.make.cs
+	local make = p.makelegacy
+	local cs = p.makelegacy.cs
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cs/test_flags.lua b/modules/gmakelegacy/tests/cs/test_flags.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_cs_flags")
-	local make = p.make
-	local cs = p.make.cs
+	local make = p.makelegacy
+	local cs = p.makelegacy.cs
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/cs/test_links.lua b/modules/gmakelegacy/tests/cs/test_links.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_cs_links")
-	local make = p.make
-	local cs = p.make.cs
+	local make = p.makelegacy
+	local cs = p.makelegacy.cs
 	local project = p.project
 
 --
diff --git a/modules/gmakelegacy/tests/cs/test_response.lua b/modules/gmakelegacy/tests/cs/test_response.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_cs_response")
-	local make = p.make
+	local make = p.makelegacy
 
 
 --
diff --git a/modules/gmakelegacy/tests/cs/test_sources.lua b/modules/gmakelegacy/tests/cs/test_sources.lua
@@ -6,8 +6,8 @@
 
 	local p = premake
 	local suite = test.declare("make_cs_sources")
-	local make = p.make
-	local cs = p.make.cs
+	local make = p.makelegacy
+	local cs = p.makelegacy.cs
 	local project = p.project
 
 
diff --git a/modules/gmakelegacy/tests/test_make_escaping.lua b/modules/gmakelegacy/tests/test_make_escaping.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_escaping")
-	local make = p.make
+	local make = p.makelegacy
 
 
 	function suite.Escapes_Spaces()
diff --git a/modules/gmakelegacy/tests/test_make_tovar.lua b/modules/gmakelegacy/tests/test_make_tovar.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_tovar")
-	local make = p.make
+	local make = p.makelegacy
 
 
 --
diff --git a/modules/gmakelegacy/tests/workspace/test_config_maps.lua b/modules/gmakelegacy/tests/workspace/test_config_maps.lua
@@ -6,7 +6,7 @@
 
 	local p = premake
 	local suite = test.declare("make_config_maps")
-	local make = p.make
+	local make = p.makelegacy
 
 
 --
diff --git a/modules/gmakelegacy/tests/workspace/test_default_config.lua b/modules/gmakelegacy/tests/workspace/test_default_config.lua
diff --git a/modules/gmakelegacy/tests/workspace/test_group_rule.lua b/modules/gmakelegacy/tests/workspace/test_group_rule.lua
diff --git a/modules/gmakelegacy/tests/workspace/test_help_rule.lua b/modules/gmakelegacy/tests/workspace/test_help_rule.lua
diff --git a/modules/gmakelegacy/tests/workspace/test_project_rule.lua b/modules/gmakelegacy/tests/workspace/test_project_rule.lua
diff --git a/scripts/package.lua b/scripts/package.lua
diff --git a/src/_modules.lua b/src/_modules.lua
diff --git a/website/docs/Custom-Rules.md b/website/docs/Custom-Rules.md
diff --git a/website/docs/Using-Premake.md b/website/docs/Using-Premake.md
diff --git a/website/docs/includedirsafter.md b/website/docs/includedirsafter.md
diff --git a/website/docs/kind.md b/website/docs/kind.md
diff --git a/website/docs/linkgroups.md b/website/docs/linkgroups.md
diff --git a/website/docs/system.md b/website/docs/system.md

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require ("gmake")`
	`1`	`+require ("gmakelegacy")`
`2`	`2`
`3`	`3`	`return {`
`4`	`4`	`-- Makefile tests`