paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 11:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: added Laz_FullVersion to compiler option cfg script

Browse Source
This commit is contained in:
mattias 2023-07-28 16:54:59 +01:00
parent f48fe7983e
commit ad640c5e38
3 changed files with 9 additions and 2 deletions

8
ide/buildmanager.pas
View File

@ -43,7 +43,7 @@ uses
FileProcs, CodeToolsCfgScript, LinkScanner,
// LazUtils
FPCAdds, LConvEncoding, FileUtil, LazFileUtils, LazFileCache, LazUTF8,
Laz2_XMLCfg, LazUtilities, LazStringUtils, LazMethodList,
Laz2_XMLCfg, LazUtilities, LazStringUtils, LazMethodList, LazVersion,
// BuildIntf
BaseIDEIntf, IDEOptionsIntf, ProjectIntf, MacroIntf, PublishModuleIntf,
IDEExternToolIntf, CompOptsIntf, MacroDefIntf,
@ -2766,7 +2766,7 @@ function TBuildManager.GetBuildMacroValuesHandler(Options: TBaseCompilerOptions;
end;
end;
// Subtarget
if not Values.IsDefined('Subtarget') then begin
if not Values.IsDefined('Subtarget') then begin
s:='';
if FBuildTarget<>nil then
s:=FBuildTarget.CompilerOptions.Subtarget;
@ -2774,6 +2774,10 @@ function TBuildManager.GetBuildMacroValuesHandler(Options: TBaseCompilerOptions;
s:=fSubtarget;
Values.Values['Subtarget']:=s;
end;
// Laz_FullVersion
if not Values.IsDefined('Laz_FullVersion') then begin
SetCTCSVariableAsNumber(Values.GetVariable('Laz_FullVersion',true),laz_fullversion);
end;
end;
procedure ApplyMacroOverrides(Vars: TCTCfgScriptVariables);

2
ide/compileroptions.pp
View File

@ -1088,6 +1088,8 @@ begin
SetCTCSVariableAsString(Value,GetDefaultSrcOS2ForTargetOS(FPCAdds.GetCompiledTargetOS))
else if CompareIdentifiers(PChar(VarName),'LCLWidgetType')=0 then
SetCTCSVariableAsString(Value,GetLCLWidgetTypeName)
else if CompareIdentifiers(PChar(VarName),'LAZ_FULLVERSION')=0 then
SetCTCSVariableAsNumber(Value,laz_fullversion)
else
ClearCTCSVariable(Value);
end else if (CompareIdentifiers(FunctionName,'GetEnv')=0) then

1
ide/frames/compiler_buildmacro_options.pas
View File

@ -194,6 +194,7 @@ begin
or (SysUtils.CompareText('TargetCPU',S)=0)
or (SysUtils.CompareText('Subtarget',S)=0)
or (SysUtils.CompareText('LCLWidgetType',S)=0)
or (SysUtils.CompareText('Laz_FullVersion',S)=0)
then begin
IDEMessageDialog(lisCCOErrorCaption,
Format(lisThereIsAlreadyAMacroWithTheName, [S]),