paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 04:10:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* While parsing a string to abtain a version number the default build-number is set to 1. A value of 0 indicate that it is a pre-release like a release candidate. 2.2.4rcX will become 2.2.4-0 and 2.2.4 translates as 2.2.4-1

Browse Source 
git-svn-id: trunk@12480 -
This commit is contained in:
joost 2009-01-03 12:43:40 +00:00
parent f1b27498c3
commit e60623bd33
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
utils/fppkg/fprepos.pp
View File

@ -386,32 +386,62 @@ end;
procedure TFPVersion.SetAsString(const AValue: String); procedure TFPVersion.SetAsString(const AValue: String);
Function NextDigit(sep : Char; var V : string) : integer; Function NextDigit(sep : Char; NonNumerisIsSep : boolean; var V : string; aDefault : integer = 0) : integer;
Var Var
P : Integer; P : Integer;
i : Integer;
begin begin
P:=Pos(Sep,V); P:=Pos(Sep,V);
If (P=0) then If (P=0) then
P:=Length(V)+1; P:=Length(V)+1;
If NonNumerisIsSep then
for i := 1 to P-1 do
if not (V[i] in ['0','1','2','3','4','5','6','7','8','9']) then
begin
P := i;
Break;
end;
Result:=StrToIntDef(Copy(V,1,P-1),-1); Result:=StrToIntDef(Copy(V,1,P-1),-1);
If Result<>-1 then If Result<>-1 then
Delete(V,1,P) Delete(V,1,P)
else else
Result:=0; Result:=aDefault;
end; end;
Var Var
V : String; V : String;
b : integer;
begin begin
Clear; Clear;
// Special support for empty version string // Special support for empty version string
if (AValue='') or (AValue='<none>') then if (AValue='') or (AValue='<none>') then
exit; exit;
V:=AValue; V:=AValue;
Major:=NextDigit('.',V); // Supported version-format is x.y.z-b
Minor:=NextDigit('.',V); // x,y,z and b are all optional and are set to 0 if they are not provided
Micro:=NextDigit('-',V); // except for b which has a default of 1.
Build:=NextDigit(#0,V); // x and y must be numeric. z or b may contain a non-numeric suffix which
// will be stripped. If there is any non-numeric character in z or b and
// there is no value supplied for b, build will be set to 0
// examples:
// 2 -> 2.0.0-1
// 2.2 -> 2.2.0-1
// 2.2.4 -> 2.2.4-1
// 2.2.4-0 -> 2.2.4-0
// 2.2.4rc1 -> 2.2.4-0
// 2.2.4-0rc1 -> 2.2.4-0
// 2.2.4-2rc1 -> 2.2.4-2
Major:=NextDigit('.',False,V);
Minor:=NextDigit('.',False,V);
Micro:=NextDigit('-',True,V);
b := NextDigit(#0,True,V,-1);
if b<0 then
if V <> '' then
Build := 0
else
Build := 1
else
Build := b;
end; end;