mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-13 10:29:24 +02:00
Packager: Rename types and vars.
git-svn-id: trunk@63955 -
This commit is contained in:
juha
parent
5286e8b775
commit
5382b08b6e
@ -2980,7 +2980,7 @@ begin
|
||||
CodeToolBoss.DefineTree.ClearCache;
|
||||
// load the dependencies
|
||||
LoadPkgDependencyList(FXMLConfig,Path+'RequiredPackages/',
|
||||
FFirstRequiredDependency,pdlRequires,Self,true,false);
|
||||
FFirstRequiredDependency,pddRequires,Self,true,false);
|
||||
// load the Run and Build parameter Options
|
||||
RunParameterOptions.Clear;
|
||||
if FFileVersion<11 then
|
||||
@ -3314,7 +3314,7 @@ begin
|
||||
RunParameterOptions.Save(FXMLConfig,Path+'RunParams/',fCurStorePathDelim,rpsLPI, UseLegacyLists);
|
||||
// save dependencies
|
||||
SavePkgDependencyList(FXMLConfig,Path+'RequiredPackages/',
|
||||
FFirstRequiredDependency,pdlRequires,fCurStorePathDelim,pfCompatibilityMode in FFlags);
|
||||
FFirstRequiredDependency,pddRequires,fCurStorePathDelim,pfCompatibilityMode in FFlags);
|
||||
// save units
|
||||
SaveUnits(Path,FSaveSessionInLPI);
|
||||
|
||||
@ -4605,29 +4605,29 @@ end;
|
||||
|
||||
function TProject.FindDependencyByName(const PackageName: string): TPkgDependency;
|
||||
begin
|
||||
Result:=FindDependencyByNameInList(FFirstRequiredDependency,pdlRequires,
|
||||
Result:=FindDependencyByNameInList(FFirstRequiredDependency,pddRequires,
|
||||
PackageName);
|
||||
end;
|
||||
|
||||
function TProject.FindRemovedDependencyByName(const PkgName: string): TPkgDependency;
|
||||
begin
|
||||
Result:=FindDependencyByNameInList(FFirstRemovedDependency,pdlRequires,PkgName);
|
||||
Result:=FindDependencyByNameInList(FFirstRemovedDependency,pddRequires,PkgName);
|
||||
end;
|
||||
|
||||
function TProject.RequiredDepByIndex(Index: integer): TPkgDependency;
|
||||
begin
|
||||
Result:=GetDependencyWithIndex(FFirstRequiredDependency,pdlRequires,Index);
|
||||
Result:=GetDependencyWithIndex(FFirstRequiredDependency,pddRequires,Index);
|
||||
end;
|
||||
|
||||
function TProject.RemovedDepByIndex(Index: integer): TPkgDependency;
|
||||
begin
|
||||
Result:=GetDependencyWithIndex(FFirstRemovedDependency,pdlRequires,Index);
|
||||
Result:=GetDependencyWithIndex(FFirstRemovedDependency,pddRequires,Index);
|
||||
end;
|
||||
|
||||
procedure TProject.AddRequiredDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
BeginUpdate(true);
|
||||
Dependency.AddToList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.AddToList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.Owner:=Self;
|
||||
Dependency.HoldPackage:=true;
|
||||
FDefineTemplates.CustomDefinesChanged;
|
||||
@ -4645,9 +4645,9 @@ end;
|
||||
procedure TProject.RemoveRequiredDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
BeginUpdate(true);
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.AddToList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.AddToList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Removed:=true;
|
||||
FDefineTemplates.CustomDefinesChanged;
|
||||
IncreaseCompilerParseStamp;
|
||||
@ -4662,7 +4662,7 @@ procedure TProject.DeleteRequiredDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
BeginUpdate(true);
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
FDefineTemplates.CustomDefinesChanged;
|
||||
IncreaseCompilerParseStamp;
|
||||
@ -4673,7 +4673,7 @@ procedure TProject.DeleteRemovedDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
BeginUpdate(true);
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
EndUpdate;
|
||||
end;
|
||||
@ -4681,7 +4681,7 @@ end;
|
||||
procedure TProject.RemoveRemovedDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
BeginUpdate(true);
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Removed:=false;
|
||||
EndUpdate;
|
||||
end;
|
||||
@ -4698,7 +4698,7 @@ procedure TProject.MoveRequiredDependencyUp(Dependency: TPkgDependency);
|
||||
begin
|
||||
if Dependency.PrevRequiresDependency=nil then exit;
|
||||
BeginUpdate(true);
|
||||
Dependency.MoveUpInList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.MoveUpInList(FFirstRequiredDependency,pddRequires);
|
||||
FDefineTemplates.CustomDefinesChanged;
|
||||
IncreaseCompilerParseStamp;
|
||||
EndUpdate;
|
||||
@ -4708,7 +4708,7 @@ procedure TProject.MoveRequiredDependencyDown(Dependency: TPkgDependency);
|
||||
begin
|
||||
if Dependency.NextRequiresDependency=nil then exit;
|
||||
BeginUpdate(true);
|
||||
Dependency.MoveDownInList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.MoveDownInList(FFirstRequiredDependency,pddRequires);
|
||||
FDefineTemplates.CustomDefinesChanged;
|
||||
IncreaseCompilerParseStamp;
|
||||
EndUpdate;
|
||||
@ -4720,7 +4720,7 @@ begin
|
||||
Result:=PackageGraph.FindDependencyRecursively(FFirstRequiredDependency,
|
||||
APackage)<>nil
|
||||
else
|
||||
Result:=FindCompatibleDependencyInList(FFirstRequiredDependency,pdlRequires,
|
||||
Result:=FindCompatibleDependencyInList(FFirstRequiredDependency,pddRequires,
|
||||
APackage)<>nil;
|
||||
end;
|
||||
|
||||
@ -4739,7 +4739,7 @@ procedure TProject.AddPackageDependency(const PackageName: string);
|
||||
var
|
||||
PkgDependency: TPkgDependency;
|
||||
begin
|
||||
if FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName)
|
||||
if FindDependencyByNameInList(FirstRequiredDependency,pddRequires,PackageName)
|
||||
<>nil then exit;
|
||||
PkgDependency:=TPkgDependency.Create;
|
||||
PkgDependency.DependencyType:=pdtLazarus;
|
||||
@ -4751,7 +4751,7 @@ function TProject.RemovePackageDependency(const PackageName: string): boolean;
|
||||
var
|
||||
PkgDependency: TPkgDependency;
|
||||
begin
|
||||
PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName);
|
||||
PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pddRequires,PackageName);
|
||||
Result := Assigned(PkgDependency);
|
||||
if Result then
|
||||
RemoveRequiredDependency(PkgDependency);
|
||||
|
||||
@ -1207,7 +1207,7 @@ begin
|
||||
while CurFile<>nil do begin
|
||||
Filename:=CurFile.GetShortFilename(true);
|
||||
if Filename<>'' then Begin
|
||||
ANodeData := FPropGui.CreateNodeData(penFile, CurFile.Filename, False);
|
||||
ANodeData:=FPropGui.CreateNodeData(penFile, CurFile.Filename, False);
|
||||
FilesBranch.AddNodeData(Filename, ANodeData, CurFile.Filename);
|
||||
end;
|
||||
CurFile:=CurFile.NextPartOfProject;
|
||||
|
||||
@ -5,13 +5,15 @@ unit AddFPMakeDependencyDlg;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ButtonPanel,
|
||||
StdCtrls, ListFilterEdit,
|
||||
ProjPackCommon,
|
||||
PackageDefs,
|
||||
LazarusIDEStrConsts,
|
||||
Classes, SysUtils,
|
||||
// LCL
|
||||
LResources, Forms, Controls, Graphics, Dialogs, ButtonPanel, StdCtrls,
|
||||
// LazControls
|
||||
ListFilterEdit,
|
||||
// IdeIntf
|
||||
IDEWindowIntf,
|
||||
AddPkgDependencyDlg,
|
||||
// IDE
|
||||
ProjPackCommon, PackageDefs, LazarusIDEStrConsts, AddPkgDependencyDlg,
|
||||
// fppkg
|
||||
FppkgHelper;
|
||||
|
||||
|
||||
@ -229,9 +229,9 @@ type
|
||||
);
|
||||
TPkgMarkerFlags = set of TPkgMarkerFlag;
|
||||
|
||||
TPkgDependencyList = (
|
||||
pdlRequires,
|
||||
pdlUsedBy
|
||||
TPkgDependencyDirection = (
|
||||
pddRequires,
|
||||
pddUsedBy
|
||||
);
|
||||
|
||||
TPkgDependencyType = (
|
||||
@ -263,7 +263,7 @@ type
|
||||
protected
|
||||
procedure SetPackageName(const AValue: string); override;
|
||||
public
|
||||
NextDependency, PrevDependency: array[TPkgDependencyList] of TPkgDependency;
|
||||
NextDependency, PrevDependency: array[TPkgDependencyDirection] of TPkgDependency;
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
procedure Clear; override;
|
||||
@ -291,15 +291,15 @@ type
|
||||
procedure RemoveRequiresDep(var FirstDependency: TPkgDependencyBase); override;
|
||||
// API using ListType.
|
||||
procedure AddToList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
procedure AddToEndOfList(var LastDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
procedure RemoveFromList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
function MoveUpInList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList): Boolean;
|
||||
ListType: TPkgDependencyDirection): Boolean;
|
||||
function MoveDownInList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList): Boolean;
|
||||
ListType: TPkgDependencyDirection): Boolean;
|
||||
function MakeFilenameRelativeToOwner(const AFilename: string): string;
|
||||
function FindDefaultFilename: string;
|
||||
public
|
||||
@ -832,31 +832,31 @@ function FileNameToPkgFileType(AFilename: string): TPkgFileType;
|
||||
|
||||
procedure SortDependencyListAlphabetically(Dependencies: TFPList);
|
||||
procedure LoadPkgDependencyList(XMLConfig: TXMLConfig; const ThePath: string;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList; Owner: TObject;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection; Owner: TObject;
|
||||
HoldPackages, SortList: boolean);
|
||||
procedure SavePkgDependencyList(XMLConfig: TXMLConfig; const ThePath: string;
|
||||
First: TPkgDependency; ListType: TPkgDependencyList;
|
||||
First: TPkgDependency; ListType: TPkgDependencyDirection;
|
||||
UsePathDelim: TPathDelimSwitch;LegacyLists:Boolean);
|
||||
procedure ListPkgIDToDependencyList(ListOfTLazPackageID: TObjectList;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList; Owner: TObject;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection; Owner: TObject;
|
||||
HoldPackages: boolean);
|
||||
procedure DeleteDependencyInList(ADependency: TPkgDependency;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList);
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection);
|
||||
procedure FreeDependencyList(var First: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
function DependencyListAsString(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList): string;
|
||||
ListType: TPkgDependencyDirection): string;
|
||||
|
||||
function FindDependencyByNameInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; const Name: string): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; const Name: string): TPkgDependency;
|
||||
function FindCompatibleDependencyInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; ComparePackage: TLazPackageID): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; ComparePackage: TLazPackageID): TPkgDependency;
|
||||
function GetDependencyWithIndex(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; Index: integer): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; Index: integer): TPkgDependency;
|
||||
function IndexOfDependencyInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; FindDependency: TPkgDependency): integer;
|
||||
ListType: TPkgDependencyDirection; FindDependency: TPkgDependency): integer;
|
||||
function GetFirstDependency(ListItem: TPkgDependency;
|
||||
ListType: TPkgDependencyList): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection): TPkgDependency;
|
||||
|
||||
function FindLowestPkgDependencyWithName(const PkgName: string): TPkgDependency;
|
||||
function FindLowestPkgDependencyNodeWithName(const PkgName: string): TAVLTreeNode;
|
||||
@ -941,7 +941,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure LoadPkgDependencyList(XMLConfig: TXMLConfig; const ThePath: string;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList; Owner: TObject;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection; Owner: TObject;
|
||||
HoldPackages, SortList: boolean);
|
||||
var
|
||||
i: Integer;
|
||||
@ -986,7 +986,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure SavePkgDependencyList(XMLConfig: TXMLConfig; const ThePath: string;
|
||||
First: TPkgDependency; ListType: TPkgDependencyList;
|
||||
First: TPkgDependency; ListType: TPkgDependencyDirection;
|
||||
UsePathDelim: TPathDelimSwitch; LegacyLists: Boolean);
|
||||
var
|
||||
i: Integer;
|
||||
@ -1005,7 +1005,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure ListPkgIDToDependencyList(ListOfTLazPackageID: TObjectList;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList; Owner: TObject;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection; Owner: TObject;
|
||||
HoldPackages: boolean);
|
||||
var
|
||||
NewDependency: TPkgDependency;
|
||||
@ -1024,7 +1024,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure DeleteDependencyInList(ADependency: TPkgDependency;
|
||||
var First: TPkgDependency; ListType: TPkgDependencyList);
|
||||
var First: TPkgDependency; ListType: TPkgDependencyDirection);
|
||||
var
|
||||
NextDependency, PrevDependency: TPkgDependency;
|
||||
begin
|
||||
@ -1039,7 +1039,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure FreeDependencyList(var First: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
var
|
||||
NextDependency: TPkgDependency;
|
||||
begin
|
||||
@ -1051,7 +1051,7 @@ begin
|
||||
end;
|
||||
|
||||
function DependencyListAsString(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList): string;
|
||||
ListType: TPkgDependencyDirection): string;
|
||||
begin
|
||||
Result:='';
|
||||
while First<>nil do begin
|
||||
@ -1247,7 +1247,7 @@ begin
|
||||
end;
|
||||
|
||||
function FindDependencyByNameInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; const Name: string): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; const Name: string): TPkgDependency;
|
||||
begin
|
||||
Result:=First;
|
||||
while Result<>nil do begin
|
||||
@ -1257,7 +1257,7 @@ begin
|
||||
end;
|
||||
|
||||
function FindCompatibleDependencyInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; ComparePackage: TLazPackageID): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; ComparePackage: TLazPackageID): TPkgDependency;
|
||||
begin
|
||||
Result:=First;
|
||||
while Result<>nil do begin
|
||||
@ -1267,7 +1267,7 @@ begin
|
||||
end;
|
||||
|
||||
function GetDependencyWithIndex(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; Index: integer): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection; Index: integer): TPkgDependency;
|
||||
begin
|
||||
if Index<0 then RaiseGDBException('GetDependencyWithIndex');
|
||||
Result:=First;
|
||||
@ -1381,7 +1381,7 @@ begin
|
||||
end;
|
||||
|
||||
function IndexOfDependencyInList(First: TPkgDependency;
|
||||
ListType: TPkgDependencyList; FindDependency: TPkgDependency): integer;
|
||||
ListType: TPkgDependencyDirection; FindDependency: TPkgDependency): integer;
|
||||
var
|
||||
Dependency: TPkgDependency;
|
||||
begin
|
||||
@ -1396,7 +1396,7 @@ begin
|
||||
end;
|
||||
|
||||
function GetFirstDependency(ListItem: TPkgDependency;
|
||||
ListType: TPkgDependencyList): TPkgDependency;
|
||||
ListType: TPkgDependencyDirection): TPkgDependency;
|
||||
begin
|
||||
Result:=ListItem;
|
||||
if Result=nil then exit;
|
||||
@ -1953,46 +1953,46 @@ end;
|
||||
|
||||
function TPkgDependency.NextUsedByDependency: TPkgDependency;
|
||||
begin
|
||||
Result:=NextDependency[pdlUsedBy];
|
||||
Result:=NextDependency[pddUsedBy];
|
||||
end;
|
||||
|
||||
function TPkgDependency.PrevUsedByDependency: TPkgDependency;
|
||||
begin
|
||||
Result:=PrevDependency[pdlUsedBy];
|
||||
Result:=PrevDependency[pddUsedBy];
|
||||
end;
|
||||
|
||||
function TPkgDependency.NextRequiresDependency: TPkgDependency;
|
||||
begin
|
||||
Result:=NextDependency[pdlRequires];
|
||||
Result:=NextDependency[pddRequires];
|
||||
end;
|
||||
|
||||
function TPkgDependency.PrevRequiresDependency: TPkgDependency;
|
||||
begin
|
||||
Result:=PrevDependency[pdlRequires];
|
||||
Result:=PrevDependency[pddRequires];
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.AddUsedByDep(var FirstDependency: TPkgDependencyBase);
|
||||
begin
|
||||
AddToList(TPkgDependency(FirstDependency), pdlUsedBy);
|
||||
AddToList(TPkgDependency(FirstDependency), pddUsedBy);
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.RemoveUsedByDep(var FirstDependency: TPkgDependencyBase);
|
||||
begin
|
||||
RemoveFromList(TPkgDependency(FirstDependency), pdlUsedBy);
|
||||
RemoveFromList(TPkgDependency(FirstDependency), pddUsedBy);
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.AddRequiresDep(var FirstDependency: TPkgDependencyBase);
|
||||
begin
|
||||
AddToList(TPkgDependency(FirstDependency), pdlRequires);
|
||||
AddToList(TPkgDependency(FirstDependency), pddRequires);
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.RemoveRequiresDep(var FirstDependency: TPkgDependencyBase);
|
||||
begin
|
||||
RemoveFromList(TPkgDependency(FirstDependency), pdlRequires);
|
||||
RemoveFromList(TPkgDependency(FirstDependency), pddRequires);
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.AddToList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
begin
|
||||
NextDependency[ListType]:=FirstDependency;
|
||||
FirstDependency:=Self;
|
||||
@ -2002,7 +2002,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.AddToEndOfList(var LastDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
begin
|
||||
PrevDependency[ListType]:=LastDependency;
|
||||
LastDependency:=Self;
|
||||
@ -2012,7 +2012,7 @@ begin
|
||||
end;
|
||||
|
||||
procedure TPkgDependency.RemoveFromList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList);
|
||||
ListType: TPkgDependencyDirection);
|
||||
begin
|
||||
if FirstDependency=Self then FirstDependency:=NextDependency[ListType];
|
||||
if NextDependency[ListType]<>nil then
|
||||
@ -2024,7 +2024,7 @@ begin
|
||||
end;
|
||||
|
||||
function TPkgDependency.MoveUpInList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList): Boolean;
|
||||
ListType: TPkgDependencyDirection): Boolean;
|
||||
var
|
||||
OldPrev: TPkgDependency;
|
||||
begin
|
||||
@ -2043,7 +2043,7 @@ begin
|
||||
end;
|
||||
|
||||
function TPkgDependency.MoveDownInList(var FirstDependency: TPkgDependency;
|
||||
ListType: TPkgDependencyList): Boolean;
|
||||
ListType: TPkgDependencyDirection): Boolean;
|
||||
var
|
||||
OldNext: TPkgDependency;
|
||||
begin
|
||||
@ -2914,7 +2914,7 @@ begin
|
||||
LoadFiles(Path+'Files/',FFiles);
|
||||
UpdateSourceDirectories;
|
||||
LoadPkgDependencyList(XMLConfig,Path+'RequiredPkgs/',
|
||||
FFirstRequiredDependency,pdlRequires,Self,false,false);
|
||||
FFirstRequiredDependency,pddRequires,Self,false,false);
|
||||
FUsageOptions.LoadFromXMLConfig(XMLConfig,Path+'UsageOptions/',
|
||||
PathDelimChanged);
|
||||
fPublishOptions.LoadFromXMLConfig(XMLConfig,Path+'PublishOptions/',
|
||||
@ -2995,7 +2995,7 @@ begin
|
||||
XMLConfig.SetDeleteValue(Path+'i18n/EnableI18NForLFM/Value', EnableI18NForLFM, false);
|
||||
|
||||
SavePkgDependencyList(XMLConfig,Path+'RequiredPkgs/',
|
||||
FFirstRequiredDependency,pdlRequires,UsePathDelim,UseLegacyLists);
|
||||
FFirstRequiredDependency,pddRequires,UsePathDelim,UseLegacyLists);
|
||||
FUsageOptions.SaveToXMLConfig(XMLConfig,Path+'UsageOptions/',UsePathDelim);
|
||||
fPublishOptions.SaveToXMLConfig(XMLConfig,Path+'PublishOptions/',UsePathDelim);
|
||||
SaveStringList(XMLConfig,FProvides,Path+'Provides/');
|
||||
@ -3299,27 +3299,27 @@ end;
|
||||
|
||||
function TLazPackage.FindDependencyByName(const PackageName: string): TPkgDependency;
|
||||
begin
|
||||
Result:=FindDependencyByNameInList(FFirstRequiredDependency,pdlRequires,PackageName);
|
||||
Result:=FindDependencyByNameInList(FFirstRequiredDependency,pddRequires,PackageName);
|
||||
end;
|
||||
|
||||
function TLazPackage.FindRemovedDependencyByName(const PkgName: string): TPkgDependency;
|
||||
begin
|
||||
Result:=FindDependencyByNameInList(FFirstRemovedDependency,pdlRequires,PkgName);
|
||||
Result:=FindDependencyByNameInList(FFirstRemovedDependency,pddRequires,PkgName);
|
||||
end;
|
||||
|
||||
function TLazPackage.RequiredDepByIndex(Index: integer): TPkgDependency;
|
||||
begin
|
||||
Result:=GetDependencyWithIndex(FFirstRequiredDependency,pdlRequires,Index);
|
||||
Result:=GetDependencyWithIndex(FFirstRequiredDependency,pddRequires,Index);
|
||||
end;
|
||||
|
||||
function TLazPackage.RemovedDepByIndex(Index: integer): TPkgDependency;
|
||||
begin
|
||||
Result:=GetDependencyWithIndex(FFirstRemovedDependency,pdlRequires,Index);
|
||||
Result:=GetDependencyWithIndex(FFirstRemovedDependency,pddRequires,Index);
|
||||
end;
|
||||
|
||||
function TLazPackage.UsedByDepByIndex(Index: integer): TPkgDependency;
|
||||
begin
|
||||
Result:=GetDependencyWithIndex(FFirstUsedByDependency,pdlUsedBy,Index);
|
||||
Result:=GetDependencyWithIndex(FFirstUsedByDependency,pddUsedBy,Index);
|
||||
end;
|
||||
|
||||
function TLazPackage.FindUsedByDepPrefer(Ignore: TPkgDependency): TPkgDependency;
|
||||
@ -3633,13 +3633,13 @@ end;
|
||||
|
||||
procedure TLazPackage.RemoveRemovedDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Removed:=false;
|
||||
end;
|
||||
|
||||
procedure TLazPackage.AddRequiredDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
Dependency.AddToList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.AddToList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.Owner:=Self;
|
||||
Modified:=true;
|
||||
end;
|
||||
@ -3657,9 +3657,9 @@ end;
|
||||
procedure TLazPackage.RemoveRequiredDepSilently(Dependency: TPkgDependency);
|
||||
// Remove a dependency without setting the Modified flag. Caller must take care of it.
|
||||
begin
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.AddToList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.AddToList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Removed:=true;
|
||||
end;
|
||||
|
||||
@ -3672,25 +3672,25 @@ end;
|
||||
procedure TLazPackage.DeleteRequiredDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRequiredDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
end;
|
||||
|
||||
procedure TLazPackage.DeleteRemovedDependency(Dependency: TPkgDependency);
|
||||
begin
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(FFirstRemovedDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
end;
|
||||
|
||||
function TLazPackage.MoveRequiredDependencyUp(Dependency: TPkgDependency): Boolean;
|
||||
begin
|
||||
Result := Dependency.MoveUpInList(FFirstRequiredDependency,pdlRequires);
|
||||
Result := Dependency.MoveUpInList(FFirstRequiredDependency,pddRequires);
|
||||
end;
|
||||
|
||||
function TLazPackage.MoveRequiredDependencyDown(Dependency: TPkgDependency): Boolean;
|
||||
begin
|
||||
Result := Dependency.MoveDownInList(FFirstRequiredDependency,pdlRequires);
|
||||
Result := Dependency.MoveDownInList(FFirstRequiredDependency,pddRequires);
|
||||
end;
|
||||
|
||||
function TLazPackage.CreateDependencyWithOwner(NewOwner: TObject;
|
||||
@ -3725,7 +3725,7 @@ end;
|
||||
|
||||
function TLazPackage.Requires(APackage: TLazPackage): boolean;
|
||||
begin
|
||||
Result:=FindCompatibleDependencyInList(FFirstRequiredDependency,pdlRequires,
|
||||
Result:=FindCompatibleDependencyInList(FFirstRequiredDependency,pddRequires,
|
||||
APackage)<>nil;
|
||||
end;
|
||||
|
||||
|
||||
@ -2304,37 +2304,35 @@ end;
|
||||
|
||||
procedure TPackageEditorForm.UpdateRequiredPkgs(Immediately: boolean);
|
||||
var
|
||||
CurDependency: TPkgDependency;
|
||||
Dependency: TPkgDependency;
|
||||
RequiredBranch, RemovedBranch: TTreeFilterBranch;
|
||||
OldFilter: String;
|
||||
NodeData: TPENodeData;
|
||||
begin
|
||||
if not CanUpdate(pefNeedUpdateRequiredPkgs,Immediately) then exit;
|
||||
|
||||
OldFilter := FilterEdit.ForceFilter('');
|
||||
|
||||
// required packages
|
||||
RequiredBranch:=FilterEdit.GetCleanBranch(FRequiredPackagesNode);
|
||||
FPropGui.FreeNodeData(penDependency);
|
||||
RequiredBranch.ClearNodeData;
|
||||
CurDependency:=LazPackage.FirstRequiredDependency;
|
||||
FPropGui.FreeNodeData(penDependency);
|
||||
Dependency:=LazPackage.FirstRequiredDependency;
|
||||
FilterEdit.SelectedPart:=nil;
|
||||
while CurDependency<>nil do begin
|
||||
NodeData:=FPropGui.CreateNodeData(penDependency,CurDependency.PackageName,false);
|
||||
while Dependency<>nil do begin
|
||||
NodeData:=FPropGui.CreateNodeData(penDependency,Dependency.PackageName,false);
|
||||
if (FNextSelectedPart<>nil) and (FNextSelectedPart.Typ=penDependency)
|
||||
and (FNextSelectedPart.Name=NodeData.Name)
|
||||
then
|
||||
FilterEdit.SelectedPart:=NodeData;
|
||||
RequiredBranch.AddNodeData(DependencyAsString(CurDependency), NodeData);
|
||||
CurDependency:=CurDependency.NextRequiresDependency;
|
||||
RequiredBranch.AddNodeData(DependencyAsString(Dependency), NodeData);
|
||||
Dependency:=Dependency.NextRequiresDependency;
|
||||
end;
|
||||
if (FNextSelectedPart<>nil) and (FNextSelectedPart.Typ=penDependency) then
|
||||
FreeAndNil(FNextSelectedPart);
|
||||
RequiredBranch.InvalidateBranch;
|
||||
|
||||
// removed required packages
|
||||
CurDependency:=LazPackage.FirstRemovedDependency;
|
||||
if CurDependency<>nil then begin
|
||||
Dependency:=LazPackage.FirstRemovedDependency;
|
||||
if Dependency<>nil then begin
|
||||
if FRemovedRequiredNode=nil then begin
|
||||
FRemovedRequiredNode:=ItemsTreeView.Items.Add(nil,lisPckEditRemovedRequiredPackages);
|
||||
FRemovedRequiredNode.ImageIndex:=FPropGui.ImageIndexRemovedRequired;
|
||||
@ -2342,10 +2340,10 @@ begin
|
||||
end;
|
||||
RemovedBranch:=FilterEdit.GetCleanBranch(FRemovedRequiredNode);
|
||||
RemovedBranch.ClearNodeData;
|
||||
while CurDependency<>nil do begin
|
||||
NodeData:=FPropGui.CreateNodeData(penDependency,CurDependency.PackageName,true);
|
||||
RemovedBranch.AddNodeData(DependencyAsString(CurDependency), NodeData);
|
||||
CurDependency:=CurDependency.NextRequiresDependency;
|
||||
while Dependency<>nil do begin
|
||||
NodeData:=FPropGui.CreateNodeData(penDependency,Dependency.PackageName,true);
|
||||
RemovedBranch.AddNodeData(DependencyAsString(Dependency), NodeData);
|
||||
Dependency:=Dependency.NextRequiresDependency;
|
||||
end;
|
||||
RemovedBranch.InvalidateBranch;
|
||||
end else begin
|
||||
|
||||
@ -2211,7 +2211,7 @@ procedure TLazPackageGraph.LoadStaticBasePackages;
|
||||
Dependency: TPkgDependency;
|
||||
Quiet: Boolean;
|
||||
begin
|
||||
if FindDependencyByNameInList(FirstAutoInstallDependency,pdlRequires,
|
||||
if FindDependencyByNameInList(FirstAutoInstallDependency,pddRequires,
|
||||
PkgName)<>nil
|
||||
then
|
||||
exit;
|
||||
@ -2219,7 +2219,7 @@ procedure TLazPackageGraph.LoadStaticBasePackages;
|
||||
Dependency.Owner:=Self;
|
||||
Dependency.PackageName:=PkgName;
|
||||
Dependency.DependencyType:=pdtLazarus;
|
||||
Dependency.AddToList(FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.AddToList(FirstAutoInstallDependency,pddRequires);
|
||||
Quiet:=false;
|
||||
OpenInstalledDependency(Dependency,pitStatic,Quiet);
|
||||
end;
|
||||
@ -2253,14 +2253,14 @@ begin
|
||||
PackageName:=PkgList[i];
|
||||
if not IsValidPkgName(PackageName) then continue;
|
||||
Dependency:=FindDependencyByNameInList(FirstAutoInstallDependency,
|
||||
pdlRequires,PackageName);
|
||||
pddRequires,PackageName);
|
||||
//DebugLn('TLazPackageGraph.LoadAutoInstallPackages ',dbgs(Dependency),' ',PackageName);
|
||||
if Dependency<>nil then continue;
|
||||
Dependency:=TPkgDependency.Create;
|
||||
Dependency.Owner:=Self;
|
||||
Dependency.DependencyType:=pdtLazarus;
|
||||
Dependency.PackageName:=PackageName;
|
||||
Dependency.AddToList(FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.AddToList(FirstAutoInstallDependency,pddRequires);
|
||||
if OpenDependency(Dependency,false)<>lprSuccess then begin
|
||||
IDEMessageDialog(lisPkgMangUnableToLoadPackage,
|
||||
Format(lisPkgMangUnableToOpenThePackage, [PackageName, LineEnding]),
|
||||
@ -2384,7 +2384,7 @@ begin
|
||||
begin
|
||||
Dependency:=PackageGraph.FirstAutoInstallDependency;
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
end;
|
||||
end;
|
||||
@ -3011,7 +3011,7 @@ function TLazPackageGraph.FindFPCConflictUnit(APackage: TLazPackage;
|
||||
while ADependency<>nil do begin
|
||||
Result:=CheckPackage(ADependency.RequiredPackage);
|
||||
if Result then exit;
|
||||
ADependency:=ADependency.NextDependency[pdlRequires];
|
||||
ADependency:=ADependency.NextDependency[pddRequires];
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -5622,13 +5622,13 @@ begin
|
||||
Dependency:=Dependencies[i];
|
||||
//debugln('TLazPackageGraph.SortDependencyListTopologically A ',Dependency.AsString);
|
||||
if i=0 then
|
||||
Dependency.PrevDependency[pdlRequires]:=nil
|
||||
Dependency.PrevDependency[pddRequires]:=nil
|
||||
else
|
||||
Dependency.PrevDependency[pdlRequires]:=Dependencies[i-1];
|
||||
Dependency.PrevDependency[pddRequires]:=Dependencies[i-1];
|
||||
if i=DependencyCount-1 then
|
||||
Dependency.NextDependency[pdlRequires]:=nil
|
||||
Dependency.NextDependency[pddRequires]:=nil
|
||||
else
|
||||
Dependency.NextDependency[pdlRequires]:=Dependencies[i+1];
|
||||
Dependency.NextDependency[pddRequires]:=Dependencies[i+1];
|
||||
end;
|
||||
|
||||
// clean up
|
||||
@ -6356,10 +6356,10 @@ procedure TLazPackageGraph.GetConnectionsTree(FirstDependency: TPkgDependency;
|
||||
Pkg2:=Dependency2.RequiredPackage;
|
||||
if Pkg2<>nil then
|
||||
AddConnection(Pkg1,Pkg2);
|
||||
Dependency2:=Dependency2.NextDependency[pdlRequires];
|
||||
Dependency2:=Dependency2.NextDependency[pddRequires];
|
||||
end;
|
||||
end;
|
||||
Dependency1:=Dependency1.NextDependency[pdlRequires];
|
||||
Dependency1:=Dependency1.NextDependency[pddRequires];
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -1623,10 +1623,10 @@ begin
|
||||
Result:=NewDependency.RequiredPackage;
|
||||
if AddToAutoInstall and (Result<>nil) then begin
|
||||
if FindDependencyByNameInList(
|
||||
PackageGraph.FirstAutoInstallDependency,pdlRequires,PackageName)=nil
|
||||
PackageGraph.FirstAutoInstallDependency,pddRequires,PackageName)=nil
|
||||
then begin
|
||||
NewDependency.RequiredPackage.AutoInstall:=pitStatic;
|
||||
NewDependency.AddToList(PackageGraph.FirstAutoInstallDependency,pdlRequires)
|
||||
NewDependency.AddToList(PackageGraph.FirstAutoInstallDependency,pddRequires)
|
||||
end else
|
||||
NewDependency.Free;
|
||||
PackageList:=MiscellaneousOptions.BuildLazProfiles.StaticAutoInstallPackages;
|
||||
@ -3107,7 +3107,7 @@ begin
|
||||
while PackageGraph.FirstAutoInstallDependency<>nil do begin
|
||||
Dependency:=PackageGraph.FirstAutoInstallDependency;
|
||||
Dependency.RequiredPackage:=nil;
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
end;
|
||||
end;
|
||||
@ -3372,7 +3372,7 @@ begin
|
||||
end;
|
||||
|
||||
// check if the dependency is already there
|
||||
if FindDependencyByNameInList(AProject.FirstRequiredDependency,pdlRequires,
|
||||
if FindDependencyByNameInList(AProject.FirstRequiredDependency,pddRequires,
|
||||
APackage.Name)<>nil
|
||||
then begin
|
||||
// package already there
|
||||
@ -4686,7 +4686,7 @@ begin
|
||||
RequiredPackage:=InputPackageList.Items[CurPackageIdx];
|
||||
if (RequiredPackage<>nil)
|
||||
and (RequiredPackage<>UnitOwner)
|
||||
and (FindCompatibleDependencyInList(FirstDependency,pdlRequires,RequiredPackage)=nil)
|
||||
and (FindCompatibleDependencyInList(FirstDependency,pddRequires,RequiredPackage)=nil)
|
||||
and (PackageGraph.FindPackageProvidingName(FirstDependency,RequiredPackage.Name)=nil)
|
||||
then begin
|
||||
if OutputPackageList=nil then
|
||||
@ -5628,7 +5628,7 @@ begin
|
||||
if RequiredPackage.AutoInstall=pitNope then begin
|
||||
RequiredPackage.AutoInstall:=pitStatic;
|
||||
Dependency:=RequiredPackage.CreateDependencyWithOwner(Self);
|
||||
Dependency.AddToList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.AddToList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
PackageGraph.OpenDependency(Dependency,false);
|
||||
NeedSaving:=true;
|
||||
end;
|
||||
@ -5719,9 +5719,9 @@ begin
|
||||
if APackage.AutoInstall<>pitNope then begin
|
||||
APackage.AutoInstall:=pitNope;
|
||||
Dependency:=FindCompatibleDependencyInList(PackageGraph.FirstAutoInstallDependency,
|
||||
pdlRequires,APackage);
|
||||
pddRequires,APackage);
|
||||
if Dependency<>nil then begin
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
Dependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
Dependency.Free;
|
||||
PackageGraph.SortAutoInstallDependencies;
|
||||
end;
|
||||
@ -5772,7 +5772,7 @@ var
|
||||
PkgName: string;
|
||||
begin
|
||||
PkgName := ADependency.PackageName; // DeleteDependencyInList destroys ADependency -> don't use it anymore!
|
||||
DeleteDependencyInList(ADependency,NewFirstAutoInstallDependency,pdlRequires);
|
||||
DeleteDependencyInList(ADependency,NewFirstAutoInstallDependency,pddRequires);
|
||||
if piiifRemoveConflicts in Flags then
|
||||
for i:=PkgIDList.Count-1 downto 0 do begin
|
||||
PkgID:=TLazPackageID(PkgIDList[i]);
|
||||
@ -5795,7 +5795,7 @@ begin
|
||||
try
|
||||
// create new auto install dependency PkgIDList
|
||||
ListPkgIDToDependencyList(PkgIDList,NewFirstAutoInstallDependency,
|
||||
pdlRequires,Self,true);
|
||||
pddRequires,Self,true);
|
||||
|
||||
// load all required packages
|
||||
if LoadDependencyList(NewFirstAutoInstallDependency,piiifQuiet in Flags)<>mrOk then exit;
|
||||
@ -5857,7 +5857,7 @@ begin
|
||||
|
||||
Result:=true;
|
||||
finally
|
||||
FreeDependencyList(NewFirstAutoInstallDependency,pdlRequires);
|
||||
FreeDependencyList(NewFirstAutoInstallDependency,pddRequires);
|
||||
PkgList.Free;
|
||||
end;
|
||||
end;
|
||||
@ -5877,7 +5877,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
|
||||
CurDependency:=NewDependencyList;
|
||||
while CurDependency<>nil do begin
|
||||
s:=CurDependency.AsString;
|
||||
OldDependency:=FindDependencyByNameInList(OldDependencyList,pdlRequires,
|
||||
OldDependency:=FindDependencyByNameInList(OldDependencyList,pddRequires,
|
||||
CurDependency.PackageName);
|
||||
if OldDependency=nil then begin
|
||||
// newly installed
|
||||
@ -5890,7 +5890,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
|
||||
// list all packages, that will be removed
|
||||
CurDependency:=OldDependencyList;
|
||||
while CurDependency<>nil do begin
|
||||
NewDependency:=FindDependencyByNameInList(NewDependencyList,pdlRequires,
|
||||
NewDependency:=FindDependencyByNameInList(NewDependencyList,pddRequires,
|
||||
CurDependency.PackageName);
|
||||
if NewDependency=nil then
|
||||
// this package will be removed
|
||||
@ -5902,7 +5902,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
|
||||
CurDependency:=NewDependencyList;
|
||||
while CurDependency<>nil do begin
|
||||
s:=CurDependency.AsString;
|
||||
OldDependency:=FindDependencyByNameInList(OldDependencyList,pdlRequires,
|
||||
OldDependency:=FindDependencyByNameInList(OldDependencyList,pddRequires,
|
||||
CurDependency.PackageName);
|
||||
if OldDependency<>nil then begin
|
||||
// stay installed
|
||||
@ -5956,7 +5956,7 @@ begin
|
||||
|
||||
// create new auto install dependency PkgIDList
|
||||
ListPkgIDToDependencyList(PkgIDList,NewFirstAutoInstallDependency,
|
||||
pdlRequires,Self,true);
|
||||
pddRequires,Self,true);
|
||||
|
||||
PackageGraph.SortDependencyListTopologicallyOld(NewFirstAutoInstallDependency,
|
||||
false);
|
||||
@ -5980,7 +5980,7 @@ begin
|
||||
PackageGraph.BeginUpdate(true);
|
||||
try
|
||||
// get all required packages
|
||||
//debugln('TPkgManager.MainIDEitmPkgEditInstallPkgsClick GetAllRequiredPackages for ',DependencyListAsString(NewFirstAutoInstallDependency,pdlRequires));
|
||||
//debugln('TPkgManager.MainIDEitmPkgEditInstallPkgsClick GetAllRequiredPackages for ',DependencyListAsString(NewFirstAutoInstallDependency,pddRequires));
|
||||
if LoadDependencyList(NewFirstAutoInstallDependency,false)<>mrOk then exit(mrCancel);
|
||||
PackageGraph.GetAllRequiredPackages(nil,NewFirstAutoInstallDependency,PkgList);
|
||||
|
||||
@ -6005,7 +6005,7 @@ begin
|
||||
|
||||
// replace install list
|
||||
//debugln('TPkgManager.MainIDEitmPkgEditInstallPkgsClick replace install list');
|
||||
FreeDependencyList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
FreeDependencyList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
PackageGraph.FirstAutoInstallDependency:=NewFirstAutoInstallDependency;
|
||||
NewFirstAutoInstallDependency:=nil;
|
||||
finally
|
||||
@ -6028,7 +6028,7 @@ begin
|
||||
end;
|
||||
|
||||
finally
|
||||
FreeDependencyList(NewFirstAutoInstallDependency,pdlRequires);
|
||||
FreeDependencyList(NewFirstAutoInstallDependency,pddRequires);
|
||||
PkgList.Free;
|
||||
end;
|
||||
Result:=mrOk;
|
||||
@ -6077,11 +6077,11 @@ begin
|
||||
begin
|
||||
Dependency:=TPkgDependency.Create;
|
||||
Dependency.Assign(OldDependency);
|
||||
Dependency.AddToEndOfList(Dependencies,pdlRequires);
|
||||
Dependency.AddToEndOfList(Dependencies,pddRequires);
|
||||
end;
|
||||
OldDependency:=OldDependency.NextRequiresDependency;
|
||||
end;
|
||||
Dependencies:=GetFirstDependency(Dependencies,pdlRequires);
|
||||
Dependencies:=GetFirstDependency(Dependencies,pddRequires);
|
||||
PackageGraph.OpenRequiredDependencyList(Dependencies);
|
||||
end;
|
||||
|
||||
@ -6105,7 +6105,7 @@ begin
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
OldDependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
|
||||
OldDependency.RemoveFromList(PackageGraph.FirstAutoInstallDependency,pddRequires);
|
||||
OldDependency.Free;
|
||||
end;
|
||||
end;
|
||||
@ -6145,7 +6145,7 @@ begin
|
||||
|
||||
finally
|
||||
if OnlyBase then
|
||||
FreeDependencyList(Dependencies,pdlRequires);
|
||||
FreeDependencyList(Dependencies,pddRequires);
|
||||
PackageGraph.EndUpdate;
|
||||
end;
|
||||
Result:=mrOk;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user