paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 04:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make Project and Package inherit from a new TProjPack base class.

Browse Source 
git-svn-id: trunk@45805 -
This commit is contained in:
juha 2014-07-06 22:38:02 +00:00
parent 539b683d28
commit ad6ac0e2a3
7 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/compoptsintf.pas
View File

@ -117,7 +117,7 @@ const
type
{ TLazCompilerOptions }
TLazCompilerOptions = class(TAbstractIDECompilerOptions)
TLazCompilerOptions = class(TAbstractIDEOptions)
private
FOnModified: TNotifyEvent;
fOwner: TObject;

7
components/ideintf/ideintf.lpk
View File

@ -14,13 +14,12 @@
<ShowGenInfo Value="False"/>
</Verbosity>
<CustomOptions Value="$(IDEBuildOptions)"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
<Description Value="IDEIntf - the interface units for the Lazarus IDE"/>
<License Value="Modified LPGL2"/>
<Version Major="1"/>
<Files Count="75">
<Files Count="76">
<Item1>
<Filename Value="actionseditor.pas"/>
<UnitName Value="ActionsEditor"/>
@ -322,6 +321,10 @@
<Filename Value="unitresources.pas"/>
<UnitName Value="UnitResources"/>
</Item75>
<Item76>
<Filename Value="projpackintf.pas"/>
<UnitName Value="projpackintf"/>
</Item76>
</Files>
<LazDoc Paths="docs"/>
<i18n>

2
components/ideintf/ideintf.pas
View File

@ -19,7 +19,7 @@ uses
NewItemIntf, ObjectInspector, ObjInspStrConsts, OIFavoriteProperties,
PackageIntf, ProjectIntf, ProjectResourcesIntf, PropEdits, PropEditUtils,
SrcEditorIntf, StatusBarPropEdit, StringsPropEditDlg, TextTools,
TreeViewPropEdit, UnitResources, LazarusPackageIntf;
TreeViewPropEdit, UnitResources, ProjPackIntf, LazarusPackageIntf;
implementation

1
components/ideintf/ideoptionsintf.pas
View File

@ -103,7 +103,6 @@ type
TAbstractIDEEnvironmentOptions = class(TAbstractIDEOptions);
TAbstractIDEHelpOptions = class(TAbstractIDEEnvironmentOptions);
TAbstractIDECompilerOptions = class(TAbstractIDEOptions);
TOnLoadIDEOptions = procedure(Sender: TObject; AOptions: TAbstractIDEOptions) of object;
TOnSaveIDEOptions = procedure(Sender: TObject; AOptions: TAbstractIDEOptions) of object;

19
components/ideintf/packageintf.pas
View File

@ -17,7 +17,7 @@ interface
uses
Classes, SysUtils, contnrs, LCLProc, Forms, LazConfigStorage,
NewItemIntf, CompOptsIntf, IDEOptionsIntf;
NewItemIntf, ProjPackIntf, CompOptsIntf, IDEOptionsIntf;
const
PkgDescGroupName = 'Package';
@ -74,20 +74,6 @@ type
TIDEPackage = class;
{$M+}
TIDEOwnedFile = class
protected
function GetFilename: string; virtual; abstract;
procedure SetFilename(const AValue: string); virtual; abstract;
public
function GetFullFilename: string; virtual; abstract; // if no path, the file was not saved yet
function GetShortFilename(UseUp: boolean): string; virtual; abstract;
function GetFileOwner: TObject; virtual; abstract;
function GetFileOwnerName: string; virtual; abstract;
property Filename: string read GetFilename write SetFilename;
end;
{$M-}
{ TLazPackageFile }
TLazPackageFile = class(TIDEOwnedFile)
@ -112,11 +98,10 @@ type
{ TLazPackageID }
TLazPackageID = class(TPersistent)
TLazPackageID = class(TProjPack)
private
FIDAsWord: string;
protected
FIDEOptions: TAbstractIDEOptions; //actually TPackageIDEOptions;
FName: string;
FVersion: TPkgVersion;
FIDAsString: string;

5
components/ideintf/projectintf.pas
View File

@ -17,7 +17,7 @@ interface
uses
Classes, SysUtils, LCLProc, FileUtil, Controls, Forms, AvgLvlTree,
NewItemIntf, ObjInspStrConsts, IDEOptionsIntf, CompOptsIntf, PackageIntf;
NewItemIntf, ObjInspStrConsts, ProjPackIntf, IDEOptionsIntf, CompOptsIntf;
const
FileDescGroupName = 'File';
@ -368,7 +368,7 @@ type
petUnit
);
TLazProject = class(TPersistent)
TLazProject = class(TProjPack)
private
FCleanOutputFileMask: string;
FCleanSourcesFileMask: string;
@ -388,7 +388,6 @@ type
procedure SetFPDocPaths(const AValue: string);
procedure SetUseAppBundle(AValue: Boolean);
protected
FIDEOptions: TAbstractIDEOptions; //actually TProjectIDEOptions;
FLazCompilerOptions: TLazCompilerOptions;
FFlags: TProjectFlags;
FResources: TObject;

2
packager/pkgmanager.pas
View File

@ -52,7 +52,7 @@ uses
CodeToolsConfig, CodeToolManager, CodeCache, CodeToolsStructs, BasicCodeTools,
FileProcs, CodeTree, Laz2_XMLCfg, lazutf8classes, LazFileUtils, LazFileCache,
// IDE Interface
SrcEditorIntf, NewItemIntf, ProjectIntf, PackageIntf, CompOptsIntf,
SrcEditorIntf, NewItemIntf, ProjPackIntf, ProjectIntf, PackageIntf, CompOptsIntf,
MenuIntf, IDEWindowIntf,
{$IFNDEF EnableOldExtTools}
IDEExternToolIntf,