Merge pull request #2586 from nickclark2016/deprecate-flags

Remove remaining usages of flags in Premake

Author: nickclark2016

modules/gmake/gmake_cpp.lua

@@ -563,7 +563,7 @@
 		local fcfg = fileconfig.getconfig(file, cfg)
 		local flags = {}
 
-		if cfg.pchheader and not cfg.flags.NoPCH and (not fcfg or not fcfg.flags.NoPCH) then
+		if cfg.pchheader and cfg.enablepch ~= p.OFF and (not fcfg or fcfg.enablepch ~= p.OFF) then
 			table.insert(flags, "-include $(PCH_PLACEHOLDER)")
 		end
 

modules/gmakelegacy/gmakelegacy_cpp.lua

@@ -513,7 +513,7 @@ end
 
 	function make.forceInclude(cfg, toolset)
 		local includes = toolset.getforceincludes(cfg)
-		if not cfg.flags.NoPCH and cfg.pchheader then
+		if cfg.enablepch ~= p.OFF and cfg.pchheader then
 			table.insert(includes, 1, "-include $(OBJDIR)/$(notdir $(PCH))")
 		end
 		_x('  FORCE_INCLUDE +=%s', make.list(includes))

modules/ninja/ninja_cpp.lua

@@ -532,7 +532,7 @@ function m.getLdFlags(cfg, toolset)
 end
 
 function m.getPchPath(cfg)
-	if not cfg.pchheader or cfg.flags.NoPCH then
+	if not cfg.pchheader or cfg.enablepch == p.OFF then
 		return nil
 	end
 
@@ -552,7 +552,7 @@ function m.getPchPath(cfg)
 end
 
 function m.buildPch(cfg)
-	if not cfg.pchheader or cfg.flags.NoPCH then
+	if not cfg.pchheader or cfg.enablepch == p.OFF then
 		return nil
 	end
 
@@ -806,7 +806,7 @@ function m.buildFile(cfg, node, filecfg, objFile, pchFile, prebuildTarget)
 		local relPath = path.getrelative(cfg.workspace.location, node.abspath)
 		local implicitDeps = ""
 
-		local usePch = cfg.pchheader and not cfg.flags.NoPCH and (not filecfg or not filecfg.flags.NoPCH)
+		local usePch = cfg.pchheader and cfg.enablepch ~= p.OFF and (not filecfg or filecfg.enablepch ~= p.OFF)
 		if pchFile and usePch then
 			implicitDeps = implicitDeps .. " | " .. pchFile
 		end

modules/vstudio/vs2010_vcxproj.lua

@@ -4416,8 +4416,8 @@
 	end
 
 	function m.androidShortEnums(cfg)
-		if cfg.flags.UseShortEnums ~= nil then
-			m.element(UseShortEnums, nil, "true")
+		if cfg.useshortenums then
+			m.element("UseShortEnums", nil, iif(cfg.useshortenums == "On", "true", "false"))
 		end
 	end
 
@@ -4450,7 +4450,7 @@
 	end
 
 	function m.androidGenerateMapFile(cfg)
-		if cfg.flags.Maps then
+		if cfg.mapfile == p.ON then
 			-- Android specifies a name. Other platforms use the project name
 			-- so we do the same thing here
 			m.element("GenerateMapFile", nil, cfg.project.name..".map")

modules/xcode/xcode_common.lua

@@ -1502,7 +1502,7 @@
 		local optimizeMap = { On = 3, Size = 's', Speed = 3, Full = 'fast', Debug = 'g' }
 		settings['GCC_OPTIMIZATION_LEVEL'] = optimizeMap[cfg.optimize] or 0
 
-		if cfg.pchheader and not cfg.flags.NoPCH then
+		if cfg.pchheader and cfg.enablepch ~= p.OFF then
 			settings['GCC_PRECOMPILE_PREFIX_HEADER'] = 'YES'
 			settings['GCC_PREFIX_HEADER'] = cfg.pchheader
 		end

premake5.lua

@@ -275,16 +275,16 @@
 			symbols	    "On"
 
 		filter "configurations:Release"
-			defines     "NDEBUG"
-			optimize    "Full"
-			flags       { "NoRuntimeChecks" }
+			defines             "NDEBUG"
+			optimize            "Full"
+			runtimechecks       "Off"
 			buffersecuritycheck "Off"
 
 		filter "action:vs*"
 			defines     { "_CRT_SECURE_NO_DEPRECATE", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_WARNINGS" }
 
 		filter { "system:windows", "configurations:Release" }
-			flags       { "NoIncrementalLink" }
+			incrementallink "Off"
 
 		-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
 		filter { "system:windows", "configurations:Release", "toolset:not gcc" }

src/_premake_init.lua

@@ -1465,6 +1465,21 @@
 		excludefrombuild("Off")
 	end)
 
+	api.register {
+		name = "useshortenums",
+		scope = "config",
+		kind = "string",
+		allowed = {
+			"Default",
+			"On",
+			"Off"
+		}
+	}
+
+	api.deprecateField("flags", "Use dedicated APIs instead.",
+	function(value)
+	end)
+
 -----------------------------------------------------------------------------
 --
 -- Field name aliases for backward compatibility

src/base/api.lua

@@ -445,8 +445,8 @@
 			end
 		else
 			local field = p.fields[name]
-			field.deprecated = field.deprecated or {}
-			field.deprecated[value] = {
+			field.deprecatedvalues = field.deprecatedvalues or {}
+			field.deprecatedvalues[value] = {
 				add = addHandler,
 				remove = removeHandler,
 				message = message
@@ -548,7 +548,7 @@
 			error(err, 3)
 		end
 
-		local hasDeprecatedValues = (type(field.deprecated) == "table")
+		local hasDeprecatedValues = (type(field.deprecatedvalues) == "table")
 
 		-- Build a list of values to be removed. If this field has deprecated
 		-- values, check to see if any of those are going to be removed by this
@@ -558,8 +558,8 @@
 		local removes = {}
 
 		local function check(value)
-			if field.deprecated[value] then
-				local handler = field.deprecated[value]
+			if field.deprecatedvalues[value] then
+				local handler = field.deprecatedvalues[value]
 				if handler.remove then handler.remove(value) end
 				if handler.message and api._deprecations ~= "off" then
 					local caller = filelineinfo(8)
@@ -597,7 +597,7 @@
 					error { msg=err }
 				end
 
-				if field.deprecated then
+				if field.deprecatedvalues then
 					check(value)
 				end
 
@@ -681,8 +681,8 @@
 				return nil, "invalid value '" .. value .. "' for " .. field.name
 			end
 
-			if field.deprecated and field.deprecated[canonical] then
-				local handler = field.deprecated[canonical]
+			if field.deprecatedvalues and field.deprecatedvalues[canonical] then
+				local handler = field.deprecatedvalues[canonical]
 				handler.add(canonical)
 				if handler.message and api._deprecations ~= "off" then
 					local caller =  filelineinfo(9)

src/tools/clang.lua

@@ -73,6 +73,7 @@
 			Fast = "-flto=thin",
 		},
 		profile = gcc.shared.profile,
+		useshortenums = gcc.shared.useshortenums,
 	}
 
 	clang.cflags = table.merge(gcc.cflags, {

src/tools/dotnet.lua

@@ -149,11 +149,6 @@
 				info.SubType = fcfg.buildaction
 			end
 
-			-- This flag is deprecated, will remove eventually
-			if fcfg.flags and fcfg.flags.Component then
-				info.SubType = "Component"
-			end
-
 		end
 
 		if info.action == "Content" then