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

Merge branch 'master' into ssurtees/bsd

Browse Source
This commit is contained in:
Jason Perkins 2017-04-14 10:24:40 -04:00 committed by GitHub
commit 54ab932971
5 changed files with 83 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/xcode/tests/test_xcode_project.lua
View File

@ -1125,8 +1125,7 @@
end
function suite.XCBuildConfigurationProject_OnOptimize()
--flags { "Optimize" }
function suite.XCBuildConfigurationProject_OnOptimizeSize()
optimize "Size"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
@ -1153,7 +1152,7 @@
function suite.XCBuildConfigurationProject_OnOptimizeSpeed()
flags { "OptimizeSpeed" }
optimize "Speed"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
test.capture [[
@ -1411,7 +1410,6 @@
function suite.XCBuildConfigurationProject_OnExtraWarnings()
--flags { "ExtraWarnings" }
warnings "Extra"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
@ -1495,7 +1493,7 @@
function suite.XCBuildConfigurationProject_OnFloatStrict()
flags { "FloatStrict" }
floatingpoint "Strict"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
test.capture [[
@ -1524,7 +1522,7 @@
function suite.XCBuildConfigurationProject_OnNoEditAndContinue()
flags { "NoEditAndContinue" }
editandcontinue "Off"
symbols "On"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
@ -2046,7 +2044,7 @@ function suite.defaultVisibilitySetting_setToNo()
end
function suite.releaseBuild_onlyDefaultArch_equalsNo()
flags { "Optimize" }
optimize "On"
prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[2])
local str = premake.captured()

6
modules/xcode/xcode_common.lua
View File

@ -1032,7 +1032,7 @@
settings['GCC_ENABLE_CPP_RTTI'] = 'NO'
end
if cfg.symbols == p.ON and not cfg.flags.NoEditAndContinue then
if cfg.symbols == p.ON and cfg.editandcontinue ~= "Off" then
settings['GCC_ENABLE_FIX_AND_CONTINUE'] = 'YES'
end
@ -1095,8 +1095,8 @@
-- build list of "other" C/C++ flags
local checks = {
["-ffast-math"] = cfg.flags.FloatFast,
["-ffloat-store"] = cfg.flags.FloatStrict,
["-ffast-math"] = cfg.floatingpoint == "Fast",
["-ffloat-store"] = cfg.floatingpoint == "Strict",
["-fomit-frame-pointer"] = cfg.flags.NoFramePointer,
}

3
premake5.lua
View File

@ -94,7 +94,8 @@
configurations { "Release", "Debug" }
location ( _OPTIONS["to"] )
flags { "No64BitChecks", "ExtraWarnings", "StaticRuntime", "MultiProcessorCompile" }
flags { "No64BitChecks", "StaticRuntime", "MultiProcessorCompile" }
warnings "Extra"
if not _OPTIONS["no-zlib"] then
defines { "PREMAKE_COMPRESSION" }

151
src/_premake_init.lua
View File

@ -480,7 +480,6 @@
"No64BitChecks",
"NoCopyLocal",
"NoEditAndContinue", -- DEPRECATED
"NoExceptions", -- DEPRECATED
"NoFramePointer",
"NoImplicitLink",
"NoImportLib",
@ -490,7 +489,6 @@
"NoNativeWChar", -- DEPRECATED
"NoPCH",
"NoRuntimeChecks",
"NoRTTI", -- DEPRECATED
"NoBufferSecurityCheck",
"NoWarnings", -- DEPRECATED
"OmitDefaultLibrary",
@ -499,13 +497,10 @@
"OptimizeSpeed", -- DEPRECATED
"RelativeLinks",
"ReleaseRuntime", -- DEPRECATED
"SEH", -- DEPRECATED
"ShadowedVariables",
"StaticRuntime",
"Symbols", -- DEPRECATED
"UndefinedIdentifiers",
"Unicode", -- DEPRECATED
"Unsafe", -- DEPRECATED
"WinMain",
"WPF",
"C++11", -- DEPRECATED
@ -1210,9 +1205,9 @@
--
-----------------------------------------------------------------------------
-- 09 Apr 2013
-- 13 Apr 2017
api.deprecateField("buildrule", nil,
api.deprecateField("buildrule", 'Use `buildcommands`, `buildoutputs`, and `buildmessage` instead.',
function(value)
if value.description then
buildmessage(value.description)
@ -1222,83 +1217,119 @@
end)
-- 17 Jun 2013
api.deprecateValue("flags", "Component", nil,
api.deprecateValue("flags", "Component", 'Use `buildaction "Component"` instead.',
function(value)
buildaction "Component"
end)
-- 26 Sep 2013
api.deprecateValue("flags", { "EnableSSE", "EnableSSE2" }, nil,
api.deprecateValue("flags", "EnableSSE", 'Use `vectorextensions "SSE"` instead.',
function(value)
vectorextensions(value:sub(7))
vectorextensions("SSE")
end,
function(value)
vectorextensions "Default"
end)
api.deprecateValue("flags", { "FloatFast", "FloatStrict" }, nil,
api.deprecateValue("flags", "EnableSSE2", 'Use `vectorextensions "SSE2"` instead.',
function(value)
floatingpoint(value:sub(6))
vectorextensions("SSE2")
end,
function(value)
vectorextensions "Default"
end)
api.deprecateValue("flags", "FloatFast", 'Use `floatingpoint "Fast"` instead.',
function(value)
floatingpoint("Fast")
end,
function(value)
floatingpoint "Default"
end)
api.deprecateValue("flags", { "NativeWChar", "NoNativeWChar" }, nil,
api.deprecateValue("flags", "FloatStrict", 'Use `floatingpoint "Strict"` instead.',
function(value)
local map = { NativeWChar = "On", NoNativeWChar = "Off" }
nativewchar(map[value] or "Default")
floatingpoint("Strict")
end,
function(value)
floatingpoint "Default"
end)
api.deprecateValue("flags", "NativeWChar", 'Use `nativewchar "On"` instead."',
function(value)
nativewchar("On")
end,
function(value)
nativewchar "Default"
end)
api.deprecateValue("flags", { "Optimize", "OptimizeSize", "OptimizeSpeed" }, nil,
api.deprecateValue("flags", "NoNativeWChar", 'Use `nativewchar "Off"` instead."',
function(value)
local map = { Optimize = "On", OptimizeSize = "Size", OptimizeSpeed = "Speed" }
optimize (map[value] or "Off")
nativewchar("Off")
end,
function(value)
optimize "Off"
nativewchar "Default"
end)
api.deprecateValue("flags", { "ReleaseRuntime" }, nil,
function(value)
runtime 'Release'
end,
function(value)
end)
api.deprecateValue("flags", { "Optimise", "OptimiseSize", "OptimiseSpeed" }, nil,
api.deprecateValue("flags", "Optimize", 'Use `optimize "On"` instead.',
function(value)
local map = { Optimise = "On", OptimiseSize = "Size", OptimiseSpeed = "Speed" }
optimize (map[value] or "Off")
optimize ("On")
end,
function(value)
optimize "Off"
end)
api.deprecateValue("flags", { "ExtraWarnings", "NoWarnings" }, nil,
api.deprecateValue("flags", "OptimizeSize", 'Use `optimize "Size"` instead.',
function(value)
local map = { ExtraWarnings = "Extra", NoWarnings = "Off" }
warnings (map[value] or "Default")
optimize ("Size")
end,
function(value)
optimize "Off"
end)
api.deprecateValue("flags", "OptimizeSpeed", 'Use `optimize "Speed"` instead.',
function(value)
optimize ("Speed")
end,
function(value)
optimize "Off"
end)
api.deprecateValue("flags", "ReleaseRuntime", 'Use `runtime "Release"` instead.',
function(value)
runtime "Release"
end,
function(value)
end)
api.deprecateValue("flags", "ExtraWarnings", 'Use `warnings "Extra"` instead.',
function(value)
warnings "Extra"
end,
function(value)
warnings "Default"
end)
-- 10 Nov 2014
api.deprecateValue("flags", "NoWarnings", 'Use `warnings "Off"` instead.',
function(value)
warnings "Off"
end,
function(value)
warnings "Default"
end)
api.deprecateValue("flags", "Managed", nil,
api.deprecateValue("flags", "Managed", 'Use `clr "On"` instead.',
function(value)
clr "On"
end,
@ -1307,7 +1338,7 @@
end)
api.deprecateValue("flags", "NoEditAndContinue", nil,
api.deprecateValue("flags", "NoEditAndContinue", 'Use editandcontinue "Off"` instead.',
function(value)
editandcontinue "Off"
end,
@ -1316,49 +1347,6 @@
end)
api.deprecateValue("flags", "NoExceptions", 'Use `exceptionhandling "Off"` instead',
function(value)
exceptionhandling "Off"
end,
function(value)
exceptionhandling "On"
end)
api.deprecateValue("flags", "NoRTTI", 'Use `rtti "Off"` instead',
function(value)
rtti "Off"
end,
function(value)
rtti "On"
end)
api.deprecateValue("flags", "SEH", 'Use `exceptionhandling "SEH"` instead',
function(value)
exceptionhandling "SEH"
end,
function(value)
exceptionhandling "Default"
end)
api.deprecateValue("flags", "Unsafe", 'Use `clr "Unsafe"` instead',
function(value)
clr "Unsafe"
end,
function(value)
clr "On"
end)
-- 18 Dec 2015
api.deprecateValue("flags", "Unicode", 'Use `characterset "Unicode"` instead',
function(value)
characterset "Unicode"
end,
function(value)
characterset "Default"
end)
-- 21 June 2016
api.deprecateValue("flags", "Symbols", 'Use `symbols "On"` instead',
@ -1378,6 +1366,7 @@
api.deprecateValue("flags", "C99", 'Use `language "C99"` instead', function(value) end, function(value) end)
api.deprecateValue("flags", "C11", 'Use `language "C11"` instead', function(value) end, function(value) end)
-----------------------------------------------------------------------------
--
-- Install Premake's default set of command line arguments.

6
src/base/api.lua
View File

@ -490,7 +490,7 @@
if field.deprecated and type(field.deprecated.handler) == "function" then
field.deprecated.handler(value)
if field.deprecated.message and api._deprecations ~= "off" then
premake.warnOnce(field.name, "the field %s has been deprecated.\n %s", field.name, field.deprecated.message)
premake.warnOnce(field.name, "the field %s has been deprecated and will be removed.\n %s", field.name, field.deprecated.message)
if api._deprecations == "error" then error("deprecation errors enabled", 3) end
end
end
@ -542,7 +542,7 @@
if handler.remove then handler.remove(value) end
if handler.message and api._deprecations ~= "off" then
local key = field.name .. "_" .. value
premake.warnOnce(key, "the %s value %s has been deprecated.\n %s", field.name, value, handler.message)
premake.warnOnce(key, "the %s value %s has been deprecated and will be removed.\n %s", field.name, value, handler.message)
if api._deprecations == "error" then
error { msg="deprecation errors enabled" }
end
@ -648,7 +648,7 @@
handler.add(canonical)
if handler.message and api._deprecations ~= "off" then
local key = field.name .. "_" .. value
premake.warnOnce(key, "the %s value %s has been deprecated.\n %s", field.name, canonical, handler.message)
premake.warnOnce(key, "the %s value %s has been deprecated and will be removed.\n %s", field.name, canonical, handler.message)
if api._deprecations == "error" then
return nil, "deprecation errors enabled"
end