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

IDE, Setup: search debugger (gdb) according to path in gdbmidebugger class "ExePath()". Issue #0025997

Browse Source 
git-svn-id: trunk@44687 -
This commit is contained in:
martin 2014-04-11 20:54:06 +00:00
parent ba6b524a80
commit 105392507e
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ide/initialsetupdlgs.pas
View File

@ -42,11 +42,11 @@ unit InitialSetupDlgs;
interface
uses
Classes, SysUtils, strutils, contnrs, LCLProc, Forms, Controls, Buttons,
Dialogs, FileUtil, Laz2_XMLCfg, lazutf8classes, LazFileUtils, LazFileCache,
Graphics, ComCtrls, ExtCtrls, StdCtrls, DefineTemplates, CodeToolManager,
TransferMacros, MacroDefIntf, LazarusIDEStrConsts, LazConf, EnvironmentOpts,
IDEProcs, AboutFrm, IDETranslations;
Classes, SysUtils, strutils, contnrs, LCLProc, Forms, Controls, Buttons, Dialogs, FileUtil,
Laz2_XMLCfg, lazutf8classes, LazFileUtils, LazFileCache, Graphics, ComCtrls, ExtCtrls,
StdCtrls, DefineTemplates, CodeToolManager, TransferMacros, MacroDefIntf, GDBMIDebugger,
DbgIntfDebuggerBase, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs, AboutFrm,
IDETranslations;
type
TSDFilenameQuality = (
@ -260,6 +260,9 @@ function GetValueFromIDEConfig(OptionFilename, Path: string): string;
implementation
const
DefaultDebuggerClass: TDebuggerClass = TGDBMIDebugger;
type
{ TSetupMacros }
@ -954,7 +957,7 @@ const
DebuggerFileName='gdb'; //For Windows, .exe will be appended
var
OldDebuggerFilename: String;
AFilename: String;
s, AFilename: String;
Files: TStringList;
i: Integer;
begin
@ -975,19 +978,14 @@ begin
'EnvironmentOptions/DebuggerFilename/Value');
if CheckFile(AFilename,Result) then exit;
// The next 2 locations are locations used by older and newer versions of the Windows installers
// If other platform installers follow the same strategy, this can be useful.
// Chances of this are low (gdb is generally installed in the path on Unixy systems), but it can't hurt...
// and it can be useful for cross compiling/custom setups.
// Check locations proposed by debugger class
s := DefaultDebuggerClass.ExePaths;
while s <> '' do begin
AFilename := GetPart([], [';'], s);
if CheckFile(AFilename, Result) then exit;
if s <> '' then delete(s, 1, 1);
end;
// Check new installation location: $(LazarusDir)\mingw\$(TargetCPU)-$(TargetOS)\bin\gdb.exe
if CheckFile(SetDirSeparators('$(LazarusDir)/mingw/$(TargetCPU)-$(TargetOS)/bin/'+DebuggerFileName+GetExecutableExt),Result)
then exit;
// Older Lazarus installers did not use macros for their debuggers: there was only one debugger
// Check old installation location: $(LazarusDir)\mingw\bin\gdb.exe
if CheckFile(SetDirSeparators('$(LazarusDir)/mingw/bin/'+DebuggerFileName+GetExecutableExt),Result)
then exit;
// Windows-only locations:
if (GetDefaultSrcOSForTargetOS(GetCompiledTargetOS)='win') then begin