paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 12:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Only pass prefix and baseinstalldir to fpmake during (de-)installation

Browse Source 
* First evaluate the baseinstalldir, so that the user gets a warning when 
   an install-repository is chosen which is not available for installations

git-svn-id: trunk@36337 -
This commit is contained in:
joost 2017-05-25 21:24:51 +00:00
parent 63b3304374
commit 569bd1e812
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/fppkg/src/pkgfpmake.pp
View File

@ -34,6 +34,7 @@ type
TFPMakeRunner = Class(TFPMakeCompiler)
Protected
function IncludeInstallationOptions: Boolean; virtual;
Function RunFPMake(const Command:string):Integer;
end;
@ -57,15 +58,19 @@ type
{ TFPMakeRunnerInstall }
TFPMakeRunnerInstall = Class(TFPMakeRunner)
protected
function IncludeInstallationOptions: Boolean; override;
Public
Procedure Execute;override;
procedure Execute;override;
end;
{ TFPMakeRunnerUnInstall }
TFPMakeRunnerUnInstall = Class(TFPMakeRunner)
protected
function IncludeInstallationOptions: Boolean; override;
Public
Procedure Execute;override;
procedure Execute;override;
end;
{ TFPMakeRunnerClean }
@ -342,6 +347,11 @@ end;
{ TFPMakeRunner }
function TFPMakeRunner.IncludeInstallationOptions: Boolean;
begin
Result := False;
end;
Function TFPMakeRunner.RunFPMake(const Command:string) : Integer;
Var
P : TFPPackage;
@ -440,7 +450,7 @@ begin
// While scanning a source-repository it could be necessary to create manifest
// files. At this moment the InstallRepo could not be initialized yet. And the
// manifest command does not use the --prefix and --baseinstalldir parameters.
if (command<>'manifest') then
if IncludeInstallationOptions then
begin
InstallRepo := PackageManager.GetInstallRepository(P);
@ -449,8 +459,8 @@ begin
Error(SErrIllConfRepository,[InstallRepo.RepositoryName]);
Exit;
end;
CondAddOption('--prefix',InstallRepo.DefaultPackagesStructure.GetPrefix);
CondAddOption('--baseinstalldir',InstallRepo.DefaultPackagesStructure.GetBaseInstallDir);
CondAddOption('--prefix',InstallRepo.DefaultPackagesStructure.GetPrefix);
end;
for i := PackageManager.RepositoryList.Count-1 downto 0 do
@ -494,12 +504,20 @@ begin
RunFPMake('build');
end;
function TFPMakeRunnerInstall.IncludeInstallationOptions: Boolean;
begin
Result := True;
end;
procedure TFPMakeRunnerInstall.Execute;
begin
RunFPMake('install');
end;
function TFPMakeRunnerUnInstall.IncludeInstallationOptions: Boolean;
begin
Result := True;
end;
procedure TFPMakeRunnerUnInstall.Execute;
begin