paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-07 20:21:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Added ability to read the name of the configuration file

Browse Source 
which was used during initialization

git-svn-id: trunk@41848 -
This commit is contained in:
joost 2019-04-07 19:33:49 +00:00
parent 1b0b81f714
commit c3d0757f11
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fppkg/src/pkgfppkg.pp
View File

@ -30,6 +30,7 @@ type
FCompilerOptions: TCompilerOptions; FCompilerOptions: TCompilerOptions;
FFpmakeCompilerOptions: TCompilerOptions; FFpmakeCompilerOptions: TCompilerOptions;
FCurrentRemoteRepositoryURL: String; FCurrentRemoteRepositoryURL: String;
FConfigurationFilename: string;
function IncludeRepositoryTypeForPackageKind(ARepositoryType: TFPRepositoryType; function IncludeRepositoryTypeForPackageKind(ARepositoryType: TFPRepositoryType;
APackageKind: TpkgPackageKind): Boolean; APackageKind: TpkgPackageKind): Boolean;
procedure ScanPackagesOnDisk(ACompilerOptions: TCompilerOptions; APackageKind: TpkgPackageKind; ARepositoryList: TComponentList); procedure ScanPackagesOnDisk(ACompilerOptions: TCompilerOptions; APackageKind: TpkgPackageKind; ARepositoryList: TComponentList);
@ -42,6 +43,7 @@ type
procedure LeaveFindBrokenpackages; procedure LeaveFindBrokenpackages;
procedure ClearRepositories(ARepositoryList: TComponentList); procedure ClearRepositories(ARepositoryList: TComponentList);
function GetConfigurationFilename: string;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -78,6 +80,7 @@ type
property FpmakeCompilerOptions: TCompilerOptions read FFpmakeCompilerOptions; property FpmakeCompilerOptions: TCompilerOptions read FFpmakeCompilerOptions;
property FPMakeRepositoryList: TComponentList read FFPMakeRepositoryList; property FPMakeRepositoryList: TComponentList read FFPMakeRepositoryList;
property RepositoryList: TComponentList read FRepositoryList; property RepositoryList: TComponentList read FRepositoryList;
property ConfigurationFilename: string read GetConfigurationFilename;
public public
end; end;
@ -197,6 +200,7 @@ begin
pkgglobals.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile]) pkgglobals.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile])
else else
pkgglobals.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]); pkgglobals.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]);
FConfigurationFilename := CfgFile;
// Log configuration // Log configuration
FOptions.LogValues(llDebug); FOptions.LogValues(llDebug);
end; end;
@ -779,5 +783,10 @@ begin
Result:=GetRemoteRepositoryURL(APackage.FileName); Result:=GetRemoteRepositoryURL(APackage.FileName);
end; end;
function TpkgFPpkg.GetConfigurationFilename: string;
begin
Result := FConfigurationFilename;
end;
end. end.