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

IDE: added macro $(FPCVer)

Browse Source 
git-svn-id: trunk@16121 -
This commit is contained in:
mattias 2008-08-18 13:44:02 +00:00
parent 2420f8a623
commit e61e9ba99e
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/buildmanager.pas
View File

@ -67,6 +67,8 @@ type
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncTargetOS(const Param: string; const Data: PtrInt; function MacroFuncTargetOS(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncFPCVer(const Param: string; const Data: PtrInt;
var Abort: boolean): string;
function MacroFuncParams(const Param: string; const Data: PtrInt; function MacroFuncParams(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncProjFile(const Param: string; const Data: PtrInt; function MacroFuncProjFile(const Param: string; const Data: PtrInt;
@ -222,6 +224,8 @@ begin
lisTargetCPU,@MacroFuncTargetCPU,[])); lisTargetCPU,@MacroFuncTargetCPU,[]));
GlobalMacroList.Add(TTransferMacro.Create('TargetOS','', GlobalMacroList.Add(TTransferMacro.Create('TargetOS','',
lisTargetOS,@MacroFuncTargetOS,[])); lisTargetOS,@MacroFuncTargetOS,[]));
GlobalMacroList.Add(TTransferMacro.Create('FPCVer','',
lisFPCVersionEG222, @MacroFuncFPCVer, []));
GlobalMacroList.Add(TTransferMacro.Create('Params','', GlobalMacroList.Add(TTransferMacro.Create('Params','',
lisCommandLineParamsOfProgram,@MacroFuncParams,[])); lisCommandLineParamsOfProgram,@MacroFuncParams,[]));
GlobalMacroList.Add(TTransferMacro.Create('ProjFile','', GlobalMacroList.Add(TTransferMacro.Create('ProjFile','',
@ -1075,6 +1079,20 @@ begin
Result:=GetTargetOS(true); Result:=GetTargetOS(true);
end; end;
function TBuildManager.MacroFuncFPCVer(const Param: string; const Data: PtrInt;
var Abort: boolean): string;
var
FPCVersion, FPCRelease, FPCPatch: integer;
begin
Result:={$I version.inc};
if CodeToolBoss<>nil then begin
CodeToolBoss.GetFPCVersionForDirectory('',FPCVersion,FPCRelease,FPCPatch);
if FPCVersion<>0 then begin
Result:=IntToStr(FPCVersion)+'.'+IntToStr(FPCRelease)+'.'+IntToStr(FPCPatch);
end;
end;
end;
function TBuildManager.MacroFuncParams(const Param: string; const Data: PtrInt; function TBuildManager.MacroFuncParams(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
begin begin

1
ide/lazarusidestrconsts.pas
View File

@ -3851,6 +3851,7 @@ resourcestring
lisDeleteOldFile2 = 'Delete old file?'; lisDeleteOldFile2 = 'Delete old file?';
lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search ' lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search '
+'path of %s%s%s contains the source directory %s%s%s of package %s'; +'path of %s%s%s contains the source directory %s%s%s of package %s';
lisFPCVersionEG222 = 'FPC Version (e.g. 2.2.2)';
implementation implementation