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

lazbuild: fixed compiling ide

Browse Source 
git-svn-id: trunk@23007 -
This commit is contained in:
mattias 2009-12-06 23:24:43 +00:00
parent 81c487bc7c
commit 74860b471d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/lazbuild.lpr
View File

@ -420,10 +420,6 @@ begin
MainBuildBoss.SetBuildTargetIDE;
Flags:=[];
// try loading install packages
PackageGraph.LoadStaticBasePackages;
PackageGraph.LoadAutoInstallPackages(BuildLazOptions.StaticAutoInstallPackages);
// save target directory
TargetDir:=MiscellaneousOptions.BuildLazOpts.TargetDirectory;
IDEMacros.SubstituteMacros(TargetDir);

13
packager/packagesystem.pas
View File

@ -292,7 +292,6 @@ type
public
// installed packages
FirstAutoInstallDependency: TPkgDependency;
procedure AddStaticBasePackagesOld;
procedure LoadStaticBasePackages;
procedure LoadAutoInstallPackages(PkgList: TStringList);
procedure SortAutoInstallDependencies;
@ -1818,6 +1817,10 @@ procedure TLazPackageGraph.LoadStaticBasePackages;
Dependency: TPkgDependency;
Quiet: Boolean;
begin
if FindDependencyByNameInList(FirstAutoInstallDependency,pdlRequires,
PkgName)<>nil
then
exit;
Dependency:=TPkgDependency.Create;
Dependency.Owner:=Self;
Dependency.PackageName:=PkgName;
@ -1833,7 +1836,8 @@ begin
LoadLazarusBasePackage('SynEdit');
LoadLazarusBasePackage('CodeTools');
// the default package will be added on demand
FDefaultPackage:=CreateDefaultPackage;
if FDefaultPackage=nil then
FDefaultPackage:=CreateDefaultPackage;
SortAutoInstallDependencies;
@ -3180,11 +3184,6 @@ begin
Result:=mrOK;
end;
procedure TLazPackageGraph.AddStaticBasePackagesOld;
begin
end;
function TLazPackageGraph.PreparePackageOutputDirectory(APackage: TLazPackage;
CleanUp: boolean): TModalResult;
var

13
packager/pkgmanager.pas
View File

@ -1686,11 +1686,16 @@ begin
PackageGraph.OpenInstalledDependency(NewDependency,pitStatic,Quiet);
Result:=NewDependency.RequiredPackage;
if AddToAutoInstall and (Result<>nil) then begin
NewDependency.AddToList(PackageGraph.FirstAutoInstallDependency,pdlRequires);
if FindDependencyByNameInList(
PackageGraph.FirstAutoInstallDependency,pdlRequires,PackageName)=nil
then begin
NewDependency.RequiredPackage.AutoInstall:=pitStatic;
NewDependency.AddToList(PackageGraph.FirstAutoInstallDependency,pdlRequires)
end else
NewDependency.Free;
PackageList:=MiscellaneousOptions.BuildLazOpts.StaticAutoInstallPackages;
if PackageList.IndexOf(NewDependency.PackageName)<0 then
PackageList.Add(NewDependency.PackageName);
NewDependency.RequiredPackage.AutoInstall:=pitStatic;
if PackageList.IndexOf(PackageName)<0 then
PackageList.Add(PackageName);
end else begin
NewDependency.Free;
end;