diff --git a/components/debuggerintf/dbgintfdebuggerbase.pp b/components/debuggerintf/dbgintfdebuggerbase.pp index bcedde5269..4789ebdd94 100644 --- a/components/debuggerintf/dbgintfdebuggerbase.pp +++ b/components/debuggerintf/dbgintfdebuggerbase.pp @@ -1875,6 +1875,10 @@ type procedure DoBackendConverterChanged; virtual; abstract; end; +(* RegisterDebugger + Should be run in the initialization section of one of the units of the package. + The PackageManager's call to "Register()" (as part of RegisterPackage / RegisterUnit is to late. +*) procedure RegisterDebugger(const ADebuggerClass: TDebuggerClass); function MinDbgPtr(a, b: TDBGPtr): TDBGPtr;inline; overload; diff --git a/components/lazdebuggergdbmi/gdbmidebugger.pp b/components/lazdebuggergdbmi/gdbmidebugger.pp index 0a8755e980..7417f0e10d 100644 --- a/components/lazdebuggergdbmi/gdbmidebugger.pp +++ b/components/lazdebuggergdbmi/gdbmidebugger.pp @@ -14827,10 +14827,12 @@ end; procedure Register; begin - RegisterDebugger(TGDBMIDebugger); + //RegisterDebugger(TGDBMIDebugger); end; initialization + RegisterDebugger(TGDBMIDebugger); + DBGMI_QUEUE_DEBUG := DebugLogger.RegisterLogGroup('DBGMI_QUEUE_DEBUG' {$IFDEF DBGMI_QUEUE_DEBUG} , True {$ENDIF} ); DBGMI_STRUCT_PARSER := DebugLogger.RegisterLogGroup('DBGMI_STRUCT_PARSER' {$IFDEF DBGMI_STRUCT_PARSER} , True {$ENDIF} ); DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); diff --git a/components/lazdebuggergdbmi/gdbmiserverdebugger.pas b/components/lazdebuggergdbmi/gdbmiserverdebugger.pas index 5a4c2c5908..52b9a156a4 100644 --- a/components/lazdebuggergdbmi/gdbmiserverdebugger.pas +++ b/components/lazdebuggergdbmi/gdbmiserverdebugger.pas @@ -478,9 +478,12 @@ end; procedure Register; begin - RegisterDebugger(TGDBMIServerDebugger); + //RegisterDebugger(TGDBMIServerDebugger); end; +initialization + RegisterDebugger(TGDBMIServerDebugger); + end. diff --git a/components/lazdebuggergdbmi/sshgdbmidebugger.pas b/components/lazdebuggergdbmi/sshgdbmidebugger.pas index 47ecada622..3f14cbe209 100644 --- a/components/lazdebuggergdbmi/sshgdbmidebugger.pas +++ b/components/lazdebuggergdbmi/sshgdbmidebugger.pas @@ -361,9 +361,12 @@ end; procedure Register; begin RegisterPropertyEditor(TypeInfo(String), TSSHGDBMIDebuggerProperties, 'Note', TSSHGDBMINotePropertyEditor); - RegisterDebugger(TSSHGDBMIDebugger); + //RegisterDebugger(TSSHGDBMIDebugger); end; +initialization + RegisterDebugger(TSSHGDBMIDebugger); + end. diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas index c1fad180f5..52ab790df5 100644 --- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas +++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas @@ -646,7 +646,7 @@ type procedure Register; begin - RegisterDebugger(TFpDebugDebugger); + //RegisterDebugger(TFpDebugDebugger); end; { TFpDebugExceptionStepping.TFrameList } @@ -4625,6 +4625,8 @@ begin end; initialization + RegisterDebugger(TFpDebugDebugger); + DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} ); DBG_BREAKPOINTS := DebugLogger.FindOrRegisterLogGroup('DBG_BREAKPOINTS' {$IFDEF DBG_BREAKPOINTS} , True {$ENDIF} ); diff --git a/components/lazdebuggers/lazdebuggerfpdserver/fpdserverdebugger.pas b/components/lazdebuggers/lazdebuggerfpdserver/fpdserverdebugger.pas index 7a4c02eff2..1d5d4f7632 100644 --- a/components/lazdebuggers/lazdebuggerfpdserver/fpdserverdebugger.pas +++ b/components/lazdebuggers/lazdebuggerfpdserver/fpdserverdebugger.pas @@ -414,7 +414,7 @@ type procedure Register; begin - RegisterDebugger(TFPDServerDebugger); + //RegisterDebugger(TFPDServerDebugger); end; { TFPDSendCommand } @@ -1542,5 +1542,8 @@ begin SetState(dsStop); end; +initialization + RegisterDebugger(TFPDServerDebugger); + end. diff --git a/components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp b/components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp index f6ad26e43f..a85174359a 100644 --- a/components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp +++ b/components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp @@ -1209,7 +1209,7 @@ end; procedure Register; begin - RegisterDebugger(TFpGDBMIDebugger); + //RegisterDebugger(TFpGDBMIDebugger); MenuCmd := RegisterIDEMenuCommand(itmRunDebugging, 'fpGdbmiToggleGDB', fpgdbmiDisplayGDBInsteadOfFpDebugWatches, nil, @@ -1220,6 +1220,8 @@ begin end; initialization + RegisterDebugger(TFpGDBMIDebugger); + DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); DBG_ERRORS := DebugLogger.FindOrRegisterLogGroup('DBG_ERRORS' {$IFDEF DBG_ERRORS} , True {$ENDIF} ); end. diff --git a/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas b/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas index 9718d58439..58c653870a 100644 --- a/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas +++ b/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas @@ -1734,10 +1734,12 @@ end; procedure Register; begin - RegisterDebugger(TFpLldbDebugger); + //RegisterDebugger(TFpLldbDebugger); end; initialization + RegisterDebugger(TFpLldbDebugger); + DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); DBG_ERRORS := DebugLogger.FindOrRegisterLogGroup('DBG_ERRORS' {$IFDEF DBG_ERRORS} , True {$ENDIF} ); end. diff --git a/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas b/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas index 5a21c2ce7f..d07fe85da7 100644 --- a/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas +++ b/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas @@ -217,8 +217,11 @@ end; procedure Register; begin - RegisterDebugger(TFpRspRemoteDebugger); + //RegisterDebugger(TFpRspRemoteDebugger); end; +initialization + RegisterDebugger(TFpRspRemoteDebugger); + end. diff --git a/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas b/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas index b16c2ba741..79387a88e2 100644 --- a/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas +++ b/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas @@ -3154,10 +3154,12 @@ end; procedure Register; begin - RegisterDebugger(TLldbDebugger); + //RegisterDebugger(TLldbDebugger); end; initialization + RegisterDebugger(TLldbDebugger); + DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); end. diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index a9e258a5fa..bc594c8420 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -1472,7 +1472,7 @@ begin fLastParsedMakeExe:='. .'; UpdateMakeExeNote; - RegisterDebugger(TGDBMIDebugger); // make sure we can read the config + //RegisterDebugger(TGDBMIDebugger); // make sure we can read the config FSkipDebugger := DebuggerOptions.HasActiveDebuggerEntry // There is a configured entry. Assume it is right, unless we can prove it is incorrect and not ( (DebuggerOptions.CurrentDebuggerPropertiesConfig <> nil) and // The ACTIVE dbg is a known debugger diff --git a/ide/main.pp b/ide/main.pp index 2421ee9e0a..94800806dd 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -1471,7 +1471,7 @@ begin // check debugger // PackageBoss is not yet loaded... - RegisterDebugger(TGDBMIDebugger); // make sure we can read the config + //RegisterDebugger(TGDBMIDebugger); // make sure we can read the config if (not ShowSetupDialog) and (not SkipAllTests) and (not GetSkipCheck(skcDebugger))