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

* Added TPackageVariant.SourcePath and .IncludePath

Browse Source 
git-svn-id: trunk@29313 -
This commit is contained in:
joost 2014-12-22 16:25:54 +00:00
parent 72642042e4
commit 3e9c4a79a5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,10 +480,14 @@ Type
private private
FOptions: TStrings; FOptions: TStrings;
FTargets: TTargets; FTargets: TTargets;
FIncludePath: TConditionalStrings;
FSourcePath: TConditionalStrings;
public public
constructor Create(ACollection: TCollection); override; constructor Create(ACollection: TCollection); override;
destructor Destroy; override; destructor Destroy; override;
property Options: TStrings read FOptions; property Options: TStrings read FOptions;
Property IncludePath : TConditionalStrings Read FIncludePath;
Property SourcePath : TConditionalStrings Read FSourcePath;
property Targets: TTargets read FTargets; property Targets: TTargets read FTargets;
end; end;
@ -2614,12 +2618,16 @@ begin
inherited Create(ACollection); inherited Create(ACollection);
FTargets := TTargets.Create(TTarget); FTargets := TTargets.Create(TTarget);
FOptions := TStringList.Create; FOptions := TStringList.Create;
FIncludePath:=TConditionalStrings.Create(TConditionalString);
FSourcePath:=TConditionalStrings.Create(TConditionalString);
end; end;
destructor TPackageVariant.Destroy; destructor TPackageVariant.Destroy;
begin begin
FOptions.Free; FOptions.Free;
FTargets.Free; FTargets.Free;
FIncludePath.Free;
FSourcePath.Free;
inherited Destroy; inherited Destroy;
end; end;
@ -3621,6 +3629,8 @@ begin
PackageVariants.ActivePackageVariantName:= Installer.FPackageVariantSettings.Values[PackageVariants.Name] PackageVariants.ActivePackageVariantName:= Installer.FPackageVariantSettings.Values[PackageVariants.Name]
else else
PackageVariants.ActivePackageVariantName:= PackageVariants.DefaultPackageVariantName; PackageVariants.ActivePackageVariantName:= PackageVariants.DefaultPackageVariantName;
IncludePath.AddList(PackageVariants.ActivePackageVariant.IncludePath);
SourcePath.AddList(PackageVariants.ActivePackageVariant.SourcePath);
Dictionary.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+')');