Skip to content

Commit 61d00d0

Browse files
nickclark2016nickclark2016
committed
Rename gmake to gmake legacy
1 parent 534de00 commit 61d00d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+90
-86
lines changed

‎modules/gmake/_manifest.lua‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎modules/gmake2/_preload.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
dotnet = { "mono", "msnet", "pnet" }
3838
},
3939

40+
aliases = {
41+
"gmake",
42+
},
43+
4044
onInitialize = function()
4145
require("gmake2")
4246
p.modules.gmake2.cpp.initialize()

‎modules/gmakelegacy/_manifest.lua‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
return {
2+
"_preload.lua",
3+
"gmakelegacy.lua",
4+
"gmakelegacy_cpp.lua",
5+
"gmakelegacy_csharp.lua",
6+
"gmakelegacy_makefile.lua",
7+
"gmakelegacy_utility.lua",
8+
"gmakelegacy_workspace.lua",
9+
}

‎modules/gmake/_preload.lua‎ renamed to ‎modules/gmakelegacy/_preload.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
---
2424

2525
newaction {
26-
trigger = "gmake",
27-
shortname = "GNU Make",
26+
trigger = "gmakelegacy",
27+
shortname = "GNU Make (Legacy)",
2828
description = "Generate GNU makefiles for POSIX, MinGW, and Cygwin",
2929
toolset = defaultToolset(),
3030

@@ -36,36 +36,36 @@
3636
},
3737

3838
onWorkspace = function(wks)
39-
p.escaper(p.make.esc)
39+
p.escaper(p.makelegacy.esc)
4040
wks.projects = table.filter(wks.projects, function(prj) return p.action.supports(prj.kind) and prj.kind ~= p.NONE end)
41-
p.generate(wks, p.make.getmakefilename(wks, false), p.make.generate_workspace)
41+
p.generate(wks, p.makelegacy.getmakefilename(wks, false), p.makelegacy.generate_workspace)
4242
end,
4343

4444
onProject = function(prj)
45-
p.escaper(p.make.esc)
46-
local makefile = p.make.getmakefilename(prj, true)
45+
p.escaper(p.makelegacy.esc)
46+
local makefile = p.makelegacy.getmakefilename(prj, true)
4747

4848
if not p.action.supports(prj.kind) or prj.kind == p.NONE then
4949
return
5050
elseif prj.kind == p.UTILITY then
51-
p.generate(prj, makefile, p.make.utility.generate)
51+
p.generate(prj, makefile, p.makelegacy.utility.generate)
5252
elseif prj.kind == p.MAKEFILE then
53-
p.generate(prj, makefile, p.make.makefile.generate)
53+
p.generate(prj, makefile, p.makelegacy.makefile.generate)
5454
else
5555
if project.isdotnet(prj) then
56-
p.generate(prj, makefile, p.make.cs.generate)
56+
p.generate(prj, makefile, p.makelegacy.cs.generate)
5757
elseif project.isc(prj) or project.iscpp(prj) then
58-
p.generate(prj, makefile, p.make.cpp.generate)
58+
p.generate(prj, makefile, p.makelegacy.cpp.generate)
5959
end
6060
end
6161
end,
6262

6363
onCleanWorkspace = function(wks)
64-
p.clean.file(wks, p.make.getmakefilename(wks, false))
64+
p.clean.file(wks, p.makelegacy.getmakefilename(wks, false))
6565
end,
6666

6767
onCleanProject = function(prj)
68-
p.clean.file(prj, p.make.getmakefilename(prj, true))
68+
p.clean.file(prj, p.makelegacy.getmakefilename(prj, true))
6969
end
7070
}
7171

@@ -75,5 +75,5 @@
7575
--
7676

7777
return function(cfg)
78-
return (_ACTION == "gmake")
78+
return (_ACTION == "gmakelegacy")
7979
end

‎modules/gmake/gmake.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy.lua‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
local p = premake
88

9-
p.modules.gmake = {}
10-
p.modules.gmake._VERSION = p._VERSION
9+
p.modules.gmakelegacy = {}
10+
p.modules.gmakelegacy._VERSION = p._VERSION
1111

1212
-- for backwards compatibility.
13-
p.make = p.modules.gmake
13+
p.makelegacy = p.modules.gmakelegacy
1414

15-
local make = p.make
15+
local make = p.makelegacy
1616
local project = p.project
1717

1818
--
@@ -293,10 +293,10 @@
293293
end
294294

295295

296-
include("gmake_cpp.lua")
297-
include("gmake_csharp.lua")
298-
include("gmake_makefile.lua")
299-
include("gmake_utility.lua")
300-
include("gmake_workspace.lua")
296+
include("gmakelegacy_cpp.lua")
297+
include("gmakelegacy_csharp.lua")
298+
include("gmakelegacy_makefile.lua")
299+
include("gmakelegacy_utility.lua")
300+
include("gmakelegacy_workspace.lua")
301301

302-
return p.modules.gmake
302+
return p.modules.gmakelegacy

‎modules/gmake/gmake_cpp.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy_cpp.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
local p = premake
88

9-
p.make.cpp = {}
9+
p.makelegacy.cpp = {}
1010

11-
local make = p.make
12-
local cpp = p.make.cpp
11+
local make = p.makelegacy
12+
local cpp = p.makelegacy.cpp
1313
local project = p.project
1414
local config = p.config
1515
local fileconfig = p.fileconfig

‎modules/gmake/gmake_csharp.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy_csharp.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
--
66

77
local p = premake
8-
p.make.cs = {}
9-
local make = p.make
10-
local cs = p.make.cs
8+
p.makelegacy.cs = {}
9+
local make = p.makelegacy
10+
local cs = p.makelegacy.cs
1111
local project = p.project
1212
local config = p.config
1313
local fileconfig = p.fileconfig
@@ -236,15 +236,15 @@
236236
for cfg in p.eachconfig(prj) do
237237
_x('ifneq (,$(findstring %s,$(config)))', cfg.name:lower())
238238
for target, source in pairs(cfgpairs[cfg]) do
239-
p.make_copyrule(source, target)
239+
p.makelegacy_copyrule(source, target)
240240
end
241241
_p('endif')
242242
_p('')
243243
end
244244
245245
_p('# Copied file rules')
246246
for target, source in pairs(copypairs) do
247-
p.make_copyrule(source, target)
247+
p.makelegacy_copyrule(source, target)
248248
end
249249
250250
_p('# Embedded file rules')

‎modules/gmake/gmake_makefile.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy_makefile.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
--
66

77
local p = premake
8-
p.make.makefile = {}
8+
p.makelegacy.makefile = {}
99

10-
local make = p.make
11-
local makefile = p.make.makefile
10+
local make = p.makelegacy
11+
local makefile = p.makelegacy.makefile
1212
local project = p.project
1313
local config = p.config
1414
local fileconfig = p.fileconfig

‎modules/gmake/gmake_utility.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy_utility.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
--
66

77
local p = premake
8-
p.make.utility = {}
8+
p.makelegacy.utility = {}
99

10-
local make = p.make
11-
local utility = p.make.utility
10+
local make = p.makelegacy
11+
local utility = p.makelegacy.utility
1212
local project = p.project
1313
local config = p.config
1414
local fileconfig = p.fileconfig

‎modules/gmake/gmake_workspace.lua‎ renamed to ‎modules/gmakelegacy/gmakelegacy_workspace.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--
66

77
local p = premake
8-
local make = p.make
8+
local make = p.makelegacy
99
local tree = p.tree
1010
local project = p.project
1111

0 commit comments

Comments
 (0)