paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 15:41:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Optimize away redundant tests for FLoadParts when loading project.

Browse Source 
git-svn-id: trunk@45604 -
This commit is contained in:
juha 2014-06-22 09:53:09 +00:00
parent cc0f2b8e77
commit 87cbbd926f
1 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ide/project.pp
View File

@ -2835,19 +2835,19 @@ begin
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF}
FFileVersion:= FXMLConfig.GetValue(Path+'Version/Value',0);
if (FFileVersion=0) and (not FLoadParts)
and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then
if not FLoadParts then
begin
if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then
if IDEMessageDialog(lisStrangeLpiFile,
Format(lisTheFileDoesNotLookLikeALpiFile, [ProjectInfoFile]),
mtConfirmation,[mbIgnore,mbAbort])<>mrIgnore then exit;
mtConfirmation,[mbIgnore,mbAbort])<>mrIgnore
then exit;
if not FLoadParts then begin
LoadFlags(Path);
SessionStorage:=StrToProjectSessionStorage(
FXMLConfig.GetValue(Path+'General/SessionStorage/Value',
ProjectSessionStorageNames[DefaultProjectSessionStorage]));
//DebugLn('TProject.ReadProject SessionStorage=',dbgs(ord(SessionStorage)),' ProjectSessionFile=',ProjectSessionFile);
end;
// load properties
// Note: in FFileVersion<9 the default value was -1
@ -2855,21 +2855,16 @@ begin
// added to the lpi.
// Changing the default value to 0 avoids the redundancy and
// automatically fixes broken lpi files.
if not FLoadParts then begin
FNewMainUnitID := FXMLConfig.GetValue(Path+'General/MainUnit/Value', 0);
Title := FXMLConfig.GetValue(Path+'General/Title/Value', '');
UseAppBundle := FXMLConfig.GetValue(Path+'General/UseAppBundle/Value', True);
AutoCreateForms := FXMLConfig.GetValue(Path+'General/AutoCreateForms/Value', true);
end;
// fpdoc
if not FLoadParts then begin
FPDocPaths:=SwitchPathDelims(FXMLConfig.GetValue(Path+'LazDoc/Paths',''),fPathDelimChanged);
FPDocPackageName:=FXMLConfig.GetValue(Path+'LazDoc/PackageName','');
end;
// i18n
if not FLoadParts then begin
if FFileVersion<6 then begin
POOutputDirectory := SwitchPathDelims(
FXMLConfig.GetValue(Path+'RST/OutDir', ''),fPathDelimChanged);
@ -2882,41 +2877,33 @@ begin
end;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject E reading comp sets');{$ENDIF}
end;
// load MacroValues and compiler options
LoadBuildModes(Path,true);
// Resources
if not FLoadParts then
begin
ProjResources.ReadFromProjectFile(FXMLConfig, Path);
// load custom data
if not FLoadParts then
LoadStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/');
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject update ct boss');{$ENDIF}
if not FLoadParts then begin
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'ProjPath']:=ProjectDirectory;
CodeToolBoss.DefineTree.ClearCache;
end;
// load the dependencies
if not FLoadParts then
LoadPkgDependencyList(FXMLConfig,Path+'RequiredPackages/',
FFirstRequiredDependency,pdlRequires,Self,true,false);
// load the Run and Build parameter Options
if not FLoadParts then
RunParameterOptions.Load(FXMLConfig,Path,fPathDelimChanged);
// load the Publish Options
if not FLoadParts then
PublishOptions.LoadFromXMLConfig(FXMLConfig,Path+'PublishOptions/',fPathDelimChanged);
// load custom defines
if not FLoadParts then
LoadCustomDefines(Path);
// load session info
if not FLoadParts then
LoadSessionInfo(Path,false);
// call hooks to read their info (e.g. DebugBoss)
if (not FLoadParts) and Assigned(OnLoadProjectInfo) then
if Assigned(OnLoadProjectInfo) then
OnLoadProjectInfo(Self, FXMLConfig, false);
end;
end;
procedure TProject.LoadFromSession;
var
@ -3012,7 +2999,6 @@ end;
function TProject.DoLoadSession(Filename: String): TModalResult;
begin
Result:=mrOK;
if FLoadParts then Exit;
if FileExistsUTF8(Filename) then
begin
//DebugLn('TProject.ReadProject loading Session Filename=',Filename);
@ -3055,7 +3041,8 @@ begin
// load session file (if available)
if (SessionStorage in pssHasSeparateSession)
and (CompareFilenames(ProjectInfoFile,ProjectSessionFile)<>0) then
and (CompareFilenames(ProjectInfoFile,ProjectSessionFile)<>0)
and not (prfLoadParts in ReadFlags) then
begin
Result:=DoLoadSession(ProjectSessionFile);
if Result<>mrOK then Exit;
@ -7214,7 +7201,7 @@ begin
SessionMatrixOptions.LoadFromXMLConfig(FXMLConfig, Path+'BuildModes/SessionMatrixOptions/');
Cnt:=FXMLConfig.GetValue(Path+'BuildModes/Count',0);
//debugln(['LoadBuildModes Cnt=',Cnt,' LoadData=',LoadData]);
//debugln(['TProjectBuildModes.LoadFromXMLConfig Cnt=',Cnt,' LoadData=',LoadData]);
if Cnt>0 then
LoadNewFormat(Path, Cnt, LoadData)
else if LoadData then