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

* llProgres -> llProgress

Browse Source 
git-svn-id: trunk@36691 -
This commit is contained in:
joost 2017-07-08 20:41:08 +00:00
parent 0f9451fbb7
commit cfbb7efc85
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/fppkg/src/pkgcommands.pp
View File

@ -166,32 +166,32 @@ begin
Error(SErrNoPackageSpecified); Error(SErrNoPackageSpecified);
P:=PackageManager.PackageByName(PackageName, pkgpkAvailable); P:=PackageManager.PackageByName(PackageName, pkgpkAvailable);
log(llProgres,SLogPackageInfoName,[P.Name]); log(llProgress,SLogPackageInfoName,[P.Name]);
S := P.Email; S := P.Email;
if S <> '' then if S <> '' then
S := '<' + S +'>'; S := '<' + S +'>';
log(llProgres,SLogPackageInfoAuthor,[P.Author, S]); log(llProgress,SLogPackageInfoAuthor,[P.Author, S]);
log(llProgres,SLogPackageInfoVersion,[P.Version.AsString]); log(llProgress,SLogPackageInfoVersion,[P.Version.AsString]);
log(llProgres,SLogPackageInfoCategory,[P.Category]); log(llProgress,SLogPackageInfoCategory,[P.Category]);
log(llProgres,SLogPackageInfoWebsite,[P.HomepageURL]); log(llProgress,SLogPackageInfoWebsite,[P.HomepageURL]);
log(llProgres,SLogPackageInfoLicense,[P.License]); log(llProgress,SLogPackageInfoLicense,[P.License]);
log(llProgres,SLogPackageInfoOSes,[OSesToString(P.OSes)]); log(llProgress,SLogPackageInfoOSes,[OSesToString(P.OSes)]);
log(llProgres,SLogPackageInfoCPUs,[CPUSToString(P.CPUs)]); log(llProgress,SLogPackageInfoCPUs,[CPUSToString(P.CPUs)]);
log(llProgres,SLogPackageInfoDescription1); log(llProgress,SLogPackageInfoDescription1);
log(llProgres,SLogPackageInfoDescription2,[P.Description]); log(llProgress,SLogPackageInfoDescription2,[P.Description]);
if P.Dependencies.Count>0 then if P.Dependencies.Count>0 then
begin begin
log(llProgres,SLogPackageInfoDependencies1,[]); log(llProgress,SLogPackageInfoDependencies1,[]);
for I := 0 to P.Dependencies.Count-1 do for I := 0 to P.Dependencies.Count-1 do
begin begin
if not P.Dependencies[I].MinVersion.Empty then if not P.Dependencies[I].MinVersion.Empty then
S := '('+P.Dependencies[I].MinVersion.AsString+')' S := '('+P.Dependencies[I].MinVersion.AsString+')'
else else
S := ''; S := '';
log(llProgres,SLogPackageInfoDependencies2,[P.Dependencies[I].PackageName,S]); log(llProgress,SLogPackageInfoDependencies2,[P.Dependencies[I].PackageName,S]);
end; end;
end; end;
end; end;
@ -227,9 +227,9 @@ end;
function TCommandListSettings.Execute: Boolean; function TCommandListSettings.Execute: Boolean;
begin begin
Result := True; Result := True;
PackageManager.Options.LogValues(llProgres); PackageManager.Options.LogValues(llProgress);
PackageManager.CompilerOptions.LogValues(llProgres,''); PackageManager.CompilerOptions.LogValues(llProgress,'');
PackageManager.FPMakeCompilerOptions.LogValues(llProgres,'fpmake-building '); PackageManager.FPMakeCompilerOptions.LogValues(llProgress,'fpmake-building ');
end; end;
@ -639,7 +639,7 @@ begin
if L.Count > 0 then if L.Count > 0 then
begin begin
if DependenciesDepth=0 then if DependenciesDepth=0 then
pkgglobals.Log(llProgres,SProgrInstallDependencies); pkgglobals.Log(llProgress,SProgrInstallDependencies);
inc(DependenciesDepth); inc(DependenciesDepth);
for i:=0 to L.Count-1 do for i:=0 to L.Count-1 do
@ -648,7 +648,7 @@ begin
dec(DependenciesDepth); dec(DependenciesDepth);
if DependenciesDepth=0 then if DependenciesDepth=0 then
pkgglobals.Log(llProgres,SProgrDependenciesInstalled); pkgglobals.Log(llProgress,SProgrDependenciesInstalled);
end; end;
FreeAndNil(L); FreeAndNil(L);
if assigned(ManifestPackages) then if assigned(ManifestPackages) then
@ -671,7 +671,7 @@ begin
PackageManager.FindBrokenPackages(SL); PackageManager.FindBrokenPackages(SL);
if SL.Count=0 then if SL.Count=0 then
break; break;
pkgglobals.Log(llProgres,SProgrReinstallDependent); pkgglobals.Log(llProgress,SProgrReinstallDependent);
for i:=0 to SL.Count-1 do for i:=0 to SL.Count-1 do
begin begin
if not ExecuteAction(SL[i],'build') then if not ExecuteAction(SL[i],'build') then

2
packages/fppkg/src/pkgdownload.pp
View File

@ -185,7 +185,7 @@ begin
if RemoteArchive <> '' then if RemoteArchive <> '' then
begin begin
Log(llCommands,SLogDownloading,[RemoteArchive,PackageManager.PackageLocalArchive(P)]); Log(llCommands,SLogDownloading,[RemoteArchive,PackageManager.PackageLocalArchive(P)]);
pkgglobals.log(llProgres,SProgrDownloadPackage,[P.Name, P.Version.AsString]); pkgglobals.log(llProgress,SProgrDownloadPackage,[P.Name, P.Version.AsString]);
// Force the existing of the archives-directory if it is being used // Force the existing of the archives-directory if it is being used
if (P.Name<>CurrentDirPackageName) and (P.Name<>CmdLinePackageName) then if (P.Name<>CurrentDirPackageName) and (P.Name<>CmdLinePackageName) then

6
packages/fppkg/src/pkgglobals.pp
View File

@ -57,13 +57,13 @@ Const
); );
Type Type
TLogLevel = (llError,llWarning,llInfo,llCommands,llDebug,llProgres); TLogLevel = (llError,llWarning,llInfo,llCommands,llDebug,llProgress);
TLogLevels = Set of TLogLevel; TLogLevels = Set of TLogLevel;
TLogProc = procedure(Level:TLogLevel;Const Msg: String); TLogProc = procedure(Level:TLogLevel;Const Msg: String);
const const
DefaultLogLevels = [llError,llWarning, llProgres]; DefaultLogLevels = [llError,llWarning, llProgress];
AllLogLevels = [llError,llWarning,llCommands,llInfo,llProgres]; AllLogLevels = [llError,llWarning,llCommands,llInfo,llProgress];
type type
EPackagerError = class(Exception); EPackagerError = class(Exception);

2
packages/fppkg/src/pkghandler.pp
View File

@ -179,7 +179,7 @@ var
if ch in [#10, #13] then if ch in [#10, #13] then
begin begin
log(llProgres,sLine); log(llProgress,sLine);
sLine := ''; sLine := '';
BuffPos := ConsoleOutput.Position; BuffPos := ConsoleOutput.Position;
end end