paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-25 09:19:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: asking compiler for config files: expand relative file names

Browse Source 
git-svn-id: trunk@43432 -
This commit is contained in:
mattias 2013-11-12 21:19:50 +00:00
parent 2aa15b32f5
commit a52ea0401d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/codetools/definetemplates.pas
View File

@ -952,6 +952,7 @@ function RunFPCInfo(const CompilerFilename: string;
function SplitFPCVersion(const FPCVersionString: string;
out FPCVersion, FPCRelease, FPCPatch: integer): boolean;
function ParseFPCVerbose(List: TStrings; // fpc -va output
const WorkDir: string;
out ConfigFiles: TStrings; // prefix '-' for file not found, '+' for found and read
out RealCompilerFilename: string; // what compiler is used by fpc
out UnitPaths: TStrings; // unit search paths
@ -1394,9 +1395,9 @@ begin
Result:=true;
end;
function ParseFPCVerbose(List: TStrings; out ConfigFiles: TSTrings;
out RealCompilerFilename: string; out UnitPaths: TStrings;
out Defines, Undefines: TStringToStringTree): boolean;
function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
ConfigFiles: TStrings; out RealCompilerFilename: string; out
UnitPaths: TStrings; out Defines, Undefines: TStringToStringTree): boolean;
procedure UndefineSymbol(const MacroName: string);
begin
@ -1412,6 +1413,13 @@ function ParseFPCVerbose(List: TStrings; out ConfigFiles: TSTrings;
Defines[MacroName]:=Value;
end;
function ExpFile(const aFilename: string): string;
begin
Result:=aFilename;
if FilenameIsAbsolute(Result) then exit;
Result:=AppendPathDelim(WorkDir)+Result;
end;
procedure ProcessOutputLine(Line: string);
var
SymbolName, SymbolValue, UpLine, NewPath: string;
@ -1485,23 +1493,23 @@ function ParseFPCVerbose(List: TStrings; out ConfigFiles: TSTrings;
begin
// skip keywords
Inc(CurPos, 19);
Filename:=SetDirSeparators(copy(Line,CurPos,length(Line)));
Filename:=ExpFile(SetDirSeparators(copy(Line,CurPos,length(Line))));
ConfigFiles.Add('-'+Filename);
end else if StrLComp(@UpLine[CurPos], 'COMPILER: ', 10) = 0 then begin
// skip keywords
Inc(CurPos, 10);
RealCompilerFilename:=copy(Line,CurPos,length(Line));
RealCompilerFilename:=ExpFile(copy(Line,CurPos,length(Line)));
end;
'R':
if StrLComp(@UpLine[CurPos], 'READING OPTIONS FROM FILE ', 26) = 0 then
begin
// skip keywords
Inc(CurPos, 26);
Filename:=SetDirSeparators(copy(Line,CurPos,length(Line)));
Filename:=ExpFile(SetDirSeparators(copy(Line,CurPos,length(Line))));
if (ConfigFiles.Count>0)
and (ConfigFiles[ConfigFiles.Count-1]='-'+Filename) then
ConfigFiles.Delete(ConfigFiles.Count-1);
ConfigFiles.Add('+'+copy(Line,CurPos,length(Line)));
ConfigFiles.Add('+'+Filename);
end;
end;
end;
@ -1570,7 +1578,7 @@ begin
debugln(['RunFPCVerbose failed: ',CompilerFilename,' ',Params]);
exit;
end;
Result:=ParseFPCVerbose(List,ConfigFiles,RealCompilerFilename,
Result:=ParseFPCVerbose(List,WorkDir,ConfigFiles,RealCompilerFilename,
UnitPaths,Defines,Undefines);
finally
List.Free;
@ -7401,7 +7409,7 @@ begin
end;
for i:=0 to ConfigFiles.Count-1 do begin
Cfg:=ConfigFiles[i];
if Cfg.Filename='' then continue;
if (Cfg.Filename='') or (not FilenameIsAbsolute(Cfg.Filename)) then continue;
if FileExistsCached(Cfg.Filename)<>Cfg.FileExists then begin
debugln(['TFPCTargetConfigCache.NeedsUpdate TargetOS="',TargetOS,'" TargetCPU="',TargetCPU,'" config fileexists changed "',Cfg.Filename,'"']);
exit;