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

* Make sure that the FPMake version-format is used in fpmake.pp files

Browse Source 
git-svn-id: trunk@62951 -
This commit is contained in:
joost 2020-04-11 21:36:22 +00:00
parent 45725b103e
commit 9ba565019e
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packager/packagesystem.pas
View File

@ -45,7 +45,7 @@ uses
MemCheck,
{$ENDIF}
// FPC
Classes, SysUtils, contnrs, strutils, Laz_AVL_Tree,
Classes, SysUtils, contnrs, strutils, Laz_AVL_Tree, fpmkunit,
// LCL
Forms, Controls, Dialogs, LCLProc,
// LazUtils
@ -4829,6 +4829,22 @@ var
Result:=StringReplace(Result,PathDelim,'/',[rfReplaceAll]);
end;
function PkgVersionToFPVersionString(const v: TPkgVersion): string;
var
FPVersion: TFPVersion;
begin
FPVersion := TFPVersion.Create;
try
FPVersion.Major := v.Major;
FPVersion.Minor := v.Minor;
FPVersion.Micro := v.Release;
FPVersion.Build := v.Build;
Result := FPVersion.AsString;
finally
FPVersion.Free;
end;
end;
var
s: String;
e: string;
@ -4929,7 +4945,8 @@ begin
s:=s+' with Installer do'+e;
s:=s+' begin'+e;
s:=s+' P:=AddPackage('''+lowercase(APackage.Name)+''');'+e;
s:=s+' P.Version:='''+APackage.Version.AsString+''';'+e;
s:=s+' P.Version:='''+PkgVersionToFPVersionString(APackage.Version)+''';'+e;
s:=s+''+e;
s:=s+' P.Directory:=ADirectory;'+e;
s:=s+''+e;