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

* remove useless ArchiveFiles, use Sources.AddSrcFiles instead

Browse Source 
* if extractrelativepath call, current dir needs a trailing / to prevent it from
    being stripped before calculating the relative path

git-svn-id: trunk@9901 -
This commit is contained in:
peter 2008-01-24 21:59:45 +00:00
parent 83777008b6
commit f903b24352
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,7 +471,6 @@ Type
FExamplePath, FExamplePath,
FTestPath, FTestPath,
FCleanFiles, FCleanFiles,
FArchiveFiles,
FInstallFiles : TConditionalStrings; FInstallFiles : TConditionalStrings;
FDependencies : TDependencies; FDependencies : TDependencies;
FCPUs: TCPUs; FCPUs: TCPUs;
@ -531,7 +530,6 @@ Type
// Targets and dependencies // Targets and dependencies
Property InstallFiles : TConditionalStrings Read FInstallFiles; Property InstallFiles : TConditionalStrings Read FInstallFiles;
Property CleanFiles : TConditionalStrings Read FCleanFiles; Property CleanFiles : TConditionalStrings Read FCleanFiles;
Property ArchiveFiles : TConditionalStrings Read FArchiveFiles;
Property Dependencies : TDependencies Read FDependencies; Property Dependencies : TDependencies Read FDependencies;
Property Commands : TCommands Read FCommands; Property Commands : TCommands Read FCommands;
Property State : TTargetState Read FTargetState; Property State : TTargetState Read FTargetState;
@ -1360,7 +1358,7 @@ begin
CurrDir:=GetCurrentDir; CurrDir:=GetCurrentDir;
for i := 0 to Pred(List.Count) do for i := 0 to Pred(List.Count) do
List[i] := ExtractRelativepath(CurrDir, List[i]); List[i] := ExtractRelativepath(IncludeTrailingPathDelimiter(CurrDir), List[i]);
end; end;
@ -1781,7 +1779,6 @@ begin
FDependencies:=TDependencies.Create(TDependency); FDependencies:=TDependencies.Create(TDependency);
FInstallFiles:=TConditionalStrings.Create(TConditionalString); FInstallFiles:=TConditionalStrings.Create(TConditionalString);
FCleanFiles:=TConditionalStrings.Create(TConditionalString); FCleanFiles:=TConditionalStrings.Create(TConditionalString);
FArchiveFiles:=TConditionalStrings.Create(TConditionalString);
FUnitPath:=TConditionalStrings.Create(TConditionalString); FUnitPath:=TConditionalStrings.Create(TConditionalString);
FObjectPath:=TConditionalStrings.Create(TConditionalString); FObjectPath:=TConditionalStrings.Create(TConditionalString);
FIncludePath:=TConditionalStrings.Create(TConditionalString); FIncludePath:=TConditionalStrings.Create(TConditionalString);
@ -1801,7 +1798,6 @@ begin
FreeAndNil(FDependencies); FreeAndNil(FDependencies);
FreeAndNil(FInstallFiles); FreeAndNil(FInstallFiles);
FreeAndNil(FCleanFiles); FreeAndNil(FCleanFiles);
FreeAndNil(FArchiveFiles);
FreeAndNil(FIncludePath); FreeAndNil(FIncludePath);
FreeAndNil(FSourcePath); FreeAndNil(FSourcePath);
FreeAndNil(FExamplePath); FreeAndNil(FExamplePath);
@ -1896,8 +1892,6 @@ begin
// Targets only // Targets only
For I:=0 to FTargets.Count-1 do For I:=0 to FTargets.Count-1 do
FTargets.TargetItems[I].GetArchiveFiles(List,ACPU,AOS); FTargets.TargetItems[I].GetArchiveFiles(List,ACPU,AOS);
// Additional archive files
AddConditionalStrings(List,ArchiveFiles,ACPU,AOS);
end; end;