Finish solution to workspace renames in core code
This commit is contained in:
parent
d57699204d
commit
04a7170d6c
@ -880,7 +880,7 @@
|
||||
|
||||
api.register {
|
||||
name = "startproject",
|
||||
scope = "solution",
|
||||
scope = "workspace",
|
||||
kind = "string",
|
||||
tokens = true,
|
||||
}
|
||||
@ -976,11 +976,11 @@
|
||||
end,
|
||||
}
|
||||
|
||||
api.register {
|
||||
name = "customtoolnamespace",
|
||||
scope = "config",
|
||||
kind = "string",
|
||||
}
|
||||
api.register {
|
||||
name = "customtoolnamespace",
|
||||
scope = "config",
|
||||
kind = "string",
|
||||
}
|
||||
|
||||
api.register {
|
||||
name = "undefines",
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
onWorkspace = function(wks)
|
||||
premake.escaper(make.esc)
|
||||
premake.generate(wks, make.getmakefilename(wks, false), make.generate_solution)
|
||||
premake.generate(wks, make.getmakefilename(wks, false), make.generate_workspace)
|
||||
end,
|
||||
|
||||
onProject = function(prj)
|
||||
|
@ -14,15 +14,15 @@
|
||||
-- Generate a GNU make "workspace" makefile, with support for the new platforms API.
|
||||
--
|
||||
|
||||
function make.generate_solution(wks)
|
||||
premake.eol("\n")
|
||||
function make.generate_workspace(wks)
|
||||
p.eol("\n")
|
||||
|
||||
make.header(wks)
|
||||
|
||||
make.configmap(wks)
|
||||
make.projects(wks)
|
||||
|
||||
make.solutionPhonyRule(wks)
|
||||
make.workspacePhonyRule(wks)
|
||||
make.groupRules(wks)
|
||||
|
||||
make.projectrules(wks)
|
||||
@ -109,7 +109,7 @@
|
||||
-- Write out the workspace PHONY rule
|
||||
--
|
||||
|
||||
function make.solutionPhonyRule(wks)
|
||||
function make.workspacePhonyRule(wks)
|
||||
local groups = {}
|
||||
local tr = p.workspace.grouptree(wks)
|
||||
tree.traverse(tr, {
|
||||
|
@ -11,10 +11,10 @@
|
||||
|
||||
|
||||
---
|
||||
-- Begin the switch from solution() to workspace().
|
||||
-- Switch this container's name from "solution" to "workspace"
|
||||
--
|
||||
-- We changed "solution" to "workspace" on 30 Jul 2015. While it might be
|
||||
-- nice to leave `solution()` around for VS folks and everyone used to the
|
||||
-- We changed these names on 30 Jul 2015. While it might be nice to leave
|
||||
-- `solution()` around for Visual Studio folks and everyone still used to the
|
||||
-- old system, it would be good to eventually deprecate and remove all of
|
||||
-- the other, more internal uses of "solution" and "sln". Probably including
|
||||
-- all uses of container class aliases, since we probably aren't going to
|
||||
|
@ -18,7 +18,7 @@ return {
|
||||
"base/test_uuid.lua",
|
||||
"base/test_versions.lua",
|
||||
|
||||
-- Solution object tests
|
||||
-- Workspace object tests
|
||||
"solution/test_eachconfig.lua",
|
||||
"solution/test_location.lua",
|
||||
"solution/test_objdirs.lua",
|
||||
@ -134,7 +134,7 @@ return {
|
||||
"actions/make/test_make_escaping.lua",
|
||||
"actions/make/test_make_tovar.lua",
|
||||
|
||||
-- Makefile solutions
|
||||
-- Makefile workspaces
|
||||
"actions/make/solution/test_config_maps.lua",
|
||||
"actions/make/solution/test_default_config.lua",
|
||||
"actions/make/solution/test_group_rule.lua",
|
||||
|
Loading…
Reference in New Issue
Block a user