AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add 'supports_language' callback to action to validate languages now that we have multiple dialects

Browse Source
This commit is contained in:
Tom van Dijck 2017-04-24 13:37:28 -07:00
parent 97856fe923
commit 6d471ecc2a
14 changed files with 69 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/codelite/_preload.lua
View File

@ -22,10 +22,13 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "Makefile", "SharedLib", "StaticLib", "Utility" },
valid_languages = { "C", "C++" },
valid_tools = {
cc = { "gcc", "clang", "msc" }
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang)
end,
-- Workspace and project generation logic

4
modules/d/actions/gmake.lua
View File

@ -28,9 +28,11 @@
--
-- Patch the gmake action with the allowed tools...
--
gmake.valid_languages = table.join(gmake.valid_languages, { p.D } )
gmake.valid_tools.dc = { "dmd", "gdc", "ldc" }
p.override(gmake, "supports_language", function(oldfn, lang)
return oldfn(lang) or lang == p.D;
end)
function m.make.separateCompilation(prj)
local some = false

4
modules/d/actions/vstudio.lua
View File

@ -22,7 +22,9 @@
for k,v in pairs({ "vs2005", "vs2008", "vs2010", "vs2012", "vs2013", "vs2015" }) do
local vs = p.action.get(v)
if vs ~= nil then
table.insert( vs.valid_languages, p.D )
p.override(vs, "supports_language", function(oldfn, lang)
return oldfn(lang) or lang == p.D;
end)
vs.valid_tools.dc = { "dmd", "gdc", "ldc" }
p.override(vs, "onProject", function(oldfn, prj)

4
modules/raw/_preload.lua
View File

@ -4,10 +4,6 @@ newaction
shortname = "Raw output",
description = "Generate raw representation of Premake structures",
valid_kinds = { "ConsoleApp", "WindowedApp", "SharedLib", "StaticLib", "Makefile", "None", "Utility" },
valid_languages = { "C", "C++" },
valid_tools = { cc = { "clang" } },
onsolution = function(sln)
require('raw')

5
modules/xcode/_preload.lua
View File

@ -40,10 +40,13 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "SharedLib", "StaticLib", "Makefile", "None" },
valid_languages = { "C", "C++" },
valid_tools = {
cc = { "gcc", "clang" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang)
end,
-- Workspace and project generation logic

8
src/actions/make/_make.lua
View File

@ -22,13 +22,17 @@
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Utility", "Makefile" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "clang", "gcc" },
dotnet = { "mono", "msnet", "pnet" }
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
onWorkspace = function(wks)
premake.escaper(make.esc)
premake.generate(wks, make.getmakefilename(wks, false), make.generate_workspace)

6
src/actions/vstudio/vs2005.lua
View File

@ -100,11 +100,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2008.lua
View File

@ -27,11 +27,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2010.lua
View File

@ -123,11 +123,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None", "Utility" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2012.lua
View File

@ -29,11 +29,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None", "Utility" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2013.lua
View File

@ -31,11 +31,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None", "Utility" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2015.lua
View File

@ -31,11 +31,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None", "Utility" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

6
src/actions/vstudio/vs2017.lua
View File

@ -31,11 +31,15 @@
-- The capabilities of this action
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Makefile", "None", "Utility", "Installer" },
valid_languages = { "C", "C++", "C#" },
valid_tools = {
cc = { "msc" },
dotnet = { "msnet" },
},
supports_language = function(lang)
return p.languages.isc(lang) or
p.languages.iscpp(lang) or
p.languages.isdotnet(lang)
end,
-- Workspace and project generation logic

23
src/base/action.lua
View File

@ -239,19 +239,24 @@
if not self then
return false
end
if not self.valid_languages and not self.valid_kinds then
if not self.valid_languages and not self.valid_kinds and not self.supports_language then
return true
end
if self.valid_languages then
if table.contains(self.valid_languages, feature) then
return true
end
if self.valid_languages and table.contains(self.valid_languages, feature) then
return true
end
if self.valid_kinds then
if table.contains(self.valid_kinds, feature) then
return true
end
if self.valid_kinds and table.contains(self.valid_kinds, feature) then
return true
end
if self.supports_language and self.supports_language(feature) then
return true
end
return false
end