From 23822a8e526a031797414d4b257b250b078090f7 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 13 Mar 2019 07:11:44 +0000 Subject: [PATCH] codetools: parse fpc output: keep FULLVERSION value git-svn-id: branches/fixes_2_0@60662 - --- components/codetools/definetemplates.pas | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas index 11465ca8c9..168a1579e6 100644 --- a/components/codetools/definetemplates.pas +++ b/components/codetools/definetemplates.pas @@ -1717,6 +1717,14 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out if IsUpLine(CurPos,'DEFINED: ') then begin Inc(CurPos, 9); SymbolName:=copy(Line, CurPos, len); + if (SameText(SymbolName,'PAS2JS_FULLVERSION') + or SameText(SymbolName,'FPC_FULLVERSION')) + and Defines.Contains(SymbolName) then + begin + // keep the FULLVERSION value + // Note: pas2js <1.4 had a bug, it gave out DEFINED + exit; + end; DefineSymbol(SymbolName,''); Exit; end;