Display deprecation warning for "ng" actions; properly reset state between unit tests

src/_premake_main.lua

@@ -36,6 +36,13 @@
 		_PREMAKE_COMMAND = path.getabsolute(_PREMAKE_COMMAND)
 
 
+		-- The "next-gen" actions have now replaced their deprecated counterparts. 
+		-- Provide a warning for a little while before I remove them entirely.
+		if _ACTION:endswith("ng") then
+			_ACTION = _ACTION:sub(1, -3)
+			print(string.format("** Warning: '%sng' has been deprecated; use '%s' instead", _ACTION, _ACTION))
+		end
+
 		-- Set up the environment for the chosen action early, so side-effects
 		-- can be picked up by the scripts.
 

src/base/api.lua

@@ -246,6 +246,20 @@
 	end
 
 
+--
+-- Clears all active API objects; resets to root configuration block.
+--
+
+	function api.reset()
+		api.scope = {
+			root = { 
+				configset = configset.root,
+				blocks = {}  -- TODO: remove this when switch-over to new APIs is done
+			}
+		}
+	end
+
+
 --
 -- Set a new array value. Arrays are lists of values stored by "value",
 -- in that new values overwrite old ones, rather than merging like lists.
@@ -887,17 +901,7 @@
 -- Everything below this point is a candidate for deprecation
 -----------------------------------------------------------------------------
 
-
---
--- Set up a dummy "root" container to hold global configuration data. This
--- can go away with the rest of this deprecated code when the new config
--- system is finished.
---
-
-	api.scope.root = {
-		configset = configset.root,
-		blocks = {}
-	}
+	api.reset()
 
 	premake.CurrentContainer = api.scope.root
 

tests/testfx.lua

@@ -241,7 +241,7 @@
 		_OS = _OS_host
 
 		premake.solution.list = { }
-		premake.api.scope = { }
+		premake.api.reset()
 
 		io.indent = nil
 		io.eol = "\n"