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

Opkman: Replacing TPackageType with TLazPackageType.

Browse Source 
git-svn-id: trunk@56439 -
This commit is contained in:
balazs 2017-11-20 06:10:33 +00:00
parent b9279b7805
commit ec308db4fd
6 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/onlinepackagemanager/opkman_createrepositoryfrm.pas
View File

@ -32,6 +32,8 @@ uses
// LCL // LCL
Forms, Controls, Graphics, Dialogs, ExtCtrls, Forms, Controls, Graphics, Dialogs, ExtCtrls,
StdCtrls, Buttons, Menus, StdCtrls, Buttons, Menus,
// IDEIntf
PackageIntf,
// LazUtils // LazUtils
LazFileUtils, LazUTF8, LazFileUtils, LazUTF8,
// OpkMan // OpkMan
@ -137,7 +139,7 @@ type
FDataType: Integer; FDataType: Integer;
FName: String; FName: String;
FDisplayName: String; FDisplayName: String;
FPackageType: TPackageType; FPackageType: TLazPackageType;
FRepositoryFileName: String; FRepositoryFileName: String;
FRepositoryFileSize: Int64; FRepositoryFileSize: Int64;
FRepositoryFileHash: String; FRepositoryFileHash: String;
@ -1060,10 +1062,10 @@ begin
CellText := rsCreateRepositoryFrm_VSTText_Packagetype CellText := rsCreateRepositoryFrm_VSTText_Packagetype
else else
case DetailData^.FPackageType of case DetailData^.FPackageType of
ptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0; lptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0;
ptDesignTime: CellText := rsMainFrm_VSTText_PackageType1; lptDesignTime: CellText := rsMainFrm_VSTText_PackageType1;
ptRunTime: CellText := rsMainFrm_VSTText_PackageType2; lptRunTime: CellText := rsMainFrm_VSTText_PackageType2;
ptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3; lptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3;
end; end;
9: if Column = 0 then 9: if Column = 0 then
CellText := rsCreateRepositoryFrm_VSTText_License CellText := rsCreateRepositoryFrm_VSTText_License

21
components/onlinepackagemanager/opkman_createrepositorypackagefrm.pas
View File

@ -31,7 +31,8 @@ uses
Classes, SysUtils, md5, fpjson, Classes, SysUtils, md5, fpjson,
// LCL // LCL
Forms, Controls, ExtCtrls, StdCtrls, Dialogs, Graphics, Buttons, EditBtn, Forms, Controls, ExtCtrls, StdCtrls, Dialogs, Graphics, Buttons, EditBtn,
LCLIntf, // IDEIntf
LCLIntf, PackageIntf,
// LazUtils // LazUtils
FileUtil, LazFileUtils, Laz2_XMLCfg, FileUtil, LazFileUtils, Laz2_XMLCfg,
// OpkMan // OpkMan
@ -166,7 +167,7 @@ type
FDataType: Integer; FDataType: Integer;
FName: String; FName: String;
FDisplayName: String; FDisplayName: String;
FPackageType: TPackageType; FPackageType: TLazPackageType;
FAuthor: String; FAuthor: String;
FDescription: String; FDescription: String;
FLicense: String; FLicense: String;
@ -307,12 +308,12 @@ end;
function LoadPackageData(const APath: String; AData: PData): Boolean; function LoadPackageData(const APath: String; AData: PData): Boolean;
function PackageTypeIdentToType(const AStr: String): TPackageType; function PackageTypeIdentToType(const AStr: String): TLazPackageType;
begin begin
for Result := Low(TPackageType) to High(TPackageType) do for Result := Low(TLazPackageType) to High(TLazPackageType) do
if SysUtils.CompareText(AStr, PackageTypeIdents[Result]) = 0 then if SysUtils.CompareText(AStr, PackageTypeIdents[Result]) = 0 then
Exit; Exit;
Result := ptRunTime; Result := lptRunTime;
end; end;
function VersionBound(const AVersion: Integer): Integer; function VersionBound(const AVersion: Integer): Integer;
@ -347,7 +348,7 @@ begin
BasePath := 'Package/'; BasePath := 'Package/';
XMLConfig := TXMLConfig.Create(APath); XMLConfig := TXMLConfig.Create(APath);
try try
AData^.FPackageType := PackageTypeIdentToType(XMLConfig.GetValue(BasePath + 'Type/Value', PackageTypeIdents[ptRunTime])); AData^.FPackageType := PackageTypeIdentToType(XMLConfig.GetValue(BasePath + 'Type/Value', PackageTypeIdents[lptRunTime]));
AData^.FDescription := String(XMLConfig.GetValue(BasePath + 'Description/Value', '')); AData^.FDescription := String(XMLConfig.GetValue(BasePath + 'Description/Value', ''));
AData^.FAuthor := String(XMLConfig.GetValue(BasePath + 'Author/Value', '')); AData^.FAuthor := String(XMLConfig.GetValue(BasePath + 'Author/Value', ''));
AData^.FLicense := String(XMLConfig.GetValue(BasePath + 'License/Value', '')); AData^.FLicense := String(XMLConfig.GetValue(BasePath + 'License/Value', ''));
@ -846,10 +847,10 @@ begin
3: CellText := Data^.FDescription; 3: CellText := Data^.FDescription;
4: CellText := Data^.FAuthor; 4: CellText := Data^.FAuthor;
5: case Data^.FPackageType of 5: case Data^.FPackageType of
ptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0; lptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0;
ptDesignTime: CellText := rsMainFrm_VSTText_PackageType1; lptDesignTime: CellText := rsMainFrm_VSTText_PackageType1;
ptRunTime: CellText := rsMainFrm_VSTText_PackageType2; lptRunTime: CellText := rsMainFrm_VSTText_PackageType2;
ptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3; lptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3;
end; end;
6: CellText := Data^.FDependenciesAsString; 6: CellText := Data^.FDependenciesAsString;
7: CellText := Data^.FLicense; 7: CellText := Data^.FLicense;

4
components/onlinepackagemanager/opkman_installer.pas
View File

@ -248,7 +248,7 @@ begin
begin begin
Inc(FCnt); Inc(FCnt);
if not FNeedToRebuild then if not FNeedToRebuild then
FNeedToRebuild := LazarusPkg.PackageType in [ptRunAndDesignTime, ptDesigntime]; FNeedToRebuild := LazarusPkg.PackageType in [lptRunAndDesignTime, lptDesigntime];
DoOnPackageInstallProgress(imOpenPackage, LazarusPkg); DoOnPackageInstallProgress(imOpenPackage, LazarusPkg);
IDEPackage := OpenPackage(LazarusPkg.PackageAbsolutePath); IDEPackage := OpenPackage(LazarusPkg.PackageAbsolutePath);
if IDEPackage <> nil then if IDEPackage <> nil then
@ -266,7 +266,7 @@ begin
if LazarusPkg.InternalVersion > LazarusPkg.InternalVersionOld then if LazarusPkg.InternalVersion > LazarusPkg.InternalVersionOld then
LazarusPkg.InternalVersionOld := LazarusPkg.InternalVersion; LazarusPkg.InternalVersionOld := LazarusPkg.InternalVersion;
end; end;
if LazarusPkg.PackageType in [ptRunAndDesignTime, ptDesigntime] then if LazarusPkg.PackageType in [lptRunAndDesignTime, lptDesigntime] then
begin begin
DoOnPackageInstallProgress(imInstallPackage, LazarusPkg); DoOnPackageInstallProgress(imInstallPackage, LazarusPkg);
if InstallPackage then if InstallPackage then

4
components/onlinepackagemanager/opkman_mainfrm.pas
View File

@ -840,14 +840,14 @@ begin
if (LazarusPackage.Checked) and (LazarusPackage.PackageState = psInstalled) then if (LazarusPackage.Checked) and (LazarusPackage.PackageState = psInstalled) then
begin begin
case LazarusPackage.PackageType of case LazarusPackage.PackageType of
ptRunTime, ptRunTimeOnly: lptRunTime, lptRunTimeOnly:
begin begin
FileName := StringReplace(LazarusPackage.Name, '.lpk', '.opkman', [rfIgnoreCase]); FileName := StringReplace(LazarusPackage.Name, '.lpk', '.opkman', [rfIgnoreCase]);
if FileExists(Options.LocalRepositoryPackages + SerializablePackages.Items[I].PackageBaseDir + LazarusPackage.PackageRelativePath + FileName) then if FileExists(Options.LocalRepositoryPackages + SerializablePackages.Items[I].PackageBaseDir + LazarusPackage.PackageRelativePath + FileName) then
DeleteFile(Options.LocalRepositoryPackages + SerializablePackages.Items[I].PackageBaseDir + LazarusPackage.PackageRelativePath + FileName); DeleteFile(Options.LocalRepositoryPackages + SerializablePackages.Items[I].PackageBaseDir + LazarusPackage.PackageRelativePath + FileName);
NeedToRebuild := True; NeedToRebuild := True;
end; end;
ptDesignTime, ptRunAndDesignTime: lptDesignTime, lptRunAndDesignTime:
begin begin
IDEPackage := GetIDEPackage(LazarusPackage.PackageAbsolutePath); IDEPackage := GetIDEPackage(LazarusPackage.PackageAbsolutePath);
if IDEPackage <> nil then if IDEPackage <> nil then

22
components/onlinepackagemanager/opkman_serializablepackages.pas
View File

@ -39,16 +39,8 @@ uses
// OpkMan // OpkMan
opkman_common, opkman_const, opkman_options; opkman_common, opkman_const, opkman_options;
type
TPackageType = (
ptRunAndDesignTime,
ptDesignTime,
ptRunTime,
ptRunTimeOnly);
const const
PackageTypeIdents: array[TPackageType] of string = ( PackageTypeIdents: array[TLazPackageType] of string = (
'RunAndDesignTime', 'RunAndDesignTime',
'DesignTime', 'DesignTime',
'RunTime', 'RunTime',
@ -119,7 +111,7 @@ type
FLicense: String; FLicense: String;
FPackageState: TPackageState; FPackageState: TPackageState;
FPackageStates: TPackageStates; FPackageStates: TPackageStates;
FPackageType: TPackageType; // ToDo: Replace with TLazPackageType. FPackageType: TLazPackageType;
FLazCompatibility: String; FLazCompatibility: String;
FFPCCompatibility: String; FFPCCompatibility: String;
FSupportedWidgetSet: String; FSupportedWidgetSet: String;
@ -174,7 +166,7 @@ type
property LazCompatibility: String read FLazCompatibility write FLazCompatibility; property LazCompatibility: String read FLazCompatibility write FLazCompatibility;
property FPCCompatibility: String read FFPCCompatibility write FFPCCompatibility; property FPCCompatibility: String read FFPCCompatibility write FFPCCompatibility;
property SupportedWidgetSet: String read FSupportedWidgetSet write FSupportedWidgetSet; property SupportedWidgetSet: String read FSupportedWidgetSet write FSupportedWidgetSet;
property PackageType: TPackageType read FPackageType write FPackageType; property PackageType: TLazPackageType read FPackageType write FPackageType;
property License: String read FLicense write FLicense; property License: String read FLicense write FLicense;
property DependenciesAsString: String read GetDependenciesAsString write SetDependenciesAsString; property DependenciesAsString: String read GetDependenciesAsString write SetDependenciesAsString;
end; end;
@ -888,7 +880,7 @@ begin
LazarusPkg.LazCompatibility := LazarusPkgsObj.Get('LazCompatibility'); LazarusPkg.LazCompatibility := LazarusPkgsObj.Get('LazCompatibility');
LazarusPkg.FPCCompatibility := LazarusPkgsObj.Get('FPCCompatibility'); LazarusPkg.FPCCompatibility := LazarusPkgsObj.Get('FPCCompatibility');
LazarusPkg.SupportedWidgetSet := LazarusPkgsObj.Get('SupportedWidgetSet'); LazarusPkg.SupportedWidgetSet := LazarusPkgsObj.Get('SupportedWidgetSet');
LazarusPkg.PackageType := TPackageType(LazarusPkgsObj.Get('PackageType')); LazarusPkg.PackageType := TLazPackageType(LazarusPkgsObj.Get('PackageType'));
LazarusPkg.DependenciesAsString := LazarusPkgsObj.Get('DependenciesAsString'); LazarusPkg.DependenciesAsString := LazarusPkgsObj.Get('DependenciesAsString');
end; end;
end; end;
@ -1121,7 +1113,7 @@ var
begin begin
Result := False; Result := False;
case ALazarusPkg.PackageType of case ALazarusPkg.PackageType of
ptRunTime, ptRunTimeOnly: lptRunTime, lptRunTimeOnly:
begin begin
FileName := StringReplace(ALazarusPkg.Name, '.lpk', '.opkman', [rfIgnoreCase]); FileName := StringReplace(ALazarusPkg.Name, '.lpk', '.opkman', [rfIgnoreCase]);
RepoPath := Options.LocalRepositoryPackages + APackageBaseDir + ALazarusPkg.PackageRelativePath; RepoPath := Options.LocalRepositoryPackages + APackageBaseDir + ALazarusPkg.PackageRelativePath;
@ -1139,7 +1131,7 @@ begin
else else
Result := CheckIDEPackages Result := CheckIDEPackages
end; end;
ptDesignTime, ptRunAndDesignTime: lptDesignTime, lptRunAndDesignTime:
begin begin
Result := CheckIDEPackages Result := CheckIDEPackages
end; end;
@ -1352,7 +1344,7 @@ begin
if (LazarusPkg.Checked) and if (LazarusPkg.Checked) and
(psInstalled in LazarusPkg.PackageStates) and (psInstalled in LazarusPkg.PackageStates) and
(not (psError in LazarusPkg.PackageStates)) and (not (psError in LazarusPkg.PackageStates)) and
(LazarusPkg.PackageType in [ptRunTime, ptRunTimeOnly]) then (LazarusPkg.PackageType in [lptRunTime, lptRunTimeOnly]) then
begin begin
FileName := StringReplace(LazarusPkg.Name, '.lpk', '.opkman', [rfIgnoreCase]); FileName := StringReplace(LazarusPkg.Name, '.lpk', '.opkman', [rfIgnoreCase]);
FileCreate(Options.LocalRepositoryPackages + Items[I].PackageBaseDir + LazarusPkg.PackageRelativePath + FileName); FileCreate(Options.LocalRepositoryPackages + Items[I].PackageBaseDir + LazarusPkg.PackageRelativePath + FileName);

24
components/onlinepackagemanager/opkman_visualtree.pas
View File

@ -32,7 +32,9 @@ interface
uses uses
Classes, SysUtils, contnrs, Math, dateutils, Classes, SysUtils, contnrs, Math, dateutils,
// LCL // LCL
Controls, Graphics, Menus, Dialogs, Forms, LCLType, LCLIntf, Buttons, Controls, Graphics, Menus, Dialogs, Forms, LCLType, Buttons,
// IDEIntf
LCLIntf, PackageIntf,
// OpkMan // OpkMan
opkman_VirtualTrees, opkman_common, opkman_serializablepackages, opkman_const, opkman_VirtualTrees, opkman_common, opkman_serializablepackages, opkman_const,
opkman_options, opkman_packagedetailsfrm; opkman_options, opkman_packagedetailsfrm;
@ -58,7 +60,7 @@ type
LazCompatibility: String; LazCompatibility: String;
FPCCompatibility: String; FPCCompatibility: String;
SupportedWidgetSet: String; SupportedWidgetSet: String;
PackageType: TPackageType; PackageType: TLazPackageType;
Dependencies: String; Dependencies: String;
License: String; License: String;
RepositoryFileName: String; RepositoryFileName: String;
@ -941,7 +943,7 @@ begin
begin begin
if Data^.DataType = 8 then if Data^.DataType = 8 then
begin begin
if Data^.PackageType = TPackageType(AExtraParam) then if Data^.PackageType = TLazPackageType(AExtraParam) then
FilterNode(Node, 'PackageType') FilterNode(Node, 'PackageType')
else else
FilterNode(Node, ''); FilterNode(Node, '');
@ -1509,10 +1511,10 @@ begin
6: CellText := Data^.FPCCompatibility; 6: CellText := Data^.FPCCompatibility;
7: CellText := Data^.SupportedWidgetSet; 7: CellText := Data^.SupportedWidgetSet;
8: case Data^.PackageType of 8: case Data^.PackageType of
ptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0; lptRunAndDesignTime: CellText := rsMainFrm_VSTText_PackageType0;
ptDesignTime: CellText := rsMainFrm_VSTText_PackageType1; lptDesignTime: CellText := rsMainFrm_VSTText_PackageType1;
ptRunTime: CellText := rsMainFrm_VSTText_PackageType2; lptRunTime: CellText := rsMainFrm_VSTText_PackageType2;
ptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3; lptRunTimeOnly: CellText := rsMainFrm_VSTText_PackageType3;
end; end;
9: CellText := GetDisplayString(Data^.License); 9: CellText := GetDisplayString(Data^.License);
10: CellText := Data^.Dependencies; 10: CellText := Data^.Dependencies;
@ -1784,10 +1786,10 @@ begin
6: HintText := Data^.FPCCompatibility; 6: HintText := Data^.FPCCompatibility;
7: HintText := Data^.SupportedWidgetSet; 7: HintText := Data^.SupportedWidgetSet;
8: case Data^.PackageType of 8: case Data^.PackageType of
ptRunAndDesignTime: HintText := rsMainFrm_VSTText_PackageType0; lptRunAndDesignTime: HintText := rsMainFrm_VSTText_PackageType0;
ptDesignTime: HintText := rsMainFrm_VSTText_PackageType1; lptDesignTime: HintText := rsMainFrm_VSTText_PackageType1;
ptRunTime: HintText := rsMainFrm_VSTText_PackageType2; lptRunTime: HintText := rsMainFrm_VSTText_PackageType2;
ptRunTimeOnly: HintText := rsMainFrm_VSTText_PackageType3; lptRunTimeOnly: HintText := rsMainFrm_VSTText_PackageType3;
end; end;
9: HintText := GetDisplayString(Data^.License); 9: HintText := GetDisplayString(Data^.License);
10: HintText := Data^.Dependencies; 10: HintText := Data^.Dependencies;