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

solution() and project() now only set the active object when called with a name; remains unchanged otherwise

Browse Source
This commit is contained in:
starkos 2009-01-19 16:56:40 +00:00
parent f2931efbc9
commit 60e383f8b8
6 changed files with 221 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -14,6 +14,8 @@ This version is a complete rewrite of Premake.
RC3 -> RC4
- Embed scripts instead of bytecodes to avoid portability issues
- solution() and project() now only set the active object when
called with a name; remains unchanged otherwise
RC2 -> RC3

7
premake4.lua
View File

@ -111,9 +111,6 @@ end
-- escape backslashes
s = s:gsub("\\", "\\\\")
-- strip duplicate line feeds
s = s:gsub("\n+", "\n")
-- escape line feeds
s = s:gsub("\n", "\\n")
@ -130,6 +127,10 @@ end
-- strip tabs
s = s:gsub("[\t]", "")
-- strip duplicate line feeds
s = s:gsub("\n+", "\n")
out:write("\t\"")
out:write(s)
out:write("\",\n")

32
src/base/api.lua
View File

@ -495,6 +495,10 @@
--
function configuration(keywords)
if not keywords then
return premake.CurrentConfiguration
end
local container, err = premake.getobject("container")
if (not container) then
error(err, 2)
@ -535,7 +539,10 @@
function project(name)
if (name) then
if not name then
return iif(type(premake.CurrentContainer) == "project", premake.CurrentContainer, nil)
end
-- identify the parent solution
local sln
if (type(premake.CurrentContainer) == "project") then
@ -569,20 +576,23 @@
prj.uuid = os.uuid()
prj.blocks = { }
end
end
if (type(premake.CurrentContainer) == "project") then
-- add an empty, global configuration to the project
configuration { }
return premake.CurrentContainer
else
return nil
end
end
function solution(name)
if (name) then
if not name then
if type(premake.CurrentContainer) == "project" then
return premake.CurrentContainer.solution
else
return premake.CurrentContainer
end
end
premake.CurrentContainer = _SOLUTIONS[name]
if (not premake.CurrentContainer) then
local sln = { }
@ -603,17 +613,9 @@
sln.blocks = { }
sln.configurations = { }
end
end
-- make the solution active and return it
if (type(premake.CurrentContainer) == "project") then
premake.CurrentContainer = premake.CurrentContainer.solution
end
if (premake.CurrentContainer) then
-- add an empty, global configuration
configuration { }
end
return premake.CurrentContainer
end

52
src/host/scripts.c
View File

File diff suppressed because one or more lines are too long

173
tests/test_api.lua
View File

@ -123,42 +123,76 @@
-- solution() tests
--
function T.api.solution_SetsCurrentObject()
sln = solution "MySolution"
function T.api.solution_SetsCurrentContainer_OnName()
test.istrue(sln == premake.CurrentContainer)
end
function T.api.solution_SetsName()
sln = solution "MySolution"
test.isequal("MySolution", sln.name)
function T.api.solution_CreatesNewObject_OnNewName()
solution "MySolution2"
test.isfalse(sln == premake.CurrentContainer)
end
function T.api.solution_SetsLocation()
sln = solution "MySolution"
test.isequal(os.getcwd(), sln.location)
function T.api.solution_ReturnsPrevious_OnExistingName()
solution "MySolution2"
local sln2 = solution "MySolution"
test.istrue(sln == sln2)
end
function T.api.solution_ReturnsNil_OnNoActiveSolution()
function T.api.solution_SetsCurrentContainer_OnExistingName()
solution "MySolution2"
solution "MySolution"
test.istrue(sln == premake.CurrentContainer)
end
function T.api.solution_ReturnsNil_OnNoActiveSolutionAndNoName()
premake.CurrentContainer = nil
test.isfalse(solution())
test.isnil(solution())
end
function T.api.solutions_ReturnsSolution_OnActiveProject()
sln = solution "MySolution"
project("MyProject")
function T.api.solution_ReturnsCurrentSolution_OnActiveSolutionAndNoName()
test.istrue(sln == solution())
end
function T.api.solution_OnNewName()
sln = solution "MySolution"
local sln2 = solution "MySolution2"
test.isfalse(sln == sln2)
function T.api.solution_ReturnsCurrentSolution_OnActiveProjectAndNoName()
project "MyProject"
test.istrue(sln == solution())
end
function T.api.solution_OnExistingName()
sln = solution "MySolution"
local sln2 = solution "MySolution2"
test.istrue(sln == solution("MySolution"))
function T.api.solution_LeavesProjectActive_OnActiveProjectAndNoName()
local prj = project "MyProject"
solution()
test.istrue(prj == premake.CurrentContainer)
end
function T.api.solution_LeavesConfigActive_OnActiveSolutionAndNoName()
local cfg = configuration "windows"
solution()
test.istrue(cfg == premake.CurrentConfiguration)
end
function T.api.solution_LeavesConfigActive_OnActiveProjectAndNoName()
project "MyProject"
local cfg = configuration "windows"
solution()
test.istrue(cfg == premake.CurrentConfiguration)
end
function T.api.solution_SetsName_OnNewName()
test.isequal("MySolution", sln.name)
end
function T.api.solution_SetsLocation_OnNewName()
test.isequal(os.getcwd(), sln.location)
end
function T.api.solution_AddsNewConfig_OnNewName()
test.istrue(#sln.blocks == 1)
end
function T.api.solution_AddsNewConfig_OnName()
local num = #sln.blocks
solution "MySolution"
test.istrue(#sln.blocks == num + 1)
end
@ -174,18 +208,21 @@
test.isfalse(ok)
end
function T.api.configuration_SetsCurrentConfiguration()
sln = solution("MySolution")
cfg = configuration{"Debug"}
function T.api.configuration_SetsCurrentConfiguration_OnKeywords()
local cfg = configuration {"Debug"}
test.istrue(premake.CurrentConfiguration == cfg)
end
function T.api.configuration_AddsToContainer()
sln = solution("MySolution")
cfg = configuration{"Debug"}
function T.api.configuration_AddsToContainer_OnKeywords()
local cfg = configuration {"Debug"}
test.istrue(cfg == sln.blocks[#sln.blocks])
end
function T.api.configuration_ReturnsCurrent_OnNoKeywords()
local cfg = configuration()
test.istrue(cfg == sln.blocks[1])
end
--
@ -199,63 +236,79 @@
test.isfalse(ok)
end
function T.api.project_SetsCurrentContainer()
sln = solution "MySolution"
prj = project("MyProject")
function T.api.project_SetsCurrentContainer_OnName()
local prj = project "MyProject"
test.istrue(prj == premake.CurrentContainer)
end
function T.api.project_AddsToSolution()
sln = solution "MySolution"
prj = project("MyProject")
function T.api.project_CreatesNewObject_OnNewName()
local prj = project "MyProject"
local pr2 = project "MyProject2"
test.isfalse(prj == premake.CurrentContainer)
end
function T.api.project_AddsToSolution_OnNewName()
local prj = project "MyProject"
test.istrue(prj == sln.projects[1])
end
function T.api.project_SetsName()
sln = solution "MySolution"
function T.api.project_ReturnsPrevious_OnExistingName()
local prj = project "MyProject"
local pr2 = project "MyProject2"
local pr3 = project "MyProject"
test.istrue(prj == pr3)
end
function T.api.project_SetsCurrentContainer_OnExistingName()
local prj = project "MyProject"
local pr2 = project "MyProject2"
local pr3 = project "MyProject"
test.istrue(prj == premake.CurrentContainer)
end
function T.api.project_ReturnsNil_OnNoActiveProjectAndNoName()
test.isnil(project())
end
function T.api.project_ReturnsCurrentProject_OnActiveProjectAndNoName()
local prj = project "MyProject"
test.istrue(prj == project())
end
function T.api.project_LeavesProjectActive_OnActiveProjectAndNoName()
local prj = project "MyProject"
project()
test.istrue(prj == premake.CurrentContainer)
end
function T.api.project_LeavesConfigActive_OnActiveProjectAndNoName()
local prj = project "MyProject"
local cfg = configuration "Windows"
project()
test.istrue(cfg == premake.CurrentConfiguration)
end
function T.api.project_SetsName_OnNewName()
prj = project("MyProject")
test.isequal("MyProject", prj.name)
end
function T.api.project_SetsLocation()
sln = solution "MySolution"
function T.api.project_SetsLocation_OnNewName()
prj = project("MyProject")
test.isequal(os.getcwd(), prj.location)
end
function T.api.project_SetsSolution()
sln = solution "MySolution"
function T.api.project_SetsSolution_OnNewName()
prj = project("MyProject")
test.istrue(sln == prj.solution)
end
function T.api.project_SetsConfiguration()
sln = solution "MySolution"
prj = project("MyProject")
test.istrue(premake.CurrentConfiguration == prj.blocks[1])
end
function T.api.project_ReturnsNil_OnNoActiveProject()
sln = solution "MySolution"
test.isfalse(project())
end
function T.api.project_OnNewName()
sln = solution "MySolution"
local prj = project "MyProject"
local prj2 = project "MyProject2"
test.isfalse(prj == prj2)
end
function T.api.project_OnExistingName()
sln = solution "MySolution"
local prj = project "MyProject"
local prj2 = project "MyProject2"
test.istrue(prj == project("MyProject"))
end
function T.api.project_SetsUUID()
sln = solution "MySolution"
local prj = project "MyProject"
test.istrue(prj.uuid)
end