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

IDE: Move "if not FLoadParts ..." test outside of TProject.LoadFromLPI.

Browse Source 
git-svn-id: trunk@45761 -
This commit is contained in:
juha 2014-07-03 11:50:56 +00:00
parent a9154fe760
commit 399317698e
1 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
ide/project.pp
View File

@ -2821,75 +2821,71 @@ begin
end; end;
procedure TProject.LoadFromLPI; procedure TProject.LoadFromLPI;
var const
Path: String; Path = 'ProjectOptions/';
begin begin
Path:='ProjectOptions/'; if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then
if not FLoadParts then if IDEMessageDialog(lisStrangeLpiFile,
begin Format(lisTheFileDoesNotLookLikeALpiFile, [ProjectInfoFile]),
if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then mtConfirmation,[mbIgnore,mbAbort])<>mrIgnore
if IDEMessageDialog(lisStrangeLpiFile, then exit;
Format(lisTheFileDoesNotLookLikeALpiFile, [ProjectInfoFile]),
mtConfirmation,[mbIgnore,mbAbort])<>mrIgnore
then exit;
LoadFlags(Path); LoadFlags(Path);
SessionStorage:=StrToProjectSessionStorage( SessionStorage:=StrToProjectSessionStorage(
FXMLConfig.GetValue(Path+'General/SessionStorage/Value', FXMLConfig.GetValue(Path+'General/SessionStorage/Value',
ProjectSessionStorageNames[DefaultProjectSessionStorage])); ProjectSessionStorageNames[DefaultProjectSessionStorage]));
//DebugLn('TProject.ReadProject SessionStorage=',dbgs(ord(SessionStorage)),' ProjectSessionFile=',ProjectSessionFile); //DebugLn('TProject.ReadProject SessionStorage=',dbgs(ord(SessionStorage)),' ProjectSessionFile=',ProjectSessionFile);
// load properties // load properties
// Note: in FFileVersion<9 the default value was -1 // Note: in FFileVersion<9 the default value was -1
// Since almost all projects have a MainUnit the value 0 was always // Since almost all projects have a MainUnit the value 0 was always
// added to the lpi. // added to the lpi.
// Changing the default value to 0 avoids the redundancy and // Changing the default value to 0 avoids the redundancy and
// automatically fixes broken lpi files. // automatically fixes broken lpi files.
FNewMainUnitID := FXMLConfig.GetValue(Path+'General/MainUnit/Value', 0); FNewMainUnitID := FXMLConfig.GetValue(Path+'General/MainUnit/Value', 0);
Title := FXMLConfig.GetValue(Path+'General/Title/Value', ''); Title := FXMLConfig.GetValue(Path+'General/Title/Value', '');
UseAppBundle := FXMLConfig.GetValue(Path+'General/UseAppBundle/Value', True); UseAppBundle := FXMLConfig.GetValue(Path+'General/UseAppBundle/Value', True);
AutoCreateForms := FXMLConfig.GetValue(Path+'General/AutoCreateForms/Value', true); AutoCreateForms := FXMLConfig.GetValue(Path+'General/AutoCreateForms/Value', true);
// fpdoc // fpdoc
FPDocPaths:=SwitchPathDelims(FXMLConfig.GetValue(Path+'LazDoc/Paths',''),fPathDelimChanged); FPDocPaths:=SwitchPathDelims(FXMLConfig.GetValue(Path+'LazDoc/Paths',''),fPathDelimChanged);
FPDocPackageName:=FXMLConfig.GetValue(Path+'LazDoc/PackageName',''); FPDocPackageName:=FXMLConfig.GetValue(Path+'LazDoc/PackageName','');
// i18n // i18n
if FFileVersion<6 then begin if FFileVersion<6 then begin
POOutputDirectory := SwitchPathDelims( POOutputDirectory := SwitchPathDelims(
FXMLConfig.GetValue(Path+'RST/OutDir', ''),fPathDelimChanged); FXMLConfig.GetValue(Path+'RST/OutDir', ''),fPathDelimChanged);
EnableI18N := POOutputDirectory <> ''; EnableI18N := POOutputDirectory <> '';
end else begin end else begin
EnableI18N := FXMLConfig.GetValue(Path+'i18n/EnableI18N/Value', False); EnableI18N := FXMLConfig.GetValue(Path+'i18n/EnableI18N/Value', False);
EnableI18NForLFM := FXMLConfig.GetValue(Path+'i18n/EnableI18N/LFM', True); EnableI18NForLFM := FXMLConfig.GetValue(Path+'i18n/EnableI18N/LFM', True);
POOutputDirectory := SwitchPathDelims( POOutputDirectory := SwitchPathDelims(
FXMLConfig.GetValue(Path+'i18n/OutDir/Value', ''),fPathDelimChanged); FXMLConfig.GetValue(Path+'i18n/OutDir/Value', ''),fPathDelimChanged);
end;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject E reading comp sets');{$ENDIF}
// Resources
ProjResources.ReadFromProjectFile(FXMLConfig, Path);
// load custom data
LoadStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/');
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject update ct boss');{$ENDIF}
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'ProjPath']:=ProjectDirectory;
CodeToolBoss.DefineTree.ClearCache;
// load the dependencies
LoadPkgDependencyList(FXMLConfig,Path+'RequiredPackages/',
FFirstRequiredDependency,pdlRequires,Self,true,false);
// load the Run and Build parameter Options
RunParameterOptions.Load(FXMLConfig,Path,fPathDelimChanged);
// load the Publish Options
PublishOptions.LoadFromXMLConfig(FXMLConfig,Path+'PublishOptions/',fPathDelimChanged);
// load custom defines
LoadCustomDefines(Path);
// load session info
LoadSessionInfo(Path,false);
// call hooks to read their info (e.g. DebugBoss)
if Assigned(OnLoadProjectInfo) then
OnLoadProjectInfo(Self, FXMLConfig, false);
end; end;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject E reading comp sets');{$ENDIF}
// Resources
ProjResources.ReadFromProjectFile(FXMLConfig, Path);
// load custom data
LoadStringToStringTree(FXMLConfig,CustomData,Path+'CustomData/');
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject update ct boss');{$ENDIF}
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'ProjPath']:=ProjectDirectory;
CodeToolBoss.DefineTree.ClearCache;
// load the dependencies
LoadPkgDependencyList(FXMLConfig,Path+'RequiredPackages/',
FFirstRequiredDependency,pdlRequires,Self,true,false);
// load the Run and Build parameter Options
RunParameterOptions.Load(FXMLConfig,Path,fPathDelimChanged);
// load the Publish Options
PublishOptions.LoadFromXMLConfig(FXMLConfig,Path+'PublishOptions/',fPathDelimChanged);
// load custom defines
LoadCustomDefines(Path);
// load session info
LoadSessionInfo(Path,false);
// call hooks to read their info (e.g. DebugBoss)
if Assigned(OnLoadProjectInfo) then
OnLoadProjectInfo(Self, FXMLConfig, false);
end; end;
procedure TProject.LoadFromSession; procedure TProject.LoadFromSession;
@ -2975,7 +2971,8 @@ begin
fCurStorePathDelim:=StorePathDelim; fCurStorePathDelim:=StorePathDelim;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF}
FFileVersion:= FXMLConfig.GetValue('ProjectOptions/Version/Value',0); FFileVersion:= FXMLConfig.GetValue('ProjectOptions/Version/Value',0);
LoadFromLPI; if not FLoadParts then
LoadFromLPI;
// load MacroValues and compiler options // load MacroValues and compiler options
ClearBuildModes; ClearBuildModes;
BuildModes.LoadProjOptsFromXMLConfig(FXMLConfig, ProjOptionsPath); BuildModes.LoadProjOptsFromXMLConfig(FXMLConfig, ProjOptionsPath);