paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 06:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Do not sort the order of the unit, include and object path

Browse Source 
git-svn-id: trunk@15260 -
This commit is contained in:
joost 2010-05-12 09:32:26 +00:00
parent 6a39bd8b44
commit 79fc8fc460
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -951,7 +951,13 @@ Procedure SplitCommand(Const Cmd : String; Var Exe,Options : String);
Implementation
uses typinfo;
uses typinfo, rtlconsts;
type
TUnsortedDuplicatesStringList = class(TStringList)
public
function Add(const S: string): Integer; override;
end;
ResourceString
SErrInvalidCPU = 'Invalid CPU name "%s"';
@ -1552,6 +1558,22 @@ end;
{$endif HAS_UNIT_PROCESS}
{****************************************************************************
TUnsortedDuplicatesStringList
****************************************************************************}
function TUnsortedDuplicatesStringList.Add(const S: string): Integer;
begin
result := IndexOf(S);
If result > -1 then
Case DUplicates of
DupIgnore : Exit;
DupError : Error(SDuplicateString,0)
end;
inherited Add(S);
end;
{****************************************************************************
TNamedItem
****************************************************************************}
@ -3610,7 +3632,8 @@ end;
Function TBuildEngine.GetCompilerCommand(APackage : TPackage; ATarget : TTarget) : String;
Var
L,Args : TStringList;
L : TUnsortedDuplicatesStringList;
Args : TStringList;
i : Integer;
begin
if ATarget.TargetSourceFileName = '' then
@ -3638,8 +3661,7 @@ begin
Args.Add('-FE'+APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS));
Args.Add('-FU'+APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS));
// Object Path
L:=TStringList.Create;
L.Sorted:=true;
L:=TUnsortedDuplicatesStringList.Create;
L.Duplicates:=dupIgnore;
AddConditionalStrings(L,APackage.ObjectPath,Defaults.CPU,Defaults.OS);
AddConditionalStrings(L,ATarget.ObjectPath,Defaults.CPU,Defaults.OS);
@ -3647,8 +3669,7 @@ begin
Args.Add('-Fo'+L[i]);
FreeAndNil(L);
// Unit Dirs
L:=TStringList.Create;
L.Sorted:=true;
L:=TUnsortedDuplicatesStringList.Create;
L.Duplicates:=dupIgnore;
AddDependencyUnitPaths(L,APackage);
AddConditionalStrings(L,APackage.UnitPath,Defaults.CPU,Defaults.OS);
@ -3657,8 +3678,7 @@ begin
Args.Add('-Fu'+L[i]);
FreeAndNil(L);
// Include Path
L:=TStringList.Create;
L.Sorted:=true;
L:=TUnsortedDuplicatesStringList.Create;
L.Duplicates:=dupIgnore;
AddDependencyIncludePaths(L,ATarget);
AddConditionalStrings(L,APackage.IncludePath,Defaults.CPU,Defaults.OS);