paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 12:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: read compiler options: pas2js format

Browse Source 
git-svn-id: trunk@57882 -
This commit is contained in:
mattias 2018-05-10 10:55:28 +00:00
parent 86bbc8831c
commit 7c8e3086d9
1 changed files with 84 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
components/codetools/definetemplates.pas
View File

@ -1596,30 +1596,53 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
UnitPaths: TStrings; out IncludePaths: TStrings; out UnitScopes: TStrings; out UnitPaths: TStrings; out IncludePaths: TStrings; out UnitScopes: TStrings; out
Defines, Undefines: TStringToStringTree): boolean; Defines, Undefines: TStringToStringTree): boolean;
function DeQuote(const s: string): string;
begin
if (length(s)>1) and (s[1]='"') and (s[length(s)]='"') then
Result:=AnsiDequotedStr(s,'"')
else
Result:=s;
end;
procedure UndefineSymbol(const MacroName: string); procedure UndefineSymbol(const MacroName: string);
begin begin
//DebugLn(['UndefineSymbol ',MacroName]); {$IFDEF VerboseFPCSrcScan}
DebugLn(['UndefineSymbol ',MacroName]);
{$ENDIF}
Defines.Remove(MacroName); Defines.Remove(MacroName);
Undefines[MacroName]:=''; Undefines[MacroName]:='';
end; end;
procedure DefineSymbol(const MacroName, Value: string); procedure DefineSymbol(const MacroName, Value: string);
begin begin
//DebugLn(['DefineSymbol ',MacroName]); {$IFDEF VerboseFPCSrcScan}
if Value='' then
DebugLn(['DefineSymbol ',MacroName])
else
DebugLn(['DefineSymbol ',MacroName,':=',Value]);
{$ENDIF}
Undefines.Remove(MacroName); Undefines.Remove(MacroName);
Defines[MacroName]:=Value; Defines[MacroName]:=Value;
end; end;
function ExpFile(const aFilename: string): string; function ExpFile(const aFilename: string): string;
begin begin
Result:=aFilename; Result:=DeQuote(aFilename);
if FilenameIsAbsolute(Result) then exit; if FilenameIsAbsolute(Result) then exit;
Result:=AppendPathDelim(WorkDir)+Result; Result:=AppendPathDelim(WorkDir)+Result;
end; end;
procedure ProcessOutputLine(Line: string); procedure ProcessOutputLine(Line: string);
var var
SymbolName, SymbolValue, UpLine, NewPath: string; UpLine: string;
function IsUpLine(p: integer; const s: string): boolean;
begin
Result:=StrLComp(@UpLine[p], PChar(s), length(s)) = 0;
end;
var
SymbolName, SymbolValue, NewPath: string;
i, len, CurPos: integer; i, len, CurPos: integer;
Filename: String; Filename: String;
p: SizeInt; p: SizeInt;
@ -1641,44 +1664,50 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
end; end;
UpLine:=UpperCaseStr(Line); UpLine:=UpperCaseStr(Line);
case UpLine[CurPos] of case UpLine[CurPos] of
'C': 'I':
if StrLComp(@UpLine[CurPos], 'CONFIGFILE SEARCH: ', 19) = 0 then if IsUpLine(CurPos,'INFO: ') then
begin inc(CurPos,6);
// skip keywords
Inc(CurPos, 19);
Filename:=ExpFile(GetForcedPathDelims(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:=ExpFile(copy(Line,CurPos,length(Line)));
end;
'E': 'E':
if StrLComp(@UpLine[CurPos], 'ERROR: ', 7) = 0 then begin if IsUpLine(CurPos,'ERROR: ') then begin
inc(CurPos,7); inc(CurPos,7);
if RealCompilerFilename='' then begin if RealCompilerFilename='' then begin
p:=Pos(' returned an error exitcode',Line); p:=Pos(' returned an error exitcode',Line);
if p>0 then if p>0 then
RealCompilerFilename:=copy(Line,CurPos,p-CurPos); RealCompilerFilename:=copy(Line,CurPos,p-CurPos);
end; end;
exit;
end;
end;
case UpLine[CurPos] of
'C':
if IsUpLine(CurPos,'CONFIGFILE SEARCH: ') then
begin
// skip keywords
Inc(CurPos, 19);
Filename:=ExpFile(GetForcedPathDelims(copy(Line,CurPos,length(Line))));
ConfigFiles.Add('-'+Filename);
end else if IsUpLine(CurPos,'COMPILER: ') then begin
// skip keywords
Inc(CurPos, 10);
RealCompilerFilename:=ExpFile(copy(Line,CurPos,length(Line)));
end; end;
'M': 'M':
if StrLComp(@UpLine[CurPos], 'MACRO ', 6) = 0 then begin if IsUpLine(CurPos,'MACRO ') then begin
// skip keyword macro // skip keyword macro
Inc(CurPos, 6); Inc(CurPos, 6);
if (StrLComp(@UpLine[CurPos], 'DEFINED: ', 9) = 0) then begin if IsUpLine(CurPos,'DEFINED: ') then begin
Inc(CurPos, 9); Inc(CurPos, 9);
SymbolName:=copy(UpLine, CurPos, len); SymbolName:=copy(Line, CurPos, len);
DefineSymbol(SymbolName,''); DefineSymbol(SymbolName,'');
Exit; Exit;
end; end;
if (StrLComp(@UpLine[CurPos], 'UNDEFINED: ', 11) = 0) then begin if IsUpLine(CurPos,'UNDEFINED: ') then begin
Inc(CurPos, 11); Inc(CurPos, 11);
SymbolName:=copy(UpLine,CurPos,len); SymbolName:=copy(Line,CurPos,len);
UndefineSymbol(SymbolName); UndefineSymbol(SymbolName);
Exit; Exit;
end; end;
@ -1686,17 +1715,18 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
// MACRO something... // MACRO something...
i := CurPos; i := CurPos;
while (i <= len) and (Line[i]<>' ') do inc(i); while (i <= len) and (Line[i]<>' ') do inc(i);
SymbolName:=copy(UpLine,CurPos,i-CurPos); SymbolName:=copy(Line,CurPos,i-CurPos);
CurPos := i + 1; // skip space CurPos := i + 1; // skip space
if StrLComp(@UpLine[CurPos], 'SET TO ', 7) = 0 then begin if IsUpLine(CurPos,'SET TO ') then begin
// MACRO name SET TO
Inc(CurPos, 7); Inc(CurPos, 7);
SymbolValue:=copy(Line, CurPos, len); SymbolValue:=DeQuote(copy(Line, CurPos, len));
DefineSymbol(SymbolName, SymbolValue); DefineSymbol(SymbolName, SymbolValue);
end; end;
end; end;
'R': 'R':
if StrLComp(@UpLine[CurPos], 'READING OPTIONS FROM FILE ', 26) = 0 then if IsUpLine(CurPos,'READING OPTIONS FROM FILE ') then
begin begin
// skip keywords // skip keywords
Inc(CurPos, 26); Inc(CurPos, 26);
@ -1704,32 +1734,31 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
if (ConfigFiles.Count>0) if (ConfigFiles.Count>0)
and (ConfigFiles[ConfigFiles.Count-1]='-'+Filename) then and (ConfigFiles[ConfigFiles.Count-1]='-'+Filename) then
ConfigFiles.Delete(ConfigFiles.Count-1); ConfigFiles.Delete(ConfigFiles.Count-1);
{$IFDEF VerboseFPCSrcScan}
DebugLn('Used options file: "',Filename,'"');
{$ENDIF}
ConfigFiles.Add('+'+Filename); ConfigFiles.Add('+'+Filename);
end; end;
'U': 'U':
if (StrLComp(@UpLine[CurPos], 'USING UNIT PATH: ', 17) = 0) then begin if IsUpLine(CurPos,'USING UNIT PATH: ') then begin
Inc(CurPos, 17); Inc(CurPos, 17);
NewPath:=GetForcedPathDelims(copy(Line,CurPos,len)); NewPath:=ExpFile(GetForcedPathDelims(DeQuote(copy(Line,CurPos,len))));
if not FilenameIsAbsolute(NewPath) then
NewPath:=ExpFile(NewPath);
NewPath:=ChompPathDelim(TrimFilename(NewPath)); NewPath:=ChompPathDelim(TrimFilename(NewPath));
{$IFDEF VerboseFPCSrcScan} {$IFDEF VerboseFPCSrcScan}
DebugLn('Using unit path: "',NewPath,'"'); DebugLn('Using unit path: "',NewPath,'"');
{$ENDIF} {$ENDIF}
UnitPaths.Add(NewPath); UnitPaths.Add(NewPath);
end else if (StrLComp(@UpLine[CurPos], 'USING INCLUDE PATH: ', 20) = 0) then begin end else if IsUpLine(CurPos,'USING INCLUDE PATH: ') then begin
Inc(CurPos, 20); Inc(CurPos, 20);
NewPath:=GetForcedPathDelims(copy(Line,CurPos,len)); NewPath:=ExpFile(GetForcedPathDelims(DeQuote(copy(Line,CurPos,len))));
if not FilenameIsAbsolute(NewPath) then
NewPath:=ExpFile(NewPath);
NewPath:=ChompPathDelim(TrimFilename(NewPath)); NewPath:=ChompPathDelim(TrimFilename(NewPath));
{$IFDEF VerboseFPCSrcScan} {$IFDEF VerboseFPCSrcScan}
DebugLn('Using include path: "',NewPath,'"'); DebugLn('Using include path: "',NewPath,'"');
{$ENDIF} {$ENDIF}
IncludePaths.Add(NewPath); IncludePaths.Add(NewPath);
end else if (StrLComp(@UpLine[CurPos], 'USING UNIT SCOPE: ', 18) = 0) then begin end else if IsUpLine(CurPos,'USING UNIT SCOPE: ') then begin
Inc(CurPos, 18); Inc(CurPos, 18);
NewPath:=Trim(copy(Line,CurPos,len)); NewPath:=Trim(DeQuote(copy(Line,CurPos,len)));
{$IFDEF VerboseFPCSrcScan} {$IFDEF VerboseFPCSrcScan}
DebugLn('Using unit scope: "',NewPath,'"'); DebugLn('Using unit scope: "',NewPath,'"');
{$ENDIF} {$ENDIF}
@ -9014,6 +9043,11 @@ begin
HasPPUs:=false; HasPPUs:=false;
RunFPCVerbose(Compiler,TestFilename,CfgFiles,RealCompiler,UnitPaths, RunFPCVerbose(Compiler,TestFilename,CfgFiles,RealCompiler,UnitPaths,
IncludePaths,UnitScopes,Defines,Undefines,ExtraOptions); IncludePaths,UnitScopes,Defines,Undefines,ExtraOptions);
//debugln(['TPCTargetConfigCache.Update UnitPaths="',UnitPaths.Text,'"']);
//debugln(['TPCTargetConfigCache.Update UnitScopes="',UnitScopes.Text,'"']);
//debugln(['TPCTargetConfigCache.Update IncludePaths="',IncludePaths.Text,'"']);
if Defines.Contains('PAS2JS') and Defines.Contains('PAS2JS_FULLVERSION') then if Defines.Contains('PAS2JS') and Defines.Contains('PAS2JS_FULLVERSION') then
Kind:=pcPas2js Kind:=pcPas2js
else else
@ -9023,7 +9057,7 @@ begin
// store the real compiler file and date // store the real compiler file and date
if (RealCompiler<>'') and FileExistsCached(RealCompiler) then begin if (RealCompiler<>'') and FileExistsCached(RealCompiler) then begin
RealCompilerDate:=FileAgeCached(RealCompiler); RealCompilerDate:=FileAgeCached(RealCompiler);
end else begin end else if Kind=pcFPC then begin
if CTConsoleVerbosity>=-1 then if CTConsoleVerbosity>=-1 then
debugln(['Warning: [TPCTargetConfigCache.Update] invalid compiler: Compiler="'+Compiler+'" Options="'+ExtraOptions+'" RealCompiler="',RealCompiler,'"']); debugln(['Warning: [TPCTargetConfigCache.Update] invalid compiler: Compiler="'+Compiler+'" Options="'+ExtraOptions+'" RealCompiler="',RealCompiler,'"']);
end; end;
@ -9052,6 +9086,17 @@ begin
end; end;
// check if the system ppu exists // check if the system ppu exists
HasPPUs:=(Kind=pcFPC) and (CompareFileExt(Units['system'],'ppu',false)=0); HasPPUs:=(Kind=pcFPC) and (CompareFileExt(Units['system'],'ppu',false)=0);
if CTConsoleVerbosity>=-1 then begin
case Kind of
pcFPC:
if not Defines.Contains('FPC_FULLVERSION') then
debugln(['Warning: [TPCTargetConfigCache.Update] invalid fpc: Compiler="'+Compiler+'" Options="'+ExtraOptions+'" RealCompiler="',RealCompiler,'" missing FPC_FULLVERSION']);
pcDelphi: ;
pcPas2js:
if not Defines.Contains('PAS2JS_FULLVERSION') then
debugln(['Warning: [TPCTargetConfigCache.Update] invalid pas2js: Compiler="'+Compiler+'" Options="'+ExtraOptions+'" missing PAS2JS_FULLVERSION']);
end;
end;
end; end;
// check for changes // check for changes
if not Equals(OldOptions) then begin if not Equals(OldOptions) then begin
@ -9106,6 +9151,7 @@ var
Postfix: String; Postfix: String;
begin begin
Result:=''; Result:='';
if Kind<>pcFPC then exit;
CompiledTargetCPU:=GetCompiledTargetCPU; CompiledTargetCPU:=GetCompiledTargetCPU;
if aTargetCPU='' then if aTargetCPU='' then