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

* Allow usage of $(UNITSOUTPUTDIR) and $(BINOUTPUTDIR) macros during clean

Browse Source 
git-svn-id: trunk@24605 -
This commit is contained in:
joost 2013-05-25 16:36:48 +00:00
parent 3492d29834
commit 7656bf2017
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1037,6 +1037,7 @@ Type
Function FindFileInPath(APackage: TPackage; Path:TConditionalStrings; AFileName:String; var FoundPath:String;ACPU:TCPU;AOS:TOS):Boolean;
procedure GetDirectoriesFromFilelist(const AFileList, ADirectoryList: TStringList);
procedure AddPackageMacrosToDictionary(const APackage: TPackage; ADictionary: TDictionary);
//package commands
function GetUnitDir(APackage:TPackage):String;
procedure AddDependencyPaths(L: TStrings; DependencyType: TDependencyType; ATarget: TTarget);
@ -5003,6 +5004,11 @@ begin
ADirectoryList.Add(ExtractFileDir(AFileList.Strings[i]));
end;
procedure TBuildEngine.AddPackageMacrosToDictionary(const APackage: TPackage; ADictionary: TDictionary);
begin
APackage.Dictionary.AddVariable('UNITSOUTPUTDIR',AddPathPrefix(APackage,APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS)));
APackage.Dictionary.AddVariable('BINOUTPUTDIR',AddPathPrefix(APackage,APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS)));
end;
Procedure TBuildEngine.ResolveFileNames(APackage : TPackage; ACPU:TCPU;AOS:TOS;DoChangeDir:boolean=true; WarnIfNotFound:boolean=true);
@ -5993,8 +5999,7 @@ begin
GPathPrefix:=APackage.Directory;
Try
CreateOutputDir(APackage);
APackage.Dictionary.AddVariable('UNITSOUTPUTDIR',AddPathPrefix(APackage,APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS)));
APackage.Dictionary.AddVariable('BINOUTPUTDIR',AddPathPrefix(APackage,APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS)));
AddPackageMacrosToDictionary(APackage, APackage.Dictionary);
DoBeforeCompile(APackage);
RegenerateUnitconfigFile:=False;
if APackage.BuildMode=bmBuildUnit then