activated the package system

git-svn-id: trunk@4150 -
This commit is contained in:
mattias 2003-05-12 19:36:25 +00:00
parent dff0b1e08e
commit 4fd409f5b3
9 changed files with 35 additions and 35 deletions

View File

@ -46,10 +46,10 @@ uses
MemCheck, MemCheck,
{$ENDIF} {$ENDIF}
Classes, SysUtils, Forms, Controls, LCLLinux, Dialogs, JITForm, Classes, SysUtils, Forms, Controls, LCLLinux, Dialogs, JITForm,
{$IFDEF EnablePkgs} {$IFDEF DisablePkgs}
ComponentReg;
{$ELSE}
CompReg; CompReg;
{$ELSE}
ComponentReg;
{$ENDIF} {$ENDIF}
type type
@ -77,7 +77,7 @@ type
FCurReadComponentClass: TComponentClass; FCurReadComponentClass: TComponentClass;
FForms: TList; // list of TJITForm FForms: TList; // list of TJITForm
FOnReaderError: TJITReaderErrorEvent; FOnReaderError: TJITReaderErrorEvent;
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
FRegCompList:TRegisteredComponentList; FRegCompList:TRegisteredComponentList;
{$ENDIF} {$ENDIF}
// jit procedures // jit procedures
@ -114,7 +114,7 @@ type
destructor Destroy; override; destructor Destroy; override;
property Items[Index:integer]:TForm read GetItem; default; property Items[Index:integer]:TForm read GetItem; default;
function Count:integer; function Count:integer;
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
property RegCompList:TRegisteredComponentList read FRegCompList write FRegCompList; property RegCompList:TRegisteredComponentList read FRegCompList write FRegCompList;
{$ENDIF} {$ENDIF}
function AddNewJITForm:integer; function AddNewJITForm:integer;
@ -760,10 +760,10 @@ begin
fCurReadComponent:=nil; fCurReadComponent:=nil;
fCurReadComponentClass:=ComponentClass; fCurReadComponentClass:=ComponentClass;
if ComponentClass=nil then begin if ComponentClass=nil then begin
{$IFDEF EnablePkgs} {$IFDEF DisablePkgs}
RegComp:=IDEComponentPalette.FindComponent(FindClassName);
{$ELSE}
RegComp:=FRegCompList.FindComponentClassByName(FindClassName); RegComp:=FRegCompList.FindComponentClassByName(FindClassName);
{$ELSE}
RegComp:=IDEComponentPalette.FindComponent(FindClassName);
{$ENDIF} {$ENDIF}
if RegComp<>nil then begin if RegComp<>nil then begin
//writeln('[TJITForms.ReaderFindComponentClass] '''+FindClassName //writeln('[TJITForms.ReaderFindComponentClass] '''+FindClassName

View File

@ -828,7 +828,7 @@ begin
Name:='WithStaticPackagesCheckBox'; Name:='WithStaticPackagesCheckBox';
Parent:=Self; Parent:=Self;
Caption:=lisLazBuildWithStaticPackages; Caption:=lisLazBuildWithStaticPackages;
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
Visible:=false; Visible:=false;
{$ENDIF} {$ENDIF}
end; end;

View File

@ -32,7 +32,7 @@ unit CompReg;
{$MODE OBJFPC}{$H+} {$MODE OBJFPC}{$H+}
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
This unit will be deleted in future This unit will be deleted in future
{$ENDIF} {$ENDIF}

View File

@ -40,10 +40,10 @@ uses
{$ENDIF} {$ENDIF}
Classes, AbstractFormeditor, Controls, PropEdits, TypInfo, ObjectInspector, Classes, AbstractFormeditor, Controls, PropEdits, TypInfo, ObjectInspector,
Forms, Menus, JITForms, Forms, Menus, JITForms,
{$IFDEF EnablePkgs} {$IFDEF DisablePkgs}
ComponentReg,
{$ELSE}
CompReg, IDEComp, CompReg, IDEComp,
{$ELSE}
ComponentReg,
{$ENDIF} {$ENDIF}
ComponentEditors, KeyMapping, EditorOptions, Dialogs; ComponentEditors, KeyMapping, EditorOptions, Dialogs;
@ -623,7 +623,7 @@ begin
FComponentInterfaceList := TList.Create; FComponentInterfaceList := TList.Create;
FSelectedComponents := TComponentSelectionList.Create; FSelectedComponents := TComponentSelectionList.Create;
JITFormList := TJITForms.Create; JITFormList := TJITForms.Create;
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
JITFormList.RegCompList := RegCompList; JITFormList.RegCompList := RegCompList;
{$ENDIF} {$ENDIF}
JITFormList.OnReaderError:=@JITFormListReaderError; JITFormList.OnReaderError:=@JITFormListReaderError;

View File

@ -39,7 +39,7 @@ unit IDEComp;
{$linklib crypt} {$linklib crypt}
{$ENDIF} {$ENDIF}
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
{$error This unit will be deleted in future} {$error This unit will be deleted in future}
{$ENDIF} {$ENDIF}

View File

@ -44,10 +44,10 @@ uses
Controls, Graphics, ExtCtrls, Dialogs, FileCtrl, Forms, CodeToolManager, Controls, Graphics, ExtCtrls, Dialogs, FileCtrl, Forms, CodeToolManager,
CodeCache, AVL_Tree, SynEditKeyCmds, LazConf, LazarusIDEStrConsts, CodeCache, AVL_Tree, SynEditKeyCmds, LazConf, LazarusIDEStrConsts,
ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler, ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler,
{$IFDEF EnablePkgs} {$IFDEF DisablePkgs}
ComponentReg,
{$ELSE}
CompReg, IDEComp, CompReg, IDEComp,
{$ELSE}
ComponentReg,
{$ENDIF} {$ENDIF}
Splash, TransferMacros, ObjectInspector, PropEdits, Splash, TransferMacros, ObjectInspector, PropEdits,
OutputFilter, IDEDefs, MsgView, EnvironmentOpts, EditorOptions, OutputFilter, IDEDefs, MsgView, EnvironmentOpts, EditorOptions,
@ -1022,7 +1022,7 @@ begin
itmProjectInspector.Name:='itmProjectInspector'; itmProjectInspector.Name:='itmProjectInspector';
itmProjectInspector.Caption := lisMenuProjectInspector; itmProjectInspector.Caption := lisMenuProjectInspector;
itmProjectInspector.Graphic:=LoadPixmap('menu_projectinspector'); itmProjectInspector.Graphic:=LoadPixmap('menu_projectinspector');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuProject.Add(itmProjectInspector); mnuProject.Add(itmProjectInspector);
{$ENDIF} {$ENDIF}
@ -1127,7 +1127,7 @@ begin
itmPkgOpenPackage.Name:='itmPkgOpenPackage'; itmPkgOpenPackage.Name:='itmPkgOpenPackage';
itmPkgOpenPackage.Caption := lisMenuOpenPackage; itmPkgOpenPackage.Caption := lisMenuOpenPackage;
itmPkgOpenPackage.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenPackage.Graphic:=LoadPixmap('pkg_package');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenPackage); mnuComponents.Add(itmPkgOpenPackage);
{$ENDIF} {$ENDIF}
@ -1135,7 +1135,7 @@ begin
itmPkgOpenPackageFile.Name:='itmPkgOpenPackageFile'; itmPkgOpenPackageFile.Name:='itmPkgOpenPackageFile';
itmPkgOpenPackageFile.Caption := lisMenuOpenPackageFile; itmPkgOpenPackageFile.Caption := lisMenuOpenPackageFile;
itmPkgOpenPackageFile.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenPackageFile.Graphic:=LoadPixmap('pkg_package');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenPackageFile); mnuComponents.Add(itmPkgOpenPackageFile);
{$ENDIF} {$ENDIF}
@ -1143,11 +1143,11 @@ begin
itmPkgOpenRecent.Name:='itmPkgOpenRecent'; itmPkgOpenRecent.Name:='itmPkgOpenRecent';
itmPkgOpenRecent.Caption := lisMenuOpenRecentPkg; itmPkgOpenRecent.Caption := lisMenuOpenRecentPkg;
itmPkgOpenRecent.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenRecent.Graphic:=LoadPixmap('pkg_package');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenRecent); mnuComponents.Add(itmPkgOpenRecent);
{$ENDIF} {$ENDIF}
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF} {$ENDIF}
@ -1155,11 +1155,11 @@ begin
itmPkgAddCurUnitToPkg.Name:='itmPkgAddCurUnitToPkg'; itmPkgAddCurUnitToPkg.Name:='itmPkgAddCurUnitToPkg';
itmPkgAddCurUnitToPkg.Caption := lisMenuAddCurUnitToPkg; itmPkgAddCurUnitToPkg.Caption := lisMenuAddCurUnitToPkg;
itmPkgAddCurUnitToPkg.Graphic:=LoadPixmap('pkg_addunittopackage'); itmPkgAddCurUnitToPkg.Graphic:=LoadPixmap('pkg_addunittopackage');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgAddCurUnitToPkg); mnuComponents.Add(itmPkgAddCurUnitToPkg);
{$ENDIF} {$ENDIF}
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF} {$ENDIF}
@ -1167,11 +1167,11 @@ begin
itmPkgPkgGraph.Name:='itmPkgPkgGraph'; itmPkgPkgGraph.Name:='itmPkgPkgGraph';
itmPkgPkgGraph.Caption := lisMenuPackageGraph; itmPkgPkgGraph.Caption := lisMenuPackageGraph;
itmPkgPkgGraph.Graphic:=LoadPixmap('pkg_packagegraph'); itmPkgPkgGraph.Graphic:=LoadPixmap('pkg_packagegraph');
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgPkgGraph); mnuComponents.Add(itmPkgPkgGraph);
{$ENDIF} {$ENDIF}
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF} {$ENDIF}

View File

@ -558,7 +558,7 @@ begin
NewCategory.Add( NewCategory.Add(
TNewIDEItemTemplate.Create(niiCustomProject,'Custom Project',niifCopy,[])); TNewIDEItemTemplate.Create(niiCustomProject,'Custom Project',niifCopy,[]));
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
// category package // category package
NewCategory:=TNewIDEItemCategory.Create('Package'); NewCategory:=TNewIDEItemCategory.Create('Package');
Add(NewCategory); Add(NewCategory);

View File

@ -1393,7 +1393,7 @@ end;
procedure TPkgManager.UpdateVisibleComponentPalette; procedure TPkgManager.UpdateVisibleComponentPalette;
begin begin
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
TComponentPalette(IDEComponentPalette).NoteBook:=MainIDE.ComponentNotebook; TComponentPalette(IDEComponentPalette).NoteBook:=MainIDE.ComponentNotebook;
TComponentPalette(IDEComponentPalette).UpdateNoteBookButtons; TComponentPalette(IDEComponentPalette).UpdateNoteBookButtons;
{$ENDIF} {$ENDIF}
@ -1471,14 +1471,14 @@ begin
'$(LazarusDir)'+ds+'lcl' '$(LazarusDir)'+ds+'lcl'
+';'+ +';'+
'$(LazarusDir)'+ds+'lcl'+ds+'interfaces'+ds+'$(LCLWidgetType)'; '$(LazarusDir)'+ds+'lcl'+ds+'interfaces'+ds+'$(LCLWidgetType)';
{$IFDEF EnablePkgs} {$IFDEF DisablePkgs}
AddProjectLCLDependency(AProject);
{$ELSE}
// add lcl ppu dirs to unit search path // add lcl ppu dirs to unit search path
Project1.CompilerOptions.OtherUnitFiles:= Project1.CompilerOptions.OtherUnitFiles:=
'$(LazarusDir)'+ds+'lcl'+ds+'units' '$(LazarusDir)'+ds+'lcl'+ds+'units'
+';'+ +';'+
'$(LazarusDir)'+ds+'lcl'+ds+'units'+ds+'$(LCLWidgetType)'; '$(LazarusDir)'+ds+'lcl'+ds+'units'+ds+'$(LCLWidgetType)';
{$ELSE}
AddProjectLCLDependency(AProject);
{$ENDIF} {$ENDIF}
end; end;
@ -1491,7 +1491,7 @@ procedure TPkgManager.AddProjectDependency(AProject: TProject;
var var
NewDependency: TPkgDependency; NewDependency: TPkgDependency;
begin begin
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
exit; exit;
{$ENDIF} {$ENDIF}
// check if the dependency is already there // check if the dependency is already there
@ -1510,7 +1510,7 @@ procedure TPkgManager.AddProjectRegCompDependency(AProject: TProject;
var var
PkgFile: TPkgFile; PkgFile: TPkgFile;
begin begin
{$IFNDEF EnablePkgs} {$IFDEF DisablePkgs}
exit; exit;
{$ENDIF} {$ENDIF}
if not (ARegisteredComponent is TPkgComponent) then exit; if not (ARegisteredComponent is TPkgComponent) then exit;

View File

@ -208,7 +208,7 @@ end;
procedure TFrmComponentMan.FrmMainCREATE(Sender: TObject); procedure TFrmComponentMan.FrmMainCREATE(Sender: TObject);
begin begin
MyFile := TStringList.Create; MyFile := TStringList.Create;
{$IFDEF EnablePkgs} {$IFNDEF DisablePkgs}
Caption:='Custom Component Manager (No packages!)'; Caption:='Custom Component Manager (No packages!)';
Label1.Caption:='Installed Custom Components'; Label1.Caption:='Installed Custom Components';
{$ENDIF} {$ENDIF}