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

* Do not use the GlobalDictionary during compilation of a package, this is not thread-safe

Browse Source 
git-svn-id: trunk@22353 -
This commit is contained in:
joost 2012-09-07 18:59:16 +00:00
parent 34996baa05
commit aa6b8b3fce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2794,12 +2794,12 @@ end;
Function TPackage.GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String; Function TPackage.GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String;
begin begin
result:=FixPath(GlobalDictionary.Substitute(FUnitsOutputDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)])); result:=FixPath(Dictionary.Substitute(FUnitsOutputDir,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]));
end; end;
function TPackage.GetUnitConfigOutputDir(ACPU: TCPU; AOS: TOS): String; function TPackage.GetUnitConfigOutputDir(ACPU: TCPU; AOS: TOS): String;
begin begin
result:=FixPath(GlobalDictionary.Substitute('units'+PathDelim+'$(target)'+PathDelim,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)])); result:=FixPath(Dictionary.Substitute('units'+PathDelim+'$(target)'+PathDelim,['CPU',CPUToString(ACPU),'OS',OSToString(AOS),'target',MakeTargetString(ACPU,AOS)]));
end; end;
procedure TPackage.SetUnitsOutputDir(AValue: string); procedure TPackage.SetUnitsOutputDir(AValue: string);
@ -3091,7 +3091,7 @@ begin
PackageVariants := TPackageVariants(FPackageVariants.Items[i]); PackageVariants := TPackageVariants(FPackageVariants.Items[i]);
if Installer.FPackageVariantSettings.Values[PackageVariants.Name]<>'' then if Installer.FPackageVariantSettings.Values[PackageVariants.Name]<>'' then
PackageVariants.ActivePackageVariantName:= Installer.FPackageVariantSettings.Values[PackageVariants.Name]; PackageVariants.ActivePackageVariantName:= Installer.FPackageVariantSettings.Values[PackageVariants.Name];
GlobalDictionary.AddVariable(PackageVariants.Name,PackageVariants.ActivePackageVariantName); Dictionary.AddVariable(PackageVariants.Name,PackageVariants.ActivePackageVariantName);
SetUnitsOutputDir(FUnitsOutputDir+'$('+PackageVariants.name+')'); SetUnitsOutputDir(FUnitsOutputDir+'$('+PackageVariants.name+')');
SetPackageUnitInstallDir(FPackageUnitInstallDir+'$('+PackageVariants.Name+')'); SetPackageUnitInstallDir(FPackageUnitInstallDir+'$('+PackageVariants.Name+')');
end; end;