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

IDE: Generate project resources only when needed. Issue #15915.

Browse Source 
git-svn-id: trunk@59256 -
This commit is contained in:
juha 2018-10-06 19:32:44 +00:00
parent c38806b29d
commit c04a9e4739
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ide/buildmanager.pas
View File

@ -1906,8 +1906,11 @@ var
Code: TCodeBuffer; Code: TCodeBuffer;
begin begin
Result:=mrOk; Result:=mrOk;
Assert(not Project1.ProjResources.Modified, 'UpdateProjectAutomaticFiles: Resources are modified!');
// update project resource // update project resource
Project1.ProjResources.Regenerate(Project1.MainFileName, False, True, TestDir); if TestDir<>'' then
Project1.ProjResources.Regenerate(Project1.MainFileName, False, True, TestDir);
// Iterate project units
AnUnitInfo := Project1.FirstPartOfProject; AnUnitInfo := Project1.FirstPartOfProject;
while AnUnitInfo<>nil do while AnUnitInfo<>nil do
begin begin

4
ide/main.pp
View File

@ -5048,7 +5048,7 @@ var
var var
aFilename: String; aFilename: String;
begin begin
//debugln(['TMainIDE.DoProjectOptionsAfterWrite ',DbgSName(Sender),' Restore=',Restore]); //debugln(['TMainIDE.ProjectOptionsAfterWrite ',DbgSName(Sender),' Restore=',Restore]);
if not (Sender is TProjectIDEOptions) then exit; if not (Sender is TProjectIDEOptions) then exit;
AProject:=TProjectIDEOptions(Sender).Project; AProject:=TProjectIDEOptions(Sender).Project;
Assert(Assigned(AProject), 'TMainIDE.ProjectOptionsAfterWrite: Project=Nil.'); Assert(Assigned(AProject), 'TMainIDE.ProjectOptionsAfterWrite: Project=Nil.');
@ -5065,7 +5065,7 @@ begin
SetAutoCreateForms; SetAutoCreateForms;
AProject.AutoAddOutputDirToIncPath; // extend include path AProject.AutoAddOutputDirToIncPath; // extend include path
if AProject.ProjResources.Modified then if AProject.ProjResources.Modified then
if not AProject.ProjResources.Regenerate(AProject.MainFilename, True, False, '') then if not AProject.ProjResources.Regenerate(AProject.MainFilename, True, True, '') then
IDEMessageDialog(lisCCOWarningCaption, AProject.ProjResources.Messages.Text, IDEMessageDialog(lisCCOWarningCaption, AProject.ProjResources.Messages.Text,
mtWarning, [mbOk]); mtWarning, [mbOk]);
end; end;