paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-14 19:22:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Moved global procedure to metod of TpkgFPpkg

Browse Source 
git-svn-id: trunk@35482 -
This commit is contained in:
joost 2017-02-25 20:46:42 +00:00
parent f353416fd4
commit 10dfda977c
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ type
procedure InitializeGlobalOptions(CfgFile: string); procedure InitializeGlobalOptions(CfgFile: string);
procedure InitializeCompilerOptions; procedure InitializeCompilerOptions;
procedure LoadLocalAvailableMirrors;
procedure ScanAvailablePackages; procedure ScanAvailablePackages;
procedure ScanPackages; procedure ScanPackages;
@ -76,6 +77,7 @@ implementation
uses uses
fpmkunit, fpmkunit,
fpxmlrep,
pkgrepos; pkgrepos;
{ TpkgFPpkg } { TpkgFPpkg }
@ -240,6 +242,37 @@ begin
FFPMakeCompilerOptions.LogValues(llDebug,'fpmake-building'); FFPMakeCompilerOptions.LogValues(llDebug,'fpmake-building');
end; end;
procedure TpkgFPpkg.LoadLocalAvailableMirrors;
var
S : String;
X : TFPXMLMirrorHandler;
begin
if assigned(AvailableMirrors) then
AvailableMirrors.Free;
AvailableMirrors:=TFPMirrors.Create(TFPMirror);
// Repository
S:=Options.GlobalSection.LocalMirrorsFile;
log(llDebug,SLogLoadingMirrorsFile,[S]);
if not FileExists(S) then
exit;
try
X:=TFPXMLMirrorHandler.Create;
With X do
try
LoadFromXml(AvailableMirrors,S);
finally
Free;
end;
except
on E : Exception do
begin
Log(llError,E.Message);
Error(SErrCorruptMirrorsFile,[S]);
end;
end;
end;
procedure TpkgFPpkg.ScanAvailablePackages; procedure TpkgFPpkg.ScanAvailablePackages;
var var
Repo: TFPRepository; Repo: TFPRepository;

28
packages/fppkg/src/pkgrepos.pp
View File

@ -60,34 +60,8 @@ end;
*****************************************************************************} *****************************************************************************}
procedure LoadLocalAvailableMirrors; procedure LoadLocalAvailableMirrors;
var
S : String;
X : TFPXMLMirrorHandler;
begin begin
if assigned(AvailableMirrors) then GFPpkg.LoadLocalAvailableMirrors;
AvailableMirrors.Free;
AvailableMirrors:=TFPMirrors.Create(TFPMirror);
// Repository
S:=GFPpkg.Options.GlobalSection.LocalMirrorsFile;
log(llDebug,SLogLoadingMirrorsFile,[S]);
if not FileExists(S) then
exit;
try
X:=TFPXMLMirrorHandler.Create;
With X do
try
LoadFromXml(AvailableMirrors,S);
finally
Free;
end;
except
on E : Exception do
begin
Log(llError,E.Message);
Error(SErrCorruptMirrorsFile,[S]);
end;
end;
end; end;