mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-12 11:56:45 +02:00
IDE, Debugger, Makefiles: moved some dependencies to remove IdeDebugger from LazBuild.
This commit is contained in:
parent
6c38c5a67a
commit
ca39078aca
3
Makefile
3
Makefile
@ -3720,6 +3720,8 @@ basecomponents:
|
|||||||
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase
|
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase
|
||||||
$(MAKE) -C components/lazdebuggergdbmi
|
$(MAKE) -C components/lazdebuggergdbmi
|
||||||
$(MAKE) -C components/lazcontrols/design
|
$(MAKE) -C components/lazcontrols/design
|
||||||
|
$(MAKE) -C components/lclextensions
|
||||||
|
$(MAKE) -C components/virtualtreeview
|
||||||
$(MAKE) -C ide/packages/idedebugger
|
$(MAKE) -C ide/packages/idedebugger
|
||||||
bigidecomponents:
|
bigidecomponents:
|
||||||
$(MAKE) -C components bigide
|
$(MAKE) -C components bigide
|
||||||
@ -3761,7 +3763,6 @@ lazbuild: registration lazutils
|
|||||||
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui
|
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
|
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui
|
$(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C ide/packages/idedebugger LCL_PLATFORM=nogui
|
|
||||||
$(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
|
$(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
|
||||||
lhelp:
|
lhelp:
|
||||||
$(MAKE) -C components/chmhelp/lhelp
|
$(MAKE) -C components/chmhelp/lhelp
|
||||||
|
@ -148,6 +148,8 @@ basecomponents:
|
|||||||
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase
|
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase
|
||||||
$(MAKE) -C components/lazdebuggergdbmi
|
$(MAKE) -C components/lazdebuggergdbmi
|
||||||
$(MAKE) -C components/lazcontrols/design
|
$(MAKE) -C components/lazcontrols/design
|
||||||
|
$(MAKE) -C components/lclextensions
|
||||||
|
$(MAKE) -C components/virtualtreeview
|
||||||
$(MAKE) -C ide/packages/idedebugger
|
$(MAKE) -C ide/packages/idedebugger
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
@ -221,7 +223,6 @@ lazbuild: registration lazutils
|
|||||||
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui
|
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
|
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui
|
$(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui
|
||||||
$(MAKE) -C ide/packages/idedebugger LCL_PLATFORM=nogui
|
|
||||||
$(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
|
$(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
@ -52,7 +52,7 @@ uses
|
|||||||
DbgIntfDebuggerBase,
|
DbgIntfDebuggerBase,
|
||||||
// IDE
|
// IDE
|
||||||
IDEProcs, DialogProcs, LazarusIDEStrConsts, IDETranslations, LazConf,
|
IDEProcs, DialogProcs, LazarusIDEStrConsts, IDETranslations, LazConf,
|
||||||
IDEOptionDefs, TransferMacros, ModeMatrixOpts, Debugger,
|
IDEOptionDefs, TransferMacros, ModeMatrixOpts,
|
||||||
IdeCoolbarData, EditorToolbarStatic;
|
IdeCoolbarData, EditorToolbarStatic;
|
||||||
|
|
||||||
const
|
const
|
||||||
@ -123,6 +123,63 @@ type
|
|||||||
Background: TColor;
|
Background: TColor;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
{ TDebuggerConfigStore }
|
||||||
|
(* TODO: maybe revert relations. Create this in Debugger, and call environmentoptions for the configstore only? *)
|
||||||
|
|
||||||
|
{ TDebuggerConfigStoreBase }
|
||||||
|
|
||||||
|
TDebuggerConfigStoreBase = class(TPersistent)
|
||||||
|
private
|
||||||
|
FConfigStore: TConfigStorage;
|
||||||
|
public
|
||||||
|
property ConfigStore: TConfigStorage read FConfigStore write FConfigStore;
|
||||||
|
procedure Init; virtual;
|
||||||
|
procedure Load; virtual;
|
||||||
|
procedure Save; virtual;
|
||||||
|
end;
|
||||||
|
|
||||||
|
//{ TDebuggerWatchesDlgConfig }
|
||||||
|
//
|
||||||
|
//TDebuggerWatchesDlgConfig = class(TDebuggerConfigStoreBase)
|
||||||
|
//private
|
||||||
|
// FColumnNameWidth: Integer;
|
||||||
|
// FColumnValueWidth: Integer;
|
||||||
|
//public
|
||||||
|
// constructor Create;
|
||||||
|
// procedure Init; override;
|
||||||
|
//published
|
||||||
|
// property ColumnNameWidth: Integer read FColumnNameWidth write FColumnNameWidth;
|
||||||
|
// property ColumnValueWidth: Integer read FColumnValueWidth write FColumnValueWidth;
|
||||||
|
//end;
|
||||||
|
|
||||||
|
{ TDebuggerCallStackDlgConfig }
|
||||||
|
|
||||||
|
TDebuggerCallStackDlgConfig = class(TDebuggerConfigStoreBase)
|
||||||
|
private
|
||||||
|
FViewCount: Integer;
|
||||||
|
public
|
||||||
|
constructor Create;
|
||||||
|
procedure Init; override;
|
||||||
|
published
|
||||||
|
property ViewCount: Integer read FViewCount write FViewCount;
|
||||||
|
end;
|
||||||
|
|
||||||
|
TDebuggerConfigStore = class(TDebuggerConfigStoreBase)
|
||||||
|
private
|
||||||
|
FDlgCallStackConfig: TDebuggerCallStackDlgConfig;
|
||||||
|
//FTDebuggerWatchesDlgConfig: TDebuggerWatchesDlgConfig;
|
||||||
|
public
|
||||||
|
procedure Load; override;
|
||||||
|
procedure Save; override;
|
||||||
|
public
|
||||||
|
constructor Create;
|
||||||
|
destructor Destroy; override;
|
||||||
|
//property DlgWatchesConfig: TDebuggerWatchesDlgConfig read FTDebuggerWatchesDlgConfig;
|
||||||
|
property DlgCallStackConfig: TDebuggerCallStackDlgConfig read FDlgCallStackConfig write FDlgCallStackConfig;
|
||||||
|
published
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
const
|
const
|
||||||
DebuggerDefaultColors: array[TDBGEventType] of TDebuggerEventLogColor = (
|
DebuggerDefaultColors: array[TDBGEventType] of TDebuggerEventLogColor = (
|
||||||
{ etDefault } (Foreground: clWindowText; Background: clWindow),
|
{ etDefault } (Foreground: clWindowText; Background: clWindow),
|
||||||
@ -1205,6 +1262,103 @@ begin
|
|||||||
WriteStr(Result, u);
|
WriteStr(Result, u);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
{ TDebuggerConfigStoreBase }
|
||||||
|
|
||||||
|
procedure TDebuggerConfigStoreBase.Init;
|
||||||
|
begin
|
||||||
|
//
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TDebuggerConfigStoreBase.Load;
|
||||||
|
begin
|
||||||
|
Init;
|
||||||
|
ConfigStore.ReadObject('', self);
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TDebuggerConfigStoreBase.Save;
|
||||||
|
begin
|
||||||
|
ConfigStore.WriteObject('', self);
|
||||||
|
end;
|
||||||
|
|
||||||
|
//{ TDebuggerWatchesDlgConfig }
|
||||||
|
//
|
||||||
|
//constructor TDebuggerWatchesDlgConfig.Create;
|
||||||
|
//begin
|
||||||
|
// Init;
|
||||||
|
//end;
|
||||||
|
//
|
||||||
|
//procedure TDebuggerWatchesDlgConfig.Init;
|
||||||
|
//begin
|
||||||
|
// FColumnNameWidth := -1;
|
||||||
|
// FColumnValueWidth := -1;
|
||||||
|
//end;
|
||||||
|
|
||||||
|
{ TDebuggerCallStackDlgConfig }
|
||||||
|
|
||||||
|
constructor TDebuggerCallStackDlgConfig.Create;
|
||||||
|
begin
|
||||||
|
Init;
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TDebuggerCallStackDlgConfig.Init;
|
||||||
|
begin
|
||||||
|
inherited Init;
|
||||||
|
end;
|
||||||
|
|
||||||
|
{ TDebuggerConfigStore }
|
||||||
|
|
||||||
|
procedure TDebuggerConfigStore.Load;
|
||||||
|
begin
|
||||||
|
inherited;
|
||||||
|
//ConfigStore.AppendBasePath('WatchesDlg/');
|
||||||
|
//try
|
||||||
|
// FTDebuggerWatchesDlgConfig.ConfigStore := ConfigStore;
|
||||||
|
// FTDebuggerWatchesDlgConfig.Load;
|
||||||
|
//finally
|
||||||
|
// ConfigStore.UndoAppendBasePath;
|
||||||
|
//end;
|
||||||
|
ConfigStore.AppendBasePath('CallStackDlg/');
|
||||||
|
try
|
||||||
|
FDlgCallStackConfig.ConfigStore := ConfigStore;
|
||||||
|
FDlgCallStackConfig.Load;
|
||||||
|
finally
|
||||||
|
ConfigStore.UndoAppendBasePath;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TDebuggerConfigStore.Save;
|
||||||
|
begin
|
||||||
|
inherited;
|
||||||
|
ConfigStore.DeletePath('Type');
|
||||||
|
//ConfigStore.AppendBasePath('WatchesDlg/');
|
||||||
|
//try
|
||||||
|
// FTDebuggerWatchesDlgConfig.ConfigStore := ConfigStore;
|
||||||
|
// FTDebuggerWatchesDlgConfig.Save;
|
||||||
|
//finally
|
||||||
|
// ConfigStore.UndoAppendBasePath;
|
||||||
|
//end;
|
||||||
|
ConfigStore.AppendBasePath('CallStackDlg/');
|
||||||
|
try
|
||||||
|
FDlgCallStackConfig.ConfigStore := ConfigStore;
|
||||||
|
FDlgCallStackConfig.Save;
|
||||||
|
finally
|
||||||
|
ConfigStore.UndoAppendBasePath;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
constructor TDebuggerConfigStore.Create;
|
||||||
|
begin
|
||||||
|
//FTDebuggerWatchesDlgConfig := TDebuggerWatchesDlgConfig.Create;
|
||||||
|
FDlgCallStackConfig := TDebuggerCallStackDlgConfig.Create;
|
||||||
|
end;
|
||||||
|
|
||||||
|
destructor TDebuggerConfigStore.Destroy;
|
||||||
|
begin
|
||||||
|
inherited Destroy;
|
||||||
|
//FreeAndNil(FTDebuggerWatchesDlgConfig);
|
||||||
|
FreeAndNil(FDlgCallStackConfig);
|
||||||
|
end;
|
||||||
|
|
||||||
{ TDebuggerPropertiesConfigList }
|
{ TDebuggerPropertiesConfigList }
|
||||||
|
|
||||||
function TDebuggerPropertiesConfigList.GetOpt(Index: Integer): TDebuggerPropertiesConfig;
|
function TDebuggerPropertiesConfigList.GetOpt(Index: Integer): TDebuggerPropertiesConfig;
|
||||||
|
@ -41,7 +41,8 @@ uses
|
|||||||
TypInfo, Classes, SysUtils, math,
|
TypInfo, Classes, SysUtils, math,
|
||||||
// LazUtils
|
// LazUtils
|
||||||
Laz2_XMLCfg, LazFileUtils, LazStringUtils, LazUtilities, LazLoggerBase,
|
Laz2_XMLCfg, LazFileUtils, LazStringUtils, LazUtilities, LazLoggerBase,
|
||||||
LazConfigStorage, LazClasses, Maps,
|
//LazConfigStorage,
|
||||||
|
LazClasses, Maps,
|
||||||
// DebuggerIntf
|
// DebuggerIntf
|
||||||
DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase,
|
DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase,
|
||||||
LazDebuggerIntf, IdeDebuggerBase;
|
LazDebuggerIntf, IdeDebuggerBase;
|
||||||
@ -54,63 +55,6 @@ const
|
|||||||
|
|
||||||
type
|
type
|
||||||
|
|
||||||
{ TDebuggerConfigStore }
|
|
||||||
(* TODO: maybe revert relations. Create this in Debugger, and call environmentoptions for the configstore only? *)
|
|
||||||
|
|
||||||
{ TDebuggerConfigStoreBase }
|
|
||||||
|
|
||||||
TDebuggerConfigStoreBase = class(TPersistent)
|
|
||||||
private
|
|
||||||
FConfigStore: TConfigStorage;
|
|
||||||
public
|
|
||||||
property ConfigStore: TConfigStorage read FConfigStore write FConfigStore;
|
|
||||||
procedure Init; virtual;
|
|
||||||
procedure Load; virtual;
|
|
||||||
procedure Save; virtual;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDebuggerWatchesDlgConfig }
|
|
||||||
|
|
||||||
TDebuggerWatchesDlgConfig = class(TDebuggerConfigStoreBase)
|
|
||||||
private
|
|
||||||
FColumnNameWidth: Integer;
|
|
||||||
FColumnValueWidth: Integer;
|
|
||||||
public
|
|
||||||
constructor Create;
|
|
||||||
procedure Init; override;
|
|
||||||
published
|
|
||||||
property ColumnNameWidth: Integer read FColumnNameWidth write FColumnNameWidth;
|
|
||||||
property ColumnValueWidth: Integer read FColumnValueWidth write FColumnValueWidth;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDebuggerWatchesDlgConfig }
|
|
||||||
|
|
||||||
TDebuggerCallStackDlgConfig = class(TDebuggerConfigStoreBase)
|
|
||||||
private
|
|
||||||
FViewCount: Integer;
|
|
||||||
public
|
|
||||||
constructor Create;
|
|
||||||
procedure Init; override;
|
|
||||||
published
|
|
||||||
property ViewCount: Integer read FViewCount write FViewCount;
|
|
||||||
end;
|
|
||||||
|
|
||||||
TDebuggerConfigStore = class(TDebuggerConfigStoreBase)
|
|
||||||
private
|
|
||||||
FDlgCallStackConfig: TDebuggerCallStackDlgConfig;
|
|
||||||
FTDebuggerWatchesDlgConfig: TDebuggerWatchesDlgConfig;
|
|
||||||
public
|
|
||||||
procedure Load; override;
|
|
||||||
procedure Save; override;
|
|
||||||
public
|
|
||||||
constructor Create;
|
|
||||||
destructor Destroy; override;
|
|
||||||
property DlgWatchesConfig: TDebuggerWatchesDlgConfig read FTDebuggerWatchesDlgConfig;
|
|
||||||
property DlgCallStackConfig: TDebuggerCallStackDlgConfig read FDlgCallStackConfig write FDlgCallStackConfig;
|
|
||||||
published
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
TDebuggerLocationType = (dltUnknown, // not jet looked up
|
TDebuggerLocationType = (dltUnknown, // not jet looked up
|
||||||
dltUnresolvable, // lookup failed
|
dltUnresolvable, // lookup failed
|
||||||
dltProject,
|
dltProject,
|
||||||
@ -1861,18 +1805,6 @@ begin
|
|||||||
Result:=bpaStop;
|
Result:=bpaStop;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{ TDebuggerCallStackDlgConfig }
|
|
||||||
|
|
||||||
constructor TDebuggerCallStackDlgConfig.Create;
|
|
||||||
begin
|
|
||||||
Init;
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TDebuggerCallStackDlgConfig.Init;
|
|
||||||
begin
|
|
||||||
inherited Init;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TIdeThreadFrameEntry }
|
{ TIdeThreadFrameEntry }
|
||||||
|
|
||||||
function TIdeThreadFrameEntry.GetUnitInfoProvider: TDebuggerUnitInfoProvider;
|
function TIdeThreadFrameEntry.GetUnitInfoProvider: TDebuggerUnitInfoProvider;
|
||||||
@ -1951,91 +1883,6 @@ begin
|
|||||||
Result := FList.Count;
|
Result := FList.Count;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{ TDebuggerWatchesDlgConfig }
|
|
||||||
|
|
||||||
constructor TDebuggerWatchesDlgConfig.Create;
|
|
||||||
begin
|
|
||||||
Init;
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TDebuggerWatchesDlgConfig.Init;
|
|
||||||
begin
|
|
||||||
FColumnNameWidth := -1;
|
|
||||||
FColumnValueWidth := -1;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDebuggerConfigStoreBase }
|
|
||||||
|
|
||||||
procedure TDebuggerConfigStoreBase.Init;
|
|
||||||
begin
|
|
||||||
//
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TDebuggerConfigStoreBase.Load;
|
|
||||||
begin
|
|
||||||
Init;
|
|
||||||
ConfigStore.ReadObject('', self);
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TDebuggerConfigStoreBase.Save;
|
|
||||||
begin
|
|
||||||
ConfigStore.WriteObject('', self);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDebuggerConfigStore }
|
|
||||||
|
|
||||||
procedure TDebuggerConfigStore.Load;
|
|
||||||
begin
|
|
||||||
inherited;
|
|
||||||
ConfigStore.AppendBasePath('WatchesDlg/');
|
|
||||||
try
|
|
||||||
FTDebuggerWatchesDlgConfig.ConfigStore := ConfigStore;
|
|
||||||
FTDebuggerWatchesDlgConfig.Load;
|
|
||||||
finally
|
|
||||||
ConfigStore.UndoAppendBasePath;
|
|
||||||
end;
|
|
||||||
ConfigStore.AppendBasePath('CallStackDlg/');
|
|
||||||
try
|
|
||||||
FDlgCallStackConfig.ConfigStore := ConfigStore;
|
|
||||||
FDlgCallStackConfig.Load;
|
|
||||||
finally
|
|
||||||
ConfigStore.UndoAppendBasePath;
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TDebuggerConfigStore.Save;
|
|
||||||
begin
|
|
||||||
inherited;
|
|
||||||
ConfigStore.DeletePath('Type');
|
|
||||||
ConfigStore.AppendBasePath('WatchesDlg/');
|
|
||||||
try
|
|
||||||
FTDebuggerWatchesDlgConfig.ConfigStore := ConfigStore;
|
|
||||||
FTDebuggerWatchesDlgConfig.Save;
|
|
||||||
finally
|
|
||||||
ConfigStore.UndoAppendBasePath;
|
|
||||||
end;
|
|
||||||
ConfigStore.AppendBasePath('CallStackDlg/');
|
|
||||||
try
|
|
||||||
FDlgCallStackConfig.ConfigStore := ConfigStore;
|
|
||||||
FDlgCallStackConfig.Save;
|
|
||||||
finally
|
|
||||||
ConfigStore.UndoAppendBasePath;
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
constructor TDebuggerConfigStore.Create;
|
|
||||||
begin
|
|
||||||
FTDebuggerWatchesDlgConfig := TDebuggerWatchesDlgConfig.Create;
|
|
||||||
FDlgCallStackConfig := TDebuggerCallStackDlgConfig.Create;
|
|
||||||
end;
|
|
||||||
|
|
||||||
destructor TDebuggerConfigStore.Destroy;
|
|
||||||
begin
|
|
||||||
inherited Destroy;
|
|
||||||
FreeAndNil(FTDebuggerWatchesDlgConfig);
|
|
||||||
FreeAndNil(FDlgCallStackConfig);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDebuggerUnitInfoProvider }
|
{ TDebuggerUnitInfoProvider }
|
||||||
|
|
||||||
function TDebuggerUnitInfoProvider.GetInfo(Index: Integer): TDebuggerUnitInfo;
|
function TDebuggerUnitInfoProvider.GetInfo(Index: Integer): TDebuggerUnitInfo;
|
||||||
|
Loading…
Reference in New Issue
Block a user