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

IDE: reorder the code for reading a project.

Browse Source 
git-svn-id: trunk@45760 -
This commit is contained in:
juha 2014-07-03 11:50:52 +00:00
parent 7814246bbd
commit a9154fe760
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/project.pp
View File

@ -1167,6 +1167,8 @@ implementation
const const
ProjectInfoFileVersion = 9; ProjectInfoFileVersion = 9;
ProjOptionsPath = 'ProjectOptions/';
function AddCompileReasonsDiff(const PropertyName: string; function AddCompileReasonsDiff(const PropertyName: string;
const Old, New: TCompileReasons; Tool: TCompilerDiffTool): boolean; const Old, New: TCompileReasons; Tool: TCompilerDiffTool): boolean;
@ -2823,12 +2825,6 @@ var
Path: String; Path: String;
begin begin
Path:='ProjectOptions/'; Path:='ProjectOptions/';
// get format
fStorePathDelim:=CheckPathDelim(FXMLConfig.GetValue(Path+'PathDelim/Value','/'),fPathDelimChanged);
fCurStorePathDelim:=StorePathDelim;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF}
FFileVersion:= FXMLConfig.GetValue(Path+'Version/Value',0);
if not FLoadParts then if not FLoadParts then
begin begin
if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then
@ -2870,16 +2866,10 @@ begin
FXMLConfig.GetValue(Path+'i18n/OutDir/Value', ''),fPathDelimChanged); FXMLConfig.GetValue(Path+'i18n/OutDir/Value', ''),fPathDelimChanged);
end; end;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject E reading comp sets');{$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject E reading comp sets');{$ENDIF}
end;
// load MacroValues and compiler options // Resources
ClearBuildModes;
BuildModes.LoadProjOptsFromXMLConfig(FXMLConfig, Path);
// load matrix options
BuildModes.SharedMatrixOptions.LoadFromXMLConfig(FXMLConfig, Path+'BuildModes/SharedMatrixOptions/');
// Resources
if not FLoadParts then
begin
ProjResources.ReadFromProjectFile(FXMLConfig, Path); ProjResources.ReadFromProjectFile(FXMLConfig, Path);
// load custom data // load custom data
LoadStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/'); LoadStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/');
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject update ct boss');{$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject update ct boss');{$ENDIF}
@ -2980,7 +2970,17 @@ begin
end; end;
try try
// get format
fStorePathDelim:=CheckPathDelim(FXMLConfig.GetValue('ProjectOptions/PathDelim/Value','/'),fPathDelimChanged);
fCurStorePathDelim:=StorePathDelim;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF}
FFileVersion:= FXMLConfig.GetValue('ProjectOptions/Version/Value',0);
LoadFromLPI; LoadFromLPI;
// load MacroValues and compiler options
ClearBuildModes;
BuildModes.LoadProjOptsFromXMLConfig(FXMLConfig, ProjOptionsPath);
// load matrix options
BuildModes.SharedMatrixOptions.LoadFromXMLConfig(FXMLConfig, 'ProjectOptions/BuildModes/SharedMatrixOptions/');
finally finally
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject freeing xml');{$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject freeing xml');{$ENDIF}
fPathDelimChanged:=false; fPathDelimChanged:=false;