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

Use 'workspace' instead of 'solution'.

Browse Source
This commit is contained in:
Tom van Dijck 2017-06-20 14:35:53 -07:00
parent d44dae735a
commit b7d140330b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/raw/_preload.lua
View File

@ -7,7 +7,7 @@ newaction
onsolution = function(sln) onsolution = function(sln)
require('raw') require('raw')
premake.generate(sln, ".raw", premake.raw.solution) premake.generate(sln, ".raw", premake.raw.workspace)
end, end,
} }

8
modules/raw/raw_action.lua
View File

@ -3,10 +3,10 @@ p.raw = { }
local raw = p.raw local raw = p.raw
local gvisited = { } local gvisited = { }
function raw.solution(sln) function raw.workspace(wks)
if not gvisited[sln.global] then if not gvisited[wks.global] then
gvisited[sln.global] = true gvisited[wks.global] = true
raw.printTable({ global = sln.global }) raw.printTable({ global = wks.global })
end end
end end

2
modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua
View File

@ -22,7 +22,7 @@
end end
local function prepare() local function prepare()
local prj = p.solution.getproject(wks, 1) local prj = p.workspace.getproject(wks, 1)
vc2010.ensureNuGetPackageBuildImports(prj) vc2010.ensureNuGetPackageBuildImports(prj)
end end

2
modules/vstudio/tests/vc2010/test_nuget_packages_config.lua
View File

@ -23,7 +23,7 @@
end end
local function prepare() local function prepare()
local prj = p.solution.getproject(wks, 1) local prj = p.workspace.getproject(wks, 1)
nuget2010.generatePackagesConfig(prj) nuget2010.generatePackagesConfig(prj)
end end

2
modules/vstudio/vs2005_csproj.lua
View File

@ -447,7 +447,7 @@
-- <Reference Include="nunit.framework"> -- <Reference Include="nunit.framework">
_x(2, '<Reference Include="%s">', path.getbasename(file)) _x(2, '<Reference Include="%s">', path.getbasename(file))
_x(3, '<HintPath>%s</HintPath>', vstudio.path(prj, p.filename(prj.solution, string.format("packages\\%s.%s\\%s", id, packageAPIInfo.verbatimVersion or packageAPIInfo.version, file)))) _x(3, '<HintPath>%s</HintPath>', vstudio.path(prj, p.filename(prj.workspace, string.format("packages\\%s.%s\\%s", id, packageAPIInfo.verbatimVersion or packageAPIInfo.version, file))))
if config.isCopyLocal(prj, package, true) then if config.isCopyLocal(prj, package, true) then
_p(3, '<Private>True</Private>') _p(3, '<Private>True</Private>')

2
modules/vstudio/vs2010_vcxproj.lua
View File

@ -1589,7 +1589,7 @@
local function nuGetTargetsFile(prj, package) local function nuGetTargetsFile(prj, package)
local packageAPIInfo = vstudio.nuget2010.packageAPIInfo(prj, package) local packageAPIInfo = vstudio.nuget2010.packageAPIInfo(prj, package)
return p.vstudio.path(prj, p.filename(prj.solution, string.format("packages\\%s.%s\\build\\native\\%s.targets", vstudio.nuget2010.packageId(package), packageAPIInfo.verbatimVersion or packageAPIInfo.version, vstudio.nuget2010.packageId(package)))) return p.vstudio.path(prj, p.filename(prj.workspace, string.format("packages\\%s.%s\\build\\native\\%s.targets", vstudio.nuget2010.packageId(package), packageAPIInfo.verbatimVersion or packageAPIInfo.version, vstudio.nuget2010.packageId(package))))
end end
function m.importNuGetTargets(prj) function m.importNuGetTargets(prj)