paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-25 22:10:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: added AlwaysRequireSharedBaseFolder to TryCreateRelativePath

Browse Source
This commit is contained in:
mattias 2019-08-30 09:21:06 +00:00
parent 7651157066
commit 0ca3b5f4be
3 changed files with 12 additions and 8 deletions

2
compiler/packages/pastojs/src/pas2jscompiler.pp
View File

@ -2240,7 +2240,7 @@ begin
MapFilename:=LocalFilename;
if (BaseDir<>'') and not SrcMapFilenamesAbsolute then
begin
if not FS.TryCreateRelativePath(LocalFilename,BaseDir,true,MapFilename) then
if not FS.TryCreateRelativePath(LocalFilename,BaseDir,true,false,MapFilename) then
begin
// e.g. file is on another partition
if not SrcMapInclude then

10
compiler/packages/pastojs/src/pas2jsfilecache.pp
View File

@ -279,7 +279,8 @@ type
function ExpandExecutable(const Filename: string): string; override;
function HandleOptionPaths(C: Char; aValue: String; FromCmdLine: Boolean): String; override;
Function AddForeignUnitPath(const aValue: String; FromCmdLine: Boolean): String; override;
function TryCreateRelativePath(const Filename, BaseDirectory: String; UsePointDirectory: boolean; out RelPath: String): Boolean; override;
function TryCreateRelativePath(const Filename, BaseDirectory: String;
UsePointDirectory, AlwaysRequireSharedBaseFolder: boolean; out RelPath: String): Boolean; override;
Protected
property DirectoryCache: TPas2jsCachedDirectories read FDirectoryCache;
public
@ -1806,11 +1807,12 @@ begin
AddSrcUnitPaths(aValue,FromCmdLine,Result);
end;
function TPas2jsFilesCache.TryCreateRelativePath(const Filename, BaseDirectory: String;
UsePointDirectory: boolean; out RelPath: String): Boolean;
function TPas2jsFilesCache.TryCreateRelativePath(const Filename,
BaseDirectory: String; UsePointDirectory,
AlwaysRequireSharedBaseFolder: boolean; out RelPath: String): Boolean;
begin
Result:=Pas2jsFileUtils.TryCreateRelativePath(Filename, BaseDirectory,
UsePointDirectory, false, RelPath);
UsePointDirectory, AlwaysRequireSharedBaseFolder, RelPath);
end;
function TPas2jsFilesCache.FindIncludeFileName(const aFilename,

8
compiler/packages/pastojs/src/pas2jsfs.pp
View File

@ -115,7 +115,8 @@ Type
function ExpandExecutable(const Filename: string): string; virtual;
Function FormatPath(Const aFileName: string): String; virtual;
Function DirectoryExists(Const aDirectory: string): boolean; virtual;
function TryCreateRelativePath(const Filename, BaseDirectory: String; UsePointDirectory: boolean; out RelPath: String): Boolean; virtual;
function TryCreateRelativePath(const Filename, BaseDirectory: String;
UsePointDirectory, AlwaysRequireSharedBaseFolder: boolean; out RelPath: String): Boolean; virtual;
procedure DeleteDuplicateFiles(List: TStrings); virtual;
function IndexOfFile(FileList: TStrings; aFilename: string; Start: integer = 0): integer; virtual;// -1 if not found
Procedure WriteFoldersAndSearchPaths; virtual;
@ -255,12 +256,13 @@ begin
Result:=aDirectory='';
end;
function TPas2JSFS.TryCreateRelativePath(const Filename, BaseDirectory: String; UsePointDirectory: boolean; out RelPath: String
function TPas2JSFS.TryCreateRelativePath(const Filename, BaseDirectory: String;
UsePointDirectory, AlwaysRequireSharedBaseFolder: boolean; out RelPath: String
): Boolean;
begin
Result:=True;
RelPath:=FileName;
if (BaseDirectory='') or UsePointDirectory then ;
if (BaseDirectory='') or UsePointDirectory or AlwaysRequireSharedBaseFolder then ;
end;
procedure TPas2JSFS.DeleteDuplicateFiles(List: TStrings);