AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Replace "wrk" with "wks"

Browse Source
This commit is contained in:
Jason Perkins 2015-07-30 15:30:41 -04:00
parent a82466c6f4
commit 91220c7d71
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
dotnet = { "mono", "msnet", "pnet" } dotnet = { "mono", "msnet", "pnet" }
}, },
onWorkspace = function(wrk) onWorkspace = function(wks)
premake.escaper(make.esc) premake.escaper(make.esc)
premake.generate(wrk, make.getmakefilename(wrk, false), make.generate_solution) premake.generate(wks, make.getmakefilename(wks, false), make.generate_solution)
end, end,
onProject = function(prj) onProject = function(prj)
@ -43,8 +43,8 @@
end end
end, end,
onCleanWorkspace = function(wrk) onCleanWorkspace = function(wks)
premake.clean.file(wrk, make.getmakefilename(wrk, false)) premake.clean.file(wks, make.getmakefilename(wks, false))
end, end,
onCleanProject = function(prj) onCleanProject = function(prj)

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

@ -121,8 +121,8 @@
-- Solution and project generation logic -- Solution and project generation logic
onWorkspace = function(wrk) onWorkspace = function(wks)
vstudio.vs2005.generateSolution(wrk) vstudio.vs2005.generateSolution(wks)
end, end,
onProject = function(prj) onProject = function(prj)
vstudio.vs2010.generateProject(prj) vstudio.vs2010.generateProject(prj)
@ -131,8 +131,8 @@
vstudio.vs2010.generateRule(rule) vstudio.vs2010.generateRule(rule)
end, end,
onCleanWorkspace = function(wrk) onCleanWorkspace = function(wks)
vstudio.cleanSolution(wrk) vstudio.cleanSolution(wks)
end, end,
onCleanProject = function(prj) onCleanProject = function(prj)
vstudio.cleanProject(prj) vstudio.cleanProject(prj)

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

@ -37,8 +37,8 @@
-- Solution and project generation logic -- Solution and project generation logic
onWorkspace = function(wrk) onWorkspace = function(wks)
vstudio.vs2005.generateSolution(wrk) vstudio.vs2005.generateSolution(wks)
end, end,
onProject = function(prj) onProject = function(prj)
vstudio.vs2010.generateProject(prj) vstudio.vs2010.generateProject(prj)
@ -47,8 +47,8 @@
vstudio.vs2010.generateRule(rule) vstudio.vs2010.generateRule(rule)
end, end,
onCleanWorkspace = function(wrk) onCleanWorkspace = function(wks)
vstudio.cleanSolution(wrk) vstudio.cleanSolution(wks)
end, end,
onCleanProject = function(prj) onCleanProject = function(prj)
vstudio.cleanProject(prj) vstudio.cleanProject(prj)

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

@ -39,8 +39,8 @@
-- Solution and project generation logic -- Solution and project generation logic
onWorkspace = function(wrk) onWorkspace = function(wks)
vstudio.vs2005.generateSolution(wrk) vstudio.vs2005.generateSolution(wks)
end, end,
onProject = function(prj) onProject = function(prj)
vstudio.vs2010.generateProject(prj) vstudio.vs2010.generateProject(prj)
@ -49,8 +49,8 @@
vstudio.vs2010.generateRule(rule) vstudio.vs2010.generateRule(rule)
end, end,
onCleanWorkspace = function(wrk) onCleanWorkspace = function(wks)
vstudio.cleanSolution(wrk) vstudio.cleanSolution(wks)
end, end,
onCleanProject = function(prj) onCleanProject = function(prj)
vstudio.cleanProject(prj) vstudio.cleanProject(prj)

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

@ -39,8 +39,8 @@
-- Solution and project generation logic -- Solution and project generation logic
onWorkspace = function(wrk) onWorkspace = function(wks)
vstudio.vs2005.generateSolution(wrk) vstudio.vs2005.generateSolution(wks)
end, end,
onProject = function(prj) onProject = function(prj)
vstudio.vs2010.generateProject(prj) vstudio.vs2010.generateProject(prj)
@ -49,8 +49,8 @@
vstudio.vs2010.generateRule(rule) vstudio.vs2010.generateRule(rule)
end, end,
onCleanWorkspace = function(wrk) onCleanWorkspace = function(wks)
vstudio.cleanSolution(wrk) vstudio.cleanSolution(wks)
end, end,
onCleanProject = function(prj) onCleanProject = function(prj)
vstudio.cleanProject(prj) vstudio.cleanProject(prj)

4
src/base/workspace.lua
View File

@ -25,8 +25,8 @@
--- ---
function workspace.new(name) function workspace.new(name)
local wrk = p.container.new(workspace, name) local wks = p.container.new(workspace, name)
return wrk return wks
end end

4
tests/testfx.lua
View File

@ -247,14 +247,14 @@
-- --
function test.createWorkspace() function test.createWorkspace()
local wrk = workspace("MySolution") local wks = workspace("MySolution")
configurations { "Debug", "Release" } configurations { "Debug", "Release" }
local prj = project("MyProject") local prj = project("MyProject")
language("C++") language("C++")
kind("ConsoleApp") kind("ConsoleApp")
return wrk, prj return wks, prj
end end
p.alias(test, "createWorkspace", "createsolution") p.alias(test, "createWorkspace", "createsolution")