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

------------------------------------------------------------------------

Browse Source 
r46240 | pierre | 2020-08-05 08:40:32 +0000 (Wed, 05 Aug 2020) | 1 line

 Add name of package for which dependency is checked to get a more useful error message
------------------------------------------------------------------------
--- Merging r46240 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r46240 into '.':
 U   .

git-svn-id: branches/fixes_3_2@46469 -
This commit is contained in:
pierre 2020-08-17 09:56:33 +00:00
parent 7e4ee351f8
commit d276e94e0f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fpmkunit/src/fpmkunit.pp
View File

@ -1249,7 +1249,7 @@ Type
Procedure Clean(APackage : TPackage; ACPU:TCPU; AOS : TOS); Procedure Clean(APackage : TPackage; ACPU:TCPU; AOS : TOS);
Procedure CompileDependencies(APackage : TPackage); Procedure CompileDependencies(APackage : TPackage);
function CheckDependencies(APackage : TPackage; ErrorOnFailure: boolean): TCheckDependencyResult; function CheckDependencies(APackage : TPackage; ErrorOnFailure: boolean): TCheckDependencyResult;
Function CheckExternalPackage(Const APackageName : String; ErrorOnFailure: boolean):TPackage; Function CheckExternalPackage(Const APackageName, ForPackageName : String; ErrorOnFailure: boolean):TPackage;
procedure CreateOutputDir(APackage: TPackage); procedure CreateOutputDir(APackage: TPackage);
// Packages commands // Packages commands
Procedure Compile(Packages : TPackages); Procedure Compile(Packages : TPackages);
@ -1658,7 +1658,7 @@ ResourceString
SErrNoDictionaryValue = 'The item "%s" in the dictionary is not a value'; SErrNoDictionaryValue = 'The item "%s" in the dictionary is not a value';
SErrNoDictionaryFunc = 'The item "%s" in the dictionary is not a function'; SErrNoDictionaryFunc = 'The item "%s" in the dictionary is not a function';
SErrInvalidFPCInfo = 'Compiler returns invalid information, check if fpc -iV works'; SErrInvalidFPCInfo = 'Compiler returns invalid information, check if fpc -iV works';
SErrDependencyNotFound = 'Could not find unit directory for dependency package "%s"'; SErrDependencyNotFound = 'Could not find unit directory for dependency package "%s" required for package "%s"';
SErrAlreadyInitialized = 'Installer can only be initialized once'; SErrAlreadyInitialized = 'Installer can only be initialized once';
SErrInvalidState = 'Invalid state for target %s'; SErrInvalidState = 'Invalid state for target %s';
SErrCouldNotCompile = 'Could not compile target %s from package %s'; SErrCouldNotCompile = 'Could not compile target %s from package %s';
@ -7224,7 +7224,7 @@ begin
end; end;
function TBuildEngine.CheckExternalPackage(Const APackageName : String; ErrorOnFailure: boolean):TPackage; function TBuildEngine.CheckExternalPackage(Const APackageName, ForPackageName : String; ErrorOnFailure: boolean):TPackage;
var var
S : String; S : String;
F : String; F : String;
@ -7258,7 +7258,7 @@ begin
CompileDependencies(Result); CompileDependencies(Result);
end end
else if ErrorOnFailure then else if ErrorOnFailure then
Error(SErrDependencyNotFound,[APackageName]); Error(SErrDependencyNotFound,[APackageName,ForPackageName]);
end; end;
@ -7291,7 +7291,7 @@ begin
end end
else else
begin begin
D.Target:=CheckExternalPackage(D.Value, true); D.Target:=CheckExternalPackage(D.Value, APackage.Name, true);
P:=TPackage(D.Target); P:=TPackage(D.Target);
end; end;
if (D.RequireChecksum<>$ffffffff) and (D.RequireChecksum<>0) and if (D.RequireChecksum<>$ffffffff) and (D.RequireChecksum<>0) and
@ -7333,7 +7333,7 @@ begin
end end
else else
begin begin
D.Target:=CheckExternalPackage(D.Value, ErrorOnFailure); D.Target:=CheckExternalPackage(D.Value, APackage.Name, ErrorOnFailure);
P:=TPackage(D.Target); P:=TPackage(D.Target);
end; end;
if (D.RequireChecksum<>$ffffffff) and if (D.RequireChecksum<>$ffffffff) and