paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-24 03:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: fixed searching paths without trailing pathdelim

Browse Source 
git-svn-id: trunk@40138 -
This commit is contained in:
Mattias Gaertner 2018-11-01 12:42:05 +00:00
parent 42c2859ce4
commit 32907ada6d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/pastojs/src/pas2jsfilecache.pp
View File

@ -1334,7 +1334,7 @@ function TPas2jsFileResolver.FindIncludeFileName(const aFilename: string): Strin
end; end;
// then search in include path // then search in include path
for i:=0 to Cache.IncludePaths.Count-1 do begin for i:=0 to Cache.IncludePaths.Count-1 do begin
Result:=Cache.IncludePaths[i]+Filename; Result:=IncludeTrailingPathDelimiter(Cache.IncludePaths[i])+Filename;
if SearchLowUpCase(Result) then exit; if SearchLowUpCase(Result) then exit;
end; end;
Result:=''; Result:='';
@ -1403,6 +1403,7 @@ function TPas2jsFileResolver.FindUnitFileName(const aUnitname,
function SearchInDir(Dir: string; var Filename: string): boolean; function SearchInDir(Dir: string; var Filename: string): boolean;
// search in Dir for pp, pas, p times given case, lower case, upper case // search in Dir for pp, pas, p times given case, lower case, upper case
begin begin
Dir:=IncludeTrailingPathDelimiter(Dir);
Filename:=Dir+aUnitname+'.pp'; Filename:=Dir+aUnitname+'.pp';
if SearchLowUpCase(Filename) then exit(true); if SearchLowUpCase(Filename) then exit(true);
Filename:=Dir+aUnitname+'.pas'; Filename:=Dir+aUnitname+'.pas';
@ -1475,10 +1476,11 @@ end;
function TPas2jsFileResolver.FindCustomJSFileName(const aFilename: string function TPas2jsFileResolver.FindCustomJSFileName(const aFilename: string
): String; ): String;
function SearchInDir(const Dir: string): boolean; function SearchInDir(Dir: string): boolean;
var var
CurFilename: String; CurFilename: String;
begin begin
Dir:=IncludeTrailingPathDelimiter(Dir);
CurFilename:=Dir+aFilename; CurFilename:=Dir+aFilename;
Result:=FileExistsLogged(CurFilename); Result:=FileExistsLogged(CurFilename);
if Result then if Result then