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

IDE: fixed comparing version numbers RC1 and RC2

Browse Source 
git-svn-id: trunk@38310 -
This commit is contained in:
mattias 2012-08-21 17:45:53 +00:00
parent a0ceb2b7ed
commit 121579ce8f
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ide/lazconf.pp
View File

@ -236,18 +236,38 @@ begin
end;
function CompareLazarusVersion(V1, V2: string): integer;
// compare decimal numbers in strings
// For example
// '0.9.30' < '1.0'
// '1.0 RC1' < '1.0 RC2'
// '1.0 RC2' < '1.0'
// '1.0' < '1.1'
// '1.0' < '1.0-0'
// '1.0 RC2' < '1.0.1'
// '1.0-2' < '1.0.0'
// Rules: 'RC' < EndOfString < '-' < '.'
function ReadNumber(var p: PChar): integer;
begin
Result:=0;
while not (p^ in [#0,'0'..'9']) do inc(p);
while (p^ in ['0'..'9']) do begin
if Result<100000 then
Result:=Result*10+ord(p^)-ord('0');
inc(p);
if p^=#0 then exit(-1);
if p^ in ['0'..'9'] then begin
Result:=0;
while (p^ in ['0'..'9']) do begin
if Result<100000 then
Result:=Result*10+ord(p^)-ord('0');
inc(p);
end;
end else begin
while (p^ in [' ',#9]) do inc(p);
case p^ of
'-': Result:=1;
'.': Result:=2;
else Result:=-2; // for example 'RC'
end;
while not (p^ in [#0,'0'..'9']) do inc(p);
end;
while not (p^ in ['.',#0]) do inc(p);
if p^='.' then inc(p);
end;
var