paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-23 11:19:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: packager: clean up deprecated

Browse Source 
git-svn-id: trunk@53139 -
This commit is contained in:
mattias 2016-10-17 13:34:49 +00:00
parent 425d1ffeb1
commit 7e94dc0340
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/basepkgmanager.pas
View File

@ -232,7 +232,7 @@ begin
if DepOwner is TLazPackage then begin if DepOwner is TLazPackage then begin
Directory:=TLazPackage(DepOwner).Directory; Directory:=TLazPackage(DepOwner).Directory;
end else if DepOwner is TProject then begin end else if DepOwner is TProject then begin
Directory:=TProject(DepOwner).ProjectDirectory; Directory:=TProject(DepOwner).Directory;
end else if DepOwner=PkgBoss then begin end else if DepOwner=PkgBoss then begin
Directory:=EnvironmentOptions.GetParsedLazarusDirectory; Directory:=EnvironmentOptions.GetParsedLazarusDirectory;
end else begin end else begin

6
packager/pkgmanager.pas
View File

@ -2575,7 +2575,7 @@ var
NewHasRegisterProc:=OldPkgFile.HasRegisterProc; NewHasRegisterProc:=OldPkgFile.HasRegisterProc;
NewAddToUses:=OldPkgFile.AddToUsesPkgSection; NewAddToUses:=OldPkgFile.AddToUsesPkgSection;
end else begin end else begin
NewUnitName:=OldProjFile.SrcUnitName; NewUnitName:=OldProjFile.Unit_Name;
NewFileType:=FileNameToPkgFileType(OldFilename); NewFileType:=FileNameToPkgFileType(OldFilename);
NewCompPrio:=ComponentPriorityNormal; NewCompPrio:=ComponentPriorityNormal;
NewResourceBaseClass:=OldProjFile.ResourceBaseClass; NewResourceBaseClass:=OldProjFile.ResourceBaseClass;
@ -4151,7 +4151,7 @@ begin
if not (pcfDoNotCompileDependencies in Flags) then begin if not (pcfDoNotCompileDependencies in Flags) then begin
Result:=CheckPackageGraphForCompilation(nil, Result:=CheckPackageGraphForCompilation(nil,
AProject.FirstRequiredDependency, AProject.FirstRequiredDependency,
AProject.ProjectDirectory,false); AProject.Directory,false);
if Result<>mrOk then exit; if Result<>mrOk then exit;
end; end;
@ -4339,7 +4339,7 @@ var
end else begin end else begin
ClassUnitInfo:=Project1.UnitWithComponentClassName(ComponentClassnames[i]); ClassUnitInfo:=Project1.UnitWithComponentClassName(ComponentClassnames[i]);
if ClassUnitInfo<>nil then if ClassUnitInfo<>nil then
NewUnitName:=ClassUnitInfo.SrcUnitName; NewUnitName:=ClassUnitInfo.Unit_Name;
end; end;
if (NewUnitName<>'') and (UnitNames.IndexOf(NewUnitName)<0) then begin if (NewUnitName<>'') and (UnitNames.IndexOf(NewUnitName)<0) then begin
// new needed unit // new needed unit

2
packager/projpackchecks.pas
View File

@ -293,7 +293,7 @@ begin
Result:=mrCancel; Result:=mrCancel;
// expand filename // expand filename
if not FilenameIsAbsolute(NewFilename) then if not FilenameIsAbsolute(NewFilename) then
NewFilename:=TrimFilename(AProject.ProjectDirectory+PathDelim+NewFilename); NewFilename:=TrimFilename(AProject.Directory+PathDelim+NewFilename);
// check if file is already part of project // check if file is already part of project
NewFile:=AProject.UnitInfoWithFilename(NewFilename); NewFile:=AProject.UnitInfoWithFilename(NewFilename);
if (NewFile<>nil) and NewFile.IsPartOfProject then begin if (NewFile<>nil) and NewFile.IsPartOfProject then begin