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

path.translate now uses the target OS separator by default instead of Windows separator.

Browse Source
This commit is contained in:
Sam Surtees 2015-10-12 22:34:56 +10:00
parent dd68adaf53
commit f60a1b391f
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/host/path_translate.c
View File

@ -32,7 +32,20 @@ int path_translate(lua_State* L)
char buffer[0x4000];
if (lua_gettop(L) == 1) {
sep = "\\";
// Get target OS
lua_getglobal(L, "os");
lua_getfield(L, -1, "get");
lua_call(L, 0, 1);
const char* os = luaL_checkstring(L, -1);
lua_pop(L, 2);
// Use target OS separator
if (strcmp(os, "windows") == 0) {
sep = "\\";
}
else {
sep = "/";
}
}
else {
sep = luaL_checkstring(L, 2);

12
tests/base/test_path.lua
View File

@ -389,6 +389,18 @@
test.isequal("dir/dir/file", actual)
end
function suite.translate_ReturnsTargetOSSeparator_Windows()
_OPTIONS["os"] = "windows"
test.isequal("dir\\dir\\file", path.translate("dir/dir\\file"))
_OPTIONS["os"] = nil
end
function suite.translate_ReturnsTargetOSSeparator_Linux()
_OPTIONS["os"] = "linux"
test.isequal("dir/dir/file", path.translate("dir/dir\\file"))
_OPTIONS["os"] = nil
end
--
-- path.wildcards tests