paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-27 16:07:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazBuild: Checking macro substitution in the "--get-expand-text" option and setting the return code

Browse Source
This commit is contained in:
n7800 2024-09-25 03:42:01 +05:00 committed by Juha Manninen
parent 30a7007a39
commit 64a939ffc4
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/lazarusidestrconsts.pas
View File

@ -176,8 +176,10 @@ resourcestring
'multiple times. If compilation options are also specified in --build-ide, '+ 'multiple times. If compilation options are also specified in --build-ide, '+
'then the options from --opt will be added after them.'; 'then the options from --opt will be added after them.';
lisGetExpandText = 'Print the result of substituting macros in the text. '+ lisGetExpandText = 'Print the result of substituting macros in the text. '+
'The absence of macros in the text means the name of the macro. '+ 'The absence of macros means the name of the macro. '+
'By default, active build mode is used.'; 'In case of an error, returns only the text with partially expanded macros '+
'and sets the error code (also for an empty string). '+
'Takes into account the active build mode (or specified via "--bm").';
lisGetBuildModes = 'Print a list of build modes in the project. Active mode is listed first.'; lisGetBuildModes = 'Print a list of build modes in the project. Active mode is listed first.';
lisLazbuildOptionsSyntax = 'lazbuild [options] <project/package filename or package name>'; lisLazbuildOptionsSyntax = 'lazbuild [options] <project/package filename or package name>';

16
ide/lazbuild.lpr
View File

@ -206,6 +206,7 @@ const
ErrorLoadProjectFailed = 5; ErrorLoadProjectFailed = 5;
ErrorInvalidSyntax = 6; ErrorInvalidSyntax = 6;
ErrorInitialization = 7; ErrorInitialization = 7;
ErrorExpandMacro = 8;
VersionStr = {$I packages/ideconfig/version.inc}; VersionStr = {$I packages/ideconfig/version.inc};
procedure FilterConfigFileContent; procedure FilterConfigFileContent;
@ -848,6 +849,13 @@ var
if HasLongOptIgnoreCase('get',S) or if HasLongOptIgnoreCase('get',S) or
HasLongOptIgnoreCase('get-expand-text',S) then begin HasLongOptIgnoreCase('get-expand-text',S) then begin
// check for empty text
if S = '' then
begin
writeln(''); // print empty text as well
halt(ErrorExpandMacro); // exit with error
end;
// check for macros // check for macros
HasMacro := false; HasMacro := false;
for i := 1 to length(S) - 1 do // skip last char for i := 1 to length(S) - 1 do // skip last char
@ -859,7 +867,13 @@ var
if not HasMacro then if not HasMacro then
S := '$(' + S + ')'; S := '$(' + S + ')';
// expand // expand
Project1.MacroEngine.SubstituteStr(S); Project1.MacroEngine.MarkUnhandledMacros := false;
if not Project1.MacroEngine.SubstituteStr(S) then
begin
writeln(S); // print partially expanded text
halt(ErrorExpandMacro); // exit with error
end;
// print result
WriteLn(S); WriteLn(S);
exit(true); exit(true);
end; end;