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

IDE: when regenerating PO files, don't take into account LRJ files date, these files are usually kept in SCM systems and their date can change e.g. after revert operation. Now all existing files are always processed. Make the same change for RST/RSJ files for symmetry.

Browse Source 
git-svn-id: trunk@57489 -
This commit is contained in:
maxim 2018-03-09 22:23:08 +00:00
parent 5120fded06
commit fe0da63af0
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/main.pp
View File

@ -4134,8 +4134,6 @@ var
POFilename: String;
AnUnitInfo: TUnitInfo;
CurFilename: String;
POFileAge: LongInt;
POFileAgeValid: Boolean;
POOutDir: String;
LRJFilename: String;
UnitOutputDir: String;
@ -4167,13 +4165,6 @@ begin
end;
end;
POFileAgeValid:=false;
if not AProject.ForceUpdatePoFiles then
if FileExistsCached(POFilename) then begin
POFileAge:=FileAgeCached(POFilename);
POFileAgeValid:=true;
end;
//DebugLn(['TMainIDE.UpdateProjectPOFile Updating POFilename="',POFilename,'"']);
Files := TFilenameToPointerTree.Create(false);
@ -4189,8 +4180,7 @@ begin
continue;
// check .lrj file
LRJFilename:=ChangeFileExt(CurFilename,'.lrj');
if FileExistsCached(LRJFilename)
and ((not POFileAgeValid) or (FileAgeCached(LRJFilename)>POFileAge)) then
if FileExistsCached(LRJFilename) then
Files[LRJFilename]:=nil;
// check .rst/.rsj file
RSTFilename:=ChangeFileExt(CurFilename,'.rst');
@ -4206,9 +4196,9 @@ begin
end;
end;
//DebugLn(['TMainIDE.UpdateProjectPOFile Looking for .rst file ="',RSTFilename,'"']);
if FileExistsCached(RSTFilename) and ((not POFileAgeValid) or (FileAgeCached(RSTFilename)>POFileAge)) then
if FileExistsCached(RSTFilename) then
Files[RSTFilename]:=nil;
if FileExistsCached(RSJFilename) and ((not POFileAgeValid) or (FileAgeCached(RSJFilename)>POFileAge)) then
if FileExistsCached(RSJFilename) then
Files[RSJFilename]:=nil;
end;