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

Add support for DOS-style environment variables, e.g. %JAVA_HOME%

Browse Source
This commit is contained in:
Jason Perkins 2016-01-20 14:06:38 -05:00
parent 7b2943ffc2
commit ef5ac384cf
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/host/path_getabsolute.c
View File

@ -40,7 +40,7 @@ void do_getabsolute(char* result, const char* value, const char* relative_to)
ch = strtok(buffer, "/");
while (ch) {
/* remove ".." where I can */
if (strcmp(ch, "..") == 0 && (prev == NULL || (prev[0] != '$' && strcmp(prev, "..") != 0))) {
if (strcmp(ch, "..") == 0 && (prev == NULL || (prev[0] != '$' && prev[0] != '%' && strcmp(prev, "..") != 0))) {
i = strlen(result) - 2;
while (i >= 0 && result[i] != '/') {
--i;

2
src/host/path_isabsolute.c
View File

@ -21,7 +21,9 @@ int do_isabsolute(const char* path)
path[0] == '/' ||
path[0] == '\\' ||
path[0] == '$' ||
path[0] == '%' ||
(path[0] == '"' && path[1] == '$') ||
(path[0] == '"' && path[1] == '%') ||
(path[0] != '\0' && path[1] == ':')
);
}

10
tests/base/test_path.lua
View File

@ -44,6 +44,10 @@
test.isequal("$(HOME)/user", path.getabsolute("$(HOME)/user"))
end
function suite.getabsolute_onLeadingEnvVar_dosStyle()
test.isequal("%HOME%/user", path.getabsolute("%HOME%/user"))
end
function suite.getabsolute_onMultipleEnvVar()
test.isequal("$(HOME)/$(USER)", path.getabsolute("$(HOME)/$(USER)"))
end
@ -437,7 +441,7 @@
local p = path.normalize("../../../test/*.h")
test.isequal("../../../test/*.h", p)
end
function suite.normalize_Test5()
test.isequal("test", path.normalize("./test"))
test.isequal("d:/", path.normalize("d:/"))
@ -465,11 +469,11 @@
test.isequal("d:/ProjectB/bin", path.normalize("d:/ProjectA/../ProjectB/bin"))
test.isequal("/ProjectB/bin", path.normalize("/ProjectA/../ProjectB/bin"))
end
function suite.normalize_leadingWhitespaces()
test.isequal("d:/game", path.normalize("\t\n d:/game"))
end
function suite.normalize_multPath()
test.isequal("../a/b ../c/d", path.normalize("../a/b ../c/d"))
test.isequal("d:/test ../a/b", path.normalize("d:/game/../test ../a/b"))