From 04a7170d6c2907a469758e09f6558c1b03ee721d Mon Sep 17 00:00:00 2001
From: Jason Perkins <starkos@industriousone.com>
Date: Mon, 24 Aug 2015 17:08:09 -0400
Subject: [PATCH] Finish solution to workspace renames in core code

---
 src/_premake_init.lua               | 12 ++++++------
 src/actions/make/_make.lua          |  2 +-
 src/actions/make/make_workspace.lua |  8 ++++----
 src/base/workspace.lua              |  6 +++---
 tests/_tests.lua                    |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/_premake_init.lua b/src/_premake_init.lua
index 8d003ea4..8b2a392e 100644
--- a/src/_premake_init.lua
+++ b/src/_premake_init.lua
@@ -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",
diff --git a/src/actions/make/_make.lua b/src/actions/make/_make.lua
index 631d04cd..a38dfbc4 100644
--- a/src/actions/make/_make.lua
+++ b/src/actions/make/_make.lua
@@ -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)
diff --git a/src/actions/make/make_workspace.lua b/src/actions/make/make_workspace.lua
index a19c5b10..a2e9812f 100644
--- a/src/actions/make/make_workspace.lua
+++ b/src/actions/make/make_workspace.lua
@@ -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, {
diff --git a/src/base/workspace.lua b/src/base/workspace.lua
index 4d7ce865..ab6345dc 100644
--- a/src/base/workspace.lua
+++ b/src/base/workspace.lua
@@ -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
diff --git a/tests/_tests.lua b/tests/_tests.lua
index 67ad5dc5..14557396 100644
--- a/tests/_tests.lua
+++ b/tests/_tests.lua
@@ -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",