gib enums and linter kthx. sad

This commit is contained in:
Reece Wilson 2021-05-21 20:34:30 +01:00
parent a5bfff4ac6
commit 9f9cc90b72
2 changed files with 13 additions and 10 deletions

View File

@ -48,7 +48,7 @@ function JsonProcessor(info)
handleJSONInclude(result) handleJSONInclude(result)
elseif (result.type:lower() == "empty") then elseif (result.type:lower() == "empty") then
handleJSONInclude(result) handleJSONInclude(result)
elseif ((result.type:lower() == "utility") or (result.type:lower() == "null")) then elseif ((result.type:lower() == "utility") or (result.type:lower() == "blank")) then
return return
end end
@ -83,7 +83,7 @@ function JsonProcessor(info)
local handleLink = function(this) local handleLink = function(this)
dependson(this.info.name) dependson(this.info.name)
if ((type:lower() == "utility") or (type:lower() == "null")) then if ((type:lower() == "utility") or (type:lower() == "blank")) then
return return
end end
@ -94,7 +94,7 @@ function JsonProcessor(info)
local handleReference = function(this) local handleReference = function(this)
local type = this.result.type local type = this.result.type
if ((type:lower() == "utility") or (type:lower() == "null")) then if ((type:lower() == "utility") or (type:lower() == "blank")) then
return return
end end
@ -115,7 +115,7 @@ function JsonProcessor(info)
local name = a.info.name local name = a.info.name
local path = a.info.path local path = a.info.path
local isBlank = false local isUtility = false
if (result.type:lower() == "aurora") then if (result.type:lower() == "aurora") then
local srcPath = path .. "/Source" local srcPath = path .. "/Source"
@ -143,13 +143,13 @@ function JsonProcessor(info)
elseif (result.type:lower() == "utility") then elseif (result.type:lower() == "utility") then
project(name) project(name)
kind "utility" kind "utility"
isBlank = true isUtility = true
elseif (result.type:lower() == "null") then elseif (result.type:lower() == "blank") then
return return
else else
print "invalid auProject type" print "invalid project type"
os.exit() os.exit()
end end
@ -245,13 +245,13 @@ function JsonProcessor(info)
handleDepends(dep, true) handleDepends(dep, true)
end end
function handleSources(source, path) local handleSources = function(source, path)
files(path .. "/" .. source) files(path .. "/" .. source)
end end
forEach(result.require, handleRequire) forEach(result.require, handleRequire)
if (not isBlank) then if (not isUtility) then
forEach(result.features, handleFeature, info.path) forEach(result.features, handleFeature, info.path)
forEach(result.excludes, handleExcludes, info.path) forEach(result.excludes, handleExcludes, info.path)
forEach(result.sources, handleSources, info.path) forEach(result.sources, handleSources, info.path)

View File

@ -31,7 +31,7 @@ end
local setBestDebugDir = function(dest) local setBestDebugDir = function(dest)
if (not dest or dest:starts("[BUILD_PATH]")) then if (not dest or dest:starts("[BUILD_PATH]")) then
local append = dest and dest:sub(#"[BUILD_PATH]") local append = dest and dest:sub(#"[BUILD_PATH]" + 1)
if (not append) then append = "" end if (not append) then append = "" end
filter "configurations:Debug" filter "configurations:Debug"
@ -43,9 +43,12 @@ local setBestDebugDir = function(dest)
filter "configurations:Ship" filter "configurations:Ship"
debugdir(getroot() .. "/Build_Ship/" .. append) debugdir(getroot() .. "/Build_Ship/" .. append)
print("DEBUG", append)
filter {} filter {}
else else
local path = getroot() .. dest local path = getroot() .. dest
print("DEBUG", path)
debugdir(path) debugdir(path)
end end
end end