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

IDE: fixed abstract method

Browse Source 
git-svn-id: branches/fixes_2_0@59078 -
This commit is contained in:
mattias 2018-09-19 09:23:06 +00:00
parent bbe6d6932e
commit 5fe27864e1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/pseudoterminaldlg.pp
View File

@ -803,7 +803,7 @@ end { TPseudoConsoleDlg.Clear } ;
{$R *.lfm} {$R *.lfm}
initialization initialization
DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} ); //DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} );
DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} ); DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} );
PseudoTerminalDlgWindowCreator := IDEWindowCreators.Add(DebugDialogNames[ddtPseudoTerminal]); PseudoTerminalDlgWindowCreator := IDEWindowCreators.Add(DebugDialogNames[ddtPseudoTerminal]);

15
ide/buildmanager.pas
View File

@ -56,6 +56,7 @@ uses
ModeMatrixOpts, BaseBuildManager, ApplicationBundle, RunParamsOpts; ModeMatrixOpts, BaseBuildManager, ApplicationBundle, RunParamsOpts;
type type
{ TBuildManager } { TBuildManager }
TBuildManager = class(TBaseBuildManager) TBuildManager = class(TBaseBuildManager)
@ -198,6 +199,7 @@ type
function GetCompilerFilename: string; override; function GetCompilerFilename: string; override;
function GetFPCompilerFilename: string; override; function GetFPCompilerFilename: string; override;
function GetFPCFrontEndOptions: string; override; function GetFPCFrontEndOptions: string; override;
function GetProjectPublishDir: string; override;
function GetProjectTargetFilename(aProject: TProject): string; override; function GetProjectTargetFilename(aProject: TProject): string; override;
function GetProjectUsesAppBundle: Boolean; override; function GetProjectUsesAppBundle: Boolean; override;
function GetTestUnitFilename(AnUnitInfo: TUnitInfo): string; override; function GetTestUnitFilename(AnUnitInfo: TUnitInfo): string; override;
@ -697,6 +699,14 @@ begin
Result:=UTF8Trim(Result); Result:=UTF8Trim(Result);
end; end;
function TBuildManager.GetProjectPublishDir: string;
begin
if Project1<>nil then
Result:=RealPublishDir(Project1.PublishOptions)
else
Result:='';
end;
function TBuildManager.GetProjectTargetFilename(aProject: TProject): string; function TBuildManager.GetProjectTargetFilename(aProject: TProject): string;
var var
AMode: TRunParamsOptionsMode; AMode: TRunParamsOptionsMode;
@ -2220,10 +2230,7 @@ end;
function TBuildManager.MacroFuncProjPublishDir(const Param: string; function TBuildManager.MacroFuncProjPublishDir(const Param: string;
const Data: PtrInt; var Abort: boolean): string; const Data: PtrInt; var Abort: boolean): string;
begin begin
if Project1<>nil then Result:=GetProjectPublishDir;
Result:=RealPublishDir(Project1.PublishOptions)
else
Result:='';
end; end;
function TBuildManager.MacroFuncProjUnitPath(const Param: string; function TBuildManager.MacroFuncProjUnitPath(const Param: string;