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

Packager: remove TPkgFile.IsVirtual because it has different meaning than TUnitInfo.IsVirtual and is confusing

Browse Source 
git-svn-id: trunk@35380 -
This commit is contained in:
juha 2012-02-15 16:33:36 +00:00
parent b869aa893e
commit 4e420bcf94
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/idehelpmanager.pas
View File

@ -768,7 +768,7 @@ begin
end;
if (PkgFile<>nil) and (PkgFile.FileType in PkgFileRealUnitTypes) then begin
// normal unit in lpk
if PkgFile.IsVirtual then begin
if not FilenameIsAbsolute(PkgFile.Filename) then begin
InvalidPathError('Unit "'+PkgFile.Filename+'" has no help.');
exit;
end;

14
packager/packagedefs.pas
View File

@ -181,7 +181,6 @@ type
procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
UsePathDelim: TPathDelimSwitch);
procedure ConsistencyCheck;
function IsVirtual: boolean;
function GetShortFilename(UseUp: boolean): string; override;
function ComponentCount: integer;
procedure AddPkgComponent(APkgComponent: TPkgComponent);
@ -1743,11 +1742,6 @@ begin
RaiseGDBException('TPkgFile.ConsistencyCheck FFilename=""');
end;
function TPkgFile.IsVirtual: boolean;
begin
Result:=not FilenameIsAbsolute(Filename);
end;
function TPkgFile.GetShortFilename(UseUp: boolean): string;
begin
Result:=GetFullFilename;
@ -2975,7 +2969,7 @@ end;
function TLazPackage.IsVirtual: boolean;
begin
Result:=(not FilenameIsAbsolute(Filename));
Result:=not FilenameIsAbsolute(Filename);
end;
function TLazPackage.HasDirectory: boolean;
@ -3007,8 +3001,7 @@ begin
Result:=true;
end;
procedure TLazPackage.ShortenFilename(var ExpandedFilename: string;
UseUp: boolean);
procedure TLazPackage.ShortenFilename(var ExpandedFilename: string; UseUp: boolean);
var
PkgDir: String;
CurPath: String;
@ -3042,8 +3035,7 @@ begin
if s<>'' then Result:=s;
end;
function TLazPackage.GetSourceDirs(WithPkgDir, WithoutOutputDir: boolean
): string;
function TLazPackage.GetSourceDirs(WithPkgDir, WithoutOutputDir: boolean): string;
begin
Result:=SourceDirectories.CreateSearchPathFromAllFiles;
if WithPkgDir then