mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-18 17:19:23 +02:00
Fppkg: Do not add the Lazarus directories to the fppkg setup anymore. The fppkg packages are now installed into the normal fppkg-location
git-svn-id: trunk@59967 -
This commit is contained in:
parent
8cba1e0f88
commit
4f0026610f
@ -358,7 +358,10 @@ begin
|
|||||||
Application.Terminate;
|
Application.Terminate;
|
||||||
Exit;
|
Exit;
|
||||||
end;
|
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);
|
FFPpkg := TpkgFPpkg.Create(Self);
|
||||||
|
|
||||||
@ -874,14 +877,17 @@ begin
|
|||||||
LoadFppkgConfiguration;
|
LoadFppkgConfiguration;
|
||||||
end;
|
end;
|
||||||
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
|
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.');
|
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
|
if TInitializeOptionsForm.RecreateLazarusConfiguration then
|
||||||
begin
|
begin
|
||||||
LoadFppkgConfiguration;
|
LoadFppkgConfiguration;
|
||||||
end;
|
end;
|
||||||
end
|
end}
|
||||||
else
|
else
|
||||||
FFPpkg.LoadLocalAvailableMirrors;
|
FFPpkg.LoadLocalAvailableMirrors;
|
||||||
end;
|
end;
|
||||||
|
Loading…
Reference in New Issue
Block a user