mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-10 09:28:21 +02:00
activated the package system
git-svn-id: trunk@4150 -
This commit is contained in:
parent
dff0b1e08e
commit
4fd409f5b3
@ -46,10 +46,10 @@ uses
|
||||
MemCheck,
|
||||
{$ENDIF}
|
||||
Classes, SysUtils, Forms, Controls, LCLLinux, Dialogs, JITForm,
|
||||
{$IFDEF EnablePkgs}
|
||||
ComponentReg;
|
||||
{$ELSE}
|
||||
{$IFDEF DisablePkgs}
|
||||
CompReg;
|
||||
{$ELSE}
|
||||
ComponentReg;
|
||||
{$ENDIF}
|
||||
|
||||
type
|
||||
@ -77,7 +77,7 @@ type
|
||||
FCurReadComponentClass: TComponentClass;
|
||||
FForms: TList; // list of TJITForm
|
||||
FOnReaderError: TJITReaderErrorEvent;
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
FRegCompList:TRegisteredComponentList;
|
||||
{$ENDIF}
|
||||
// jit procedures
|
||||
@ -114,7 +114,7 @@ type
|
||||
destructor Destroy; override;
|
||||
property Items[Index:integer]:TForm read GetItem; default;
|
||||
function Count:integer;
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
property RegCompList:TRegisteredComponentList read FRegCompList write FRegCompList;
|
||||
{$ENDIF}
|
||||
function AddNewJITForm:integer;
|
||||
@ -760,10 +760,10 @@ begin
|
||||
fCurReadComponent:=nil;
|
||||
fCurReadComponentClass:=ComponentClass;
|
||||
if ComponentClass=nil then begin
|
||||
{$IFDEF EnablePkgs}
|
||||
RegComp:=IDEComponentPalette.FindComponent(FindClassName);
|
||||
{$ELSE}
|
||||
{$IFDEF DisablePkgs}
|
||||
RegComp:=FRegCompList.FindComponentClassByName(FindClassName);
|
||||
{$ELSE}
|
||||
RegComp:=IDEComponentPalette.FindComponent(FindClassName);
|
||||
{$ENDIF}
|
||||
if RegComp<>nil then begin
|
||||
//writeln('[TJITForms.ReaderFindComponentClass] '''+FindClassName
|
||||
|
@ -828,7 +828,7 @@ begin
|
||||
Name:='WithStaticPackagesCheckBox';
|
||||
Parent:=Self;
|
||||
Caption:=lisLazBuildWithStaticPackages;
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
Visible:=false;
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
@ -32,7 +32,7 @@ unit CompReg;
|
||||
|
||||
{$MODE OBJFPC}{$H+}
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
This unit will be deleted in future
|
||||
{$ENDIF}
|
||||
|
||||
|
@ -40,10 +40,10 @@ uses
|
||||
{$ENDIF}
|
||||
Classes, AbstractFormeditor, Controls, PropEdits, TypInfo, ObjectInspector,
|
||||
Forms, Menus, JITForms,
|
||||
{$IFDEF EnablePkgs}
|
||||
ComponentReg,
|
||||
{$ELSE}
|
||||
{$IFDEF DisablePkgs}
|
||||
CompReg, IDEComp,
|
||||
{$ELSE}
|
||||
ComponentReg,
|
||||
{$ENDIF}
|
||||
ComponentEditors, KeyMapping, EditorOptions, Dialogs;
|
||||
|
||||
@ -623,7 +623,7 @@ begin
|
||||
FComponentInterfaceList := TList.Create;
|
||||
FSelectedComponents := TComponentSelectionList.Create;
|
||||
JITFormList := TJITForms.Create;
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
JITFormList.RegCompList := RegCompList;
|
||||
{$ENDIF}
|
||||
JITFormList.OnReaderError:=@JITFormListReaderError;
|
||||
|
@ -39,7 +39,7 @@ unit IDEComp;
|
||||
{$linklib crypt}
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
{$error This unit will be deleted in future}
|
||||
{$ENDIF}
|
||||
|
||||
|
@ -44,10 +44,10 @@ uses
|
||||
Controls, Graphics, ExtCtrls, Dialogs, FileCtrl, Forms, CodeToolManager,
|
||||
CodeCache, AVL_Tree, SynEditKeyCmds, LazConf, LazarusIDEStrConsts,
|
||||
ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler,
|
||||
{$IFDEF EnablePkgs}
|
||||
ComponentReg,
|
||||
{$ELSE}
|
||||
{$IFDEF DisablePkgs}
|
||||
CompReg, IDEComp,
|
||||
{$ELSE}
|
||||
ComponentReg,
|
||||
{$ENDIF}
|
||||
Splash, TransferMacros, ObjectInspector, PropEdits,
|
||||
OutputFilter, IDEDefs, MsgView, EnvironmentOpts, EditorOptions,
|
||||
@ -1022,7 +1022,7 @@ begin
|
||||
itmProjectInspector.Name:='itmProjectInspector';
|
||||
itmProjectInspector.Caption := lisMenuProjectInspector;
|
||||
itmProjectInspector.Graphic:=LoadPixmap('menu_projectinspector');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuProject.Add(itmProjectInspector);
|
||||
{$ENDIF}
|
||||
|
||||
@ -1127,7 +1127,7 @@ begin
|
||||
itmPkgOpenPackage.Name:='itmPkgOpenPackage';
|
||||
itmPkgOpenPackage.Caption := lisMenuOpenPackage;
|
||||
itmPkgOpenPackage.Graphic:=LoadPixmap('pkg_package');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(itmPkgOpenPackage);
|
||||
{$ENDIF}
|
||||
|
||||
@ -1135,7 +1135,7 @@ begin
|
||||
itmPkgOpenPackageFile.Name:='itmPkgOpenPackageFile';
|
||||
itmPkgOpenPackageFile.Caption := lisMenuOpenPackageFile;
|
||||
itmPkgOpenPackageFile.Graphic:=LoadPixmap('pkg_package');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(itmPkgOpenPackageFile);
|
||||
{$ENDIF}
|
||||
|
||||
@ -1143,11 +1143,11 @@ begin
|
||||
itmPkgOpenRecent.Name:='itmPkgOpenRecent';
|
||||
itmPkgOpenRecent.Caption := lisMenuOpenRecentPkg;
|
||||
itmPkgOpenRecent.Graphic:=LoadPixmap('pkg_package');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(itmPkgOpenRecent);
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(CreateMenuSeparator);
|
||||
{$ENDIF}
|
||||
|
||||
@ -1155,11 +1155,11 @@ begin
|
||||
itmPkgAddCurUnitToPkg.Name:='itmPkgAddCurUnitToPkg';
|
||||
itmPkgAddCurUnitToPkg.Caption := lisMenuAddCurUnitToPkg;
|
||||
itmPkgAddCurUnitToPkg.Graphic:=LoadPixmap('pkg_addunittopackage');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(itmPkgAddCurUnitToPkg);
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(CreateMenuSeparator);
|
||||
{$ENDIF}
|
||||
|
||||
@ -1167,11 +1167,11 @@ begin
|
||||
itmPkgPkgGraph.Name:='itmPkgPkgGraph';
|
||||
itmPkgPkgGraph.Caption := lisMenuPackageGraph;
|
||||
itmPkgPkgGraph.Graphic:=LoadPixmap('pkg_packagegraph');
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(itmPkgPkgGraph);
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
mnuComponents.Add(CreateMenuSeparator);
|
||||
{$ENDIF}
|
||||
|
||||
|
@ -558,7 +558,7 @@ begin
|
||||
NewCategory.Add(
|
||||
TNewIDEItemTemplate.Create(niiCustomProject,'Custom Project',niifCopy,[]));
|
||||
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
// category package
|
||||
NewCategory:=TNewIDEItemCategory.Create('Package');
|
||||
Add(NewCategory);
|
||||
|
@ -1393,7 +1393,7 @@ end;
|
||||
|
||||
procedure TPkgManager.UpdateVisibleComponentPalette;
|
||||
begin
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
TComponentPalette(IDEComponentPalette).NoteBook:=MainIDE.ComponentNotebook;
|
||||
TComponentPalette(IDEComponentPalette).UpdateNoteBookButtons;
|
||||
{$ENDIF}
|
||||
@ -1471,14 +1471,14 @@ begin
|
||||
'$(LazarusDir)'+ds+'lcl'
|
||||
+';'+
|
||||
'$(LazarusDir)'+ds+'lcl'+ds+'interfaces'+ds+'$(LCLWidgetType)';
|
||||
{$IFDEF EnablePkgs}
|
||||
AddProjectLCLDependency(AProject);
|
||||
{$ELSE}
|
||||
{$IFDEF DisablePkgs}
|
||||
// add lcl ppu dirs to unit search path
|
||||
Project1.CompilerOptions.OtherUnitFiles:=
|
||||
'$(LazarusDir)'+ds+'lcl'+ds+'units'
|
||||
+';'+
|
||||
'$(LazarusDir)'+ds+'lcl'+ds+'units'+ds+'$(LCLWidgetType)';
|
||||
{$ELSE}
|
||||
AddProjectLCLDependency(AProject);
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
@ -1491,7 +1491,7 @@ procedure TPkgManager.AddProjectDependency(AProject: TProject;
|
||||
var
|
||||
NewDependency: TPkgDependency;
|
||||
begin
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
exit;
|
||||
{$ENDIF}
|
||||
// check if the dependency is already there
|
||||
@ -1510,7 +1510,7 @@ procedure TPkgManager.AddProjectRegCompDependency(AProject: TProject;
|
||||
var
|
||||
PkgFile: TPkgFile;
|
||||
begin
|
||||
{$IFNDEF EnablePkgs}
|
||||
{$IFDEF DisablePkgs}
|
||||
exit;
|
||||
{$ENDIF}
|
||||
if not (ARegisteredComponent is TPkgComponent) then exit;
|
||||
|
@ -208,7 +208,7 @@ end;
|
||||
procedure TFrmComponentMan.FrmMainCREATE(Sender: TObject);
|
||||
begin
|
||||
MyFile := TStringList.Create;
|
||||
{$IFDEF EnablePkgs}
|
||||
{$IFNDEF DisablePkgs}
|
||||
Caption:='Custom Component Manager (No packages!)';
|
||||
Label1.Caption:='Installed Custom Components';
|
||||
{$ENDIF}
|
||||
|
Loading…
Reference in New Issue
Block a user