paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 11:09:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fppkg: Do not add the Lazarus directories to the fppkg setup anymore. The fppkg packages are now installed into the normal fppkg-location

Browse Source 
git-svn-id: trunk@59967 -
This commit is contained in:
joost 2019-01-01 16:44:18 +00:00
parent 8cba1e0f88
commit 4f0026610f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/fppkg/src/fppkg_mainfrm.pas
View File

@ -358,7 +358,10 @@ begin
Application.Terminate;
Exit;
end;
TInitializeOptionsForm.CheckLazarusConfiguration;
// Setting up the Lazarus directory for fppkg was part of an earlier attempt
// to compile Lazarus with fppkg. This is done in a different manner now,
// but it could be that we need this again, so keep the code for now.
//TInitializeOptionsForm.CheckLazarusConfiguration;
FFPpkg := TpkgFPpkg.Create(Self);
@ -874,14 +877,17 @@ begin
LoadFppkgConfiguration;
end;
end
else if not Assigned(FFPpkg.FindPackage('lcl', pkgpkInstalled)) then
// Setting up the Lazarus directory for fppkg was part of an earlier attempt
// to compile Lazarus with fppkg. This is done in a different manner now,
// but it could be that we need this again, so keep the code for now.
{ else if not Assigned(FFPpkg.FindPackage('lcl', pkgpkInstalled)) then
begin
ShowMessage('Fppkg seems to be configured for using Lazarus-packages, but the LCL could not be found. Please fix the Fppkg-configuration for Lazarus with the wizard or manualy.');
if TInitializeOptionsForm.RecreateLazarusConfiguration then
begin
LoadFppkgConfiguration;
end;
end
end}
else
FFPpkg.LoadLocalAvailableMirrors;
end;