Build: Convert spaces to tabs

Former-commit-id: c6be47cd6c0945a43472d79efdae28c4ff633b04 [formerly 858f001b7ee5f7e0e8af2421cbc01222fca6d576]
Former-commit-id: fa48639f86989da1aa99d8e43c5293a27a8a10b4
This commit is contained in:
Lynix
2016-06-12 10:06:27 +02:00
parent daa49db2da
commit bd785b9e0e

View File

@@ -15,7 +15,7 @@ function NazaraBuild:Execute()
if (self.Actions[_ACTION] == nil) then if (self.Actions[_ACTION] == nil) then
local makeLibDir = os.is("windows") and "mingw" or "gmake" local makeLibDir = os.is("windows") and "mingw" or "gmake"
if (_OPTIONS["with-extlibs"]) then if (_OPTIONS["with-extlibs"]) then
workspace("NazaraExtlibs") workspace("NazaraExtlibs")
platforms(platformData) platforms(platformData)
@@ -68,9 +68,9 @@ function NazaraBuild:Execute()
configuration("Release*") configuration("Release*")
flags("NoFramePointer") flags("NoFramePointer")
optimize("Speed") optimize("Speed")
rtti("Off") rtti("Off")
vectorextensions("SSE2") vectorextensions("SSE2")
configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"}) configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"})
buildoptions("-mfpmath=sse") -- Utilisation du SSE pour les calculs flottants buildoptions("-mfpmath=sse") -- Utilisation du SSE pour les calculs flottants
@@ -130,10 +130,10 @@ function NazaraBuild:Execute()
flags("Symbols") flags("Symbols")
configuration("Release*") configuration("Release*")
flags("NoFramePointer") flags("NoFramePointer")
optimize("Speed") optimize("Speed")
rtti("Off") rtti("Off")
vectorextensions("SSE2") vectorextensions("SSE2")
configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"}) configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"})
buildoptions("-mfpmath=sse") -- Utilisation du SSE pour les calculs flottants buildoptions("-mfpmath=sse") -- Utilisation du SSE pour les calculs flottants
@@ -497,24 +497,24 @@ function NazaraBuild:Initialize()
ACTION = nil ACTION = nil
-- Extern libraries -- Extern libraries
local extlibs = os.matchfiles("../extlibs/build/*.lua") local extlibs = os.matchfiles("../extlibs/build/*.lua")
for k,v in pairs(extlibs) do for k,v in pairs(extlibs) do
local f, err = loadfile(v) local f, err = loadfile(v)
if (f) then if (f) then
LIBRARY = {} LIBRARY = {}
self:SetupInfoTable(LIBRARY) self:SetupInfoTable(LIBRARY)
f() f()
local succeed, err = self:RegisterExternLibrary(LIBRARY) local succeed, err = self:RegisterExternLibrary(LIBRARY)
if (not succeed) then if (not succeed) then
print("Unable to register extern library: " .. err) print("Unable to register extern library: " .. err)
end end
else else
print("Unable to load extern library file: " .. err) print("Unable to load extern library file: " .. err)
end end
end end
LIBRARY = nil LIBRARY = nil
-- Then the modules -- Then the modules
local modules = os.matchfiles("scripts/modules/*.lua") local modules = os.matchfiles("scripts/modules/*.lua")
@@ -596,17 +596,17 @@ function NazaraBuild:Initialize()
local tables = {self.ExtLibs, self.Modules, self.Tools, self.Examples} local tables = {self.ExtLibs, self.Modules, self.Tools, self.Examples}
local orderedTables = {self.OrderedExtLibs, self.OrderedModules, self.OrderedTools, self.OrderedExamples} local orderedTables = {self.OrderedExtLibs, self.OrderedModules, self.OrderedTools, self.OrderedExamples}
for k,projects in ipairs(tables) do for k,projects in ipairs(tables) do
-- Begin by resolving every project (because of dependencies in the same category) -- Begin by resolving every project (because of dependencies in the same category)
for projectId,projectTable in pairs(projects) do for projectId,projectTable in pairs(projects) do
self:Resolve(projectTable) self:Resolve(projectTable)
end end
for projectId,projectTable in pairs(projects) do for projectId,projectTable in pairs(projects) do
if (self:Process(projectTable)) then if (self:Process(projectTable)) then
table.insert(orderedTables[k], projectTable) table.insert(orderedTables[k], projectTable)
else else
print("Rejected " .. projectTable.Name .. " " .. string.lower(projectTable.Type) .. ": " .. projectTable.ExcludeReason) print("Rejected " .. projectTable.Name .. " " .. string.lower(projectTable.Type) .. ": " .. projectTable.ExcludeReason)
end end
end end
table.sort(orderedTables[k], function (a, b) return a.Name < b.Name end) table.sort(orderedTables[k], function (a, b) return a.Name < b.Name end)
@@ -774,11 +774,11 @@ function NazaraBuild:Process(infoTable)
local toolTable = projectName and self.Tools[projectName:lower()] local toolTable = projectName and self.Tools[projectName:lower()]
if (moduleTable) then if (moduleTable) then
if (moduleTable.Excluded) then if (moduleTable.Excluded) then
infoTable.Excluded = true infoTable.Excluded = true
infoTable.ExcludeReason = "depends on excluded " .. projectName .. " module" infoTable.ExcludeReason = "depends on excluded " .. projectName .. " module"
return false return false
end end
if (_OPTIONS["united"]) then if (_OPTIONS["united"]) then
library = "NazaraEngine" library = "NazaraEngine"
@@ -795,11 +795,11 @@ function NazaraBuild:Process(infoTable)
else else
local extLibTable = self.ExtLibs[library:lower()] local extLibTable = self.ExtLibs[library:lower()]
if (extLibTable) then if (extLibTable) then
if (extLibTable.Excluded) then if (extLibTable.Excluded) then
infoTable.Excluded = true infoTable.Excluded = true
infoTable.ExcludeReason = "depends on excluded " .. extLibTable.Name .. " external library" infoTable.ExcludeReason = "depends on excluded " .. extLibTable.Name .. " external library"
return false return false
end end
library = extLibTable.Name library = extLibTable.Name
@@ -809,11 +809,11 @@ function NazaraBuild:Process(infoTable)
table.insert(infoTable.ConfigurationLibraries.ReleaseDynamic, library .. "-s") table.insert(infoTable.ConfigurationLibraries.ReleaseDynamic, library .. "-s")
else else
if (toolTable and toolTable.Kind == "library") then if (toolTable and toolTable.Kind == "library") then
if (toolTable.Excluded) then if (toolTable.Excluded) then
infoTable.Excluded = true infoTable.Excluded = true
infoTable.ExcludeReason = "depends on excluded " .. toolTable.Name .. " tool" infoTable.ExcludeReason = "depends on excluded " .. toolTable.Name .. " tool"
return false return false
end end
library = "Nazara" .. toolTable.Name library = "Nazara" .. toolTable.Name
@@ -876,14 +876,14 @@ function NazaraBuild:Process(infoTable)
end end
end end
return true return true
end end
function NazaraBuild:Resolve(infoTable) function NazaraBuild:Resolve(infoTable)
if (infoTable.ClientOnly and _OPTIONS["server"]) then if (infoTable.ClientOnly and _OPTIONS["server"]) then
infoTable.Excluded = true infoTable.Excluded = true
infoTable.ExcludeReason = "excluded by command-line options (client-only)" infoTable.ExcludeReason = "excluded by command-line options (client-only)"
end end
if (infoTable.Excludable) then if (infoTable.Excludable) then
local optionName = "excludes-" .. string.lower(infoTable.Type .. "-" .. infoTable.Name) local optionName = "excludes-" .. string.lower(infoTable.Type .. "-" .. infoTable.Name)
@@ -898,15 +898,15 @@ function NazaraBuild:Resolve(infoTable)
end end
end end
if (type(infoTable.Libraries) == "function") then if (type(infoTable.Libraries) == "function") then
infoTable.Libraries = infoTable.Libraries() infoTable.Libraries = infoTable.Libraries()
end end
end end
function NazaraBuild:MakeCopyAfterBuild(infoTable) function NazaraBuild:MakeCopyAfterBuild(infoTable)
if (PremakeVersion < 50) then if (PremakeVersion < 50) then
return return
end end
if (os.is("windows")) then if (os.is("windows")) then
configuration({}) configuration({})