paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-12 19:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Packager: use PkgFileRealUnitTypes instead of a local redefinition of the same thing

Browse Source 
git-svn-id: trunk@35378 -
This commit is contained in:
juha 2012-02-15 16:33:23 +00:00
parent ad545d1532
commit 60bc166685
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/packagesystem.pas
View File

@ -2259,8 +2259,6 @@ function TLazPackageGraph.FindAmbiguousUnits(APackage: TLazPackage;
// returns true, if ambiguous units found // returns true, if ambiguous units found
// There can either be a conflict between two files (File1,File2) // There can either be a conflict between two files (File1,File2)
// or between a file and a package (File1,ConflictPkg) // or between a file and a package (File1,ConflictPkg)
const
FileTypes = PkgFileUnitTypes-[pftVirtualUnit];
var var
PackageTreeOfUnitTrees: TAVLTree; // tree of TPkgUnitsTree PackageTreeOfUnitTrees: TAVLTree; // tree of TPkgUnitsTree
@ -2284,7 +2282,7 @@ var
PackageTreeOfUnitTrees.Add(Result); PackageTreeOfUnitTrees.Add(Result);
for i:=0 to Pkg.FileCount-1 do begin for i:=0 to Pkg.FileCount-1 do begin
PkgFile:=Pkg.Files[i]; PkgFile:=Pkg.Files[i];
if (PkgFile.FileType in FileTypes) and (PkgFile.Unit_Name<>'') then if (PkgFile.FileType in PkgFileRealUnitTypes) and (PkgFile.Unit_Name<>'') then
Result.Add(PkgFile); Result.Add(PkgFile);
end; end;
end; end;
@ -2310,7 +2308,7 @@ var
end; end;
for i:=0 to Pkg1.FileCount-1 do begin for i:=0 to Pkg1.FileCount-1 do begin
PkgFile1:=Pkg1.Files[i]; PkgFile1:=Pkg1.Files[i];
if (PkgFile1.FileType in FileTypes) if (PkgFile1.FileType in PkgFileRealUnitTypes)
and (PkgFile1.Unit_Name<>'') then begin and (PkgFile1.Unit_Name<>'') then begin
// check if a unit of Pkg1 exists in Pkg2 // check if a unit of Pkg1 exists in Pkg2
PkgFile2:=UnitsTreeOfPkg2.FindPkgFileWithUnitName(PkgFile1.Unit_Name); PkgFile2:=UnitsTreeOfPkg2.FindPkgFileWithUnitName(PkgFile1.Unit_Name);