publish changes
This commit is contained in:
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
@ -68,6 +68,6 @@
|
|||
local oldos = _OS
|
||||
_OS = "linux"
|
||||
premake.action.set("vs2008")
|
||||
test.isequal(_OS, "windows")
|
||||
test.isequal(_OS, "arch")
|
||||
_OS = oldos
|
||||
end
|
||||
|
|
|
@ -219,14 +219,14 @@
|
|||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveSolutionAndNoName()
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveProjectAndNoName()
|
||||
project "MyProject"
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
--
|
||||
|
||||
function suite.findlib_FindSystemLib()
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
test.istrue(os.findlib("user32"))
|
||||
else
|
||||
test.istrue(os.findlib("m"))
|
||||
|
|
|
@ -242,7 +242,7 @@
|
|||
|
||||
function suite.translate_ReturnsCorrectSeparator_OnMixedPath()
|
||||
local actual = path.translate("dir\\dir/file")
|
||||
if (os.is("windows")) then
|
||||
if (os.is("arch")) then
|
||||
test.isequal("dir\\dir\\file", actual)
|
||||
else
|
||||
test.isequal("dir/dir/file", actual)
|
||||
|
|
|
@ -9,6 +9,6 @@
|
|||
|
||||
|
||||
function suite.valueIsSet()
|
||||
local filename = iif(os.is("windows"), "premake4.exe", "premake4")
|
||||
local filename = iif(os.is("arch"), "premake4.exe", "premake4")
|
||||
test.isequal(path.getabsolute("../bin/debug/" .. filename), _PREMAKE_COMMAND)
|
||||
end
|
||||
|
|
|
@ -33,55 +33,55 @@
|
|||
--
|
||||
|
||||
function T.keywords.matches_simple_strings()
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_files_with_simple_strings()
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.matches_with_patterns()
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fails_with_not_term()
|
||||
test.isfalse(premake.iskeywordmatch("not windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_term()
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "linux", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "linux", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_and_or()
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_with_not_and_or()
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_required_term()
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_required_term()
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
|
|
@ -23,10 +23,10 @@
|
|||
--
|
||||
-- Path Style Name Style Example Environment
|
||||
-- ---------- ---------- -------------------
|
||||
-- windows windows VStudio with MSC
|
||||
-- arch arch VStudio with MSC
|
||||
-- posix posix GMake with GCC
|
||||
-- windows posix VStudio for PS3
|
||||
-- posix windows GMake for .NET
|
||||
-- arch posix VStudio for PS3
|
||||
-- posix arch GMake for .NET
|
||||
--
|
||||
|
||||
|
||||
|
@ -38,13 +38,13 @@
|
|||
|
||||
function T.targets.ConsoleApp_Build_WindowsNames()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.ConsoleApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
@ -74,13 +74,13 @@
|
|||
|
||||
function T.targets.WindowedApp_Build_WindowsNames()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.WindowedApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
@ -109,25 +109,25 @@
|
|||
|
||||
function T.targets.SharedLib_Build_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
@ -162,25 +162,25 @@
|
|||
|
||||
function T.targets.Bundle_Build_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
@ -215,25 +215,25 @@
|
|||
|
||||
function T.targets.StaticLib_Build_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
@ -288,7 +288,7 @@
|
|||
|
||||
function T.targets.WindowsPaths()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "windows", "windows", "linux")
|
||||
result = premake.gettarget(cfg, "build", "arch", "arch", "linux")
|
||||
test.isequal([[..\bin]], result.directory)
|
||||
test.isequal([[..\bin\MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
--
|
||||
|
||||
function suite.cppflags_OnWindows()
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcppflags(cfg)
|
||||
test.isequal("-MMD -MP", table.concat(r, " "))
|
||||
end
|
||||
|
@ -39,7 +39,7 @@
|
|||
|
||||
function suite.cflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcflags(cfg)
|
||||
test.isequal('', table.concat(r,"|"))
|
||||
end
|
||||
|
@ -65,7 +65,7 @@
|
|||
|
||||
function suite.ldflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getldflags(cfg)
|
||||
test.isequal('-s|-shared|-Wl,--out-implib="libMyProject.a"', table.concat(r,"|"))
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue