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

IdeIntf: Move PackageType to TIDEPackage, it should not be in TLazPackageID.

Browse Source 
git-svn-id: trunk@56452 -
This commit is contained in:
juha 2017-11-21 12:02:29 +00:00
parent bda79565c0
commit a35f61c6ec
3 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
components/ideintf/packageintf.pas
View File

@ -45,6 +45,9 @@ type
const
PkgFileUnitTypes = [pftUnit,pftVirtualUnit,pftMainUnit];
PkgFileRealUnitTypes = [pftUnit,pftMainUnit];
PkgFileTypeIdents: array[TPkgFileType] of string = (
'Unit', 'Virtual Unit', 'Main Unit',
'LFM', 'LRS', 'Include', 'Issues', 'Text', 'Binary');
type
TIDEPackage = class;
@ -97,20 +100,6 @@ type
property RequiredIDEPackage: TIDEPackage read FRequiredPackage write SetRequiredPackage;
end;
TLazPackageType = (
lptRunTime, // Cannot register anything in the IDE. Can be used by designtime packages.
lptDesignTime, // Can register anything in the IDE but is not compiled into projects.
// The IDE calls the 'register' procedures of each unit.
lptRunAndDesignTime, // Can do anything.
lptRunTimeOnly // As lptRunTime but cannot be installed in the IDE, not even indirectly.
);
TLazPackageTypes = set of TLazPackageType;
const
LazPackageTypeIdents: array[TLazPackageType] of string = (
'RunTime', 'DesignTime', 'RunAndDesignTime', 'RunTimeOnly');
type
{ TLazPackageID }
TLazPackageID = class(TIDEProjPackBase)
@ -121,7 +110,6 @@ type
function GetIDAsWord: string;
protected
FVersion: TPkgVersion;
FPackageType: TLazPackageType;
procedure SetName(const NewName: TComponentName); override;
procedure UpdateIDAsString;
procedure VersionChanged(Sender: TObject); virtual;
@ -142,6 +130,20 @@ type
TIteratePackagesEvent = procedure(APackage: TLazPackageID) of object;
TLazPackageType = (
lptRunTime, // Cannot register anything in the IDE. Can be used by designtime packages.
lptDesignTime, // Can register anything in the IDE but is not compiled into projects.
// The IDE calls the 'register' procedures of each unit.
lptRunAndDesignTime, // Can do anything.
lptRunTimeOnly // As lptRunTime but cannot be installed in the IDE, not even indirectly.
);
TLazPackageTypes = set of TLazPackageType;
const
LazPackageTypeIdents: array[TLazPackageType] of string = (
'RunTime', 'DesignTime', 'RunAndDesignTime', 'RunTimeOnly');
type
TPackageInstallType = (
pitNope,
pitStatic,
@ -153,9 +155,10 @@ type
TIDEPackage = class(TLazPackageID)
protected
FAutoInstall: TPackageInstallType;
FFilename: string;
FChangeStamp: integer;
FCustomOptions: TConfigStorage;
FFilename: string;
FPackageType: TLazPackageType;
function GetDirectoryExpanded: string; virtual; abstract;
function GetFileCount: integer; virtual; abstract;
function GetPkgFiles(Index: integer): TLazPackageFile; virtual; abstract;
@ -180,6 +183,7 @@ type
property Filename: string read FFilename write SetFilename;//the .lpk filename
property ChangeStamp: integer read FChangeStamp;
property CustomOptions: TConfigStorage read FCustomOptions;
property PackageType: TLazPackageType read FPackageType;
property DirectoryExpanded: string read GetDirectoryExpanded;
property FileCount: integer read GetFileCount;
property Files[Index: integer]: TLazPackageFile read GetPkgFiles;
@ -390,6 +394,8 @@ var
PackageGraphInterface: TPackageGraphInterface; // must be set along with PackageSystem.PackageGraph
function PkgFileTypeIdentToType(const s: string): TPkgFileType;
function LazPackageTypeIdentToType(const s: string): TLazPackageType;
function PackageDescriptorStd: TPackageDescriptor;
function PkgCompileFlagsToString(Flags: TPkgCompileFlags): string;
procedure RegisterPackageDescriptor(PkgDesc: TPackageDescriptor);
@ -398,6 +404,20 @@ procedure RegisterPackageDescriptor(PkgDesc: TPackageDescriptor);
implementation
function PkgFileTypeIdentToType(const s: string): TPkgFileType;
begin
for Result:=Low(TPkgFileType) to High(TPkgFileType) do
if SysUtils.CompareText(s,PkgFileTypeIdents[Result])=0 then exit;
Result:=pftUnit;
end;
function LazPackageTypeIdentToType(const s: string): TLazPackageType;
begin
for Result:=Low(TLazPackageType) to High(TLazPackageType) do
if SysUtils.CompareText(s,LazPackageTypeIdents[Result])=0 then exit;
Result:=lptRunTime;
end;
function PackageDescriptorStd: TPackageDescriptor;
begin
Result:=PackageDescriptors.FindByName(PkgDescNameStandard);

1
components/ideintf/packagelinkintf.pas
View File

@ -57,6 +57,7 @@ type
FFilename: string; // Filename or URL
FLPLFileDate: TDateTime;
FLPLFilename: string;
FPackageType: TLazPackageType;
FOrigin: TPkgLinkOrigin;
FLastUsed: TDateTime;
public

19
packager/packagedefs.pas
View File

@ -778,9 +778,6 @@ type
const
LazPkgXMLFileVersion = 4;
PkgFileTypeIdents: array[TPkgFileType] of string = (
'Unit', 'Virtual Unit', 'Main Unit',
'LFM', 'LRS', 'Include', 'Issues', 'Text', 'Binary');
AutoUpdateNames: array[TPackageUpdatePolicy] of string = (
'Manually', 'OnRebuildingAll', 'AsNeeded');
@ -807,8 +804,6 @@ function ComparePkgFilesAlphabetically(PkgFile1, PkgFile2: TPkgFile): integer;
function GetUsageOptionsList(PackageList: TFPList): TFPList;
function PkgFileTypeIdentToType(const s: string): TPkgFileType;
function LazPackageTypeIdentToType(const s: string): TLazPackageType;
function GetPkgFileTypeLocalizedName(FileType: TPkgFileType): string;
function NameToAutoUpdatePolicy(const s: string): TPackageUpdatePolicy;
function FileNameToPkgFileType(AFilename: string): TPkgFileType;
@ -865,20 +860,6 @@ function PackagePathToStr(PathList: TFPList): string;
implementation
function PkgFileTypeIdentToType(const s: string): TPkgFileType;
begin
for Result:=Low(TPkgFileType) to High(TPkgFileType) do
if SysUtils.CompareText(s,PkgFileTypeIdents[Result])=0 then exit;
Result:=pftUnit;
end;
function LazPackageTypeIdentToType(const s: string): TLazPackageType;
begin
for Result:=Low(TLazPackageType) to High(TLazPackageType) do
if SysUtils.CompareText(s,LazPackageTypeIdents[Result])=0 then exit;
Result:=lptRunTime;
end;
function GetPkgFileTypeLocalizedName(FileType: TPkgFileType): string;
begin
case FileType of