diff --git a/debugger/pseudoterminaldlg.pp b/debugger/pseudoterminaldlg.pp index 666089d852..634c298b6c 100644 --- a/debugger/pseudoterminaldlg.pp +++ b/debugger/pseudoterminaldlg.pp @@ -803,7 +803,7 @@ end { TPseudoConsoleDlg.Clear } ; {$R *.lfm} 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} ); PseudoTerminalDlgWindowCreator := IDEWindowCreators.Add(DebugDialogNames[ddtPseudoTerminal]); diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index 30a09b029b..03757da760 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -56,6 +56,7 @@ uses ModeMatrixOpts, BaseBuildManager, ApplicationBundle, RunParamsOpts; type + { TBuildManager } TBuildManager = class(TBaseBuildManager) @@ -198,6 +199,7 @@ type function GetCompilerFilename: string; override; function GetFPCompilerFilename: string; override; function GetFPCFrontEndOptions: string; override; + function GetProjectPublishDir: string; override; function GetProjectTargetFilename(aProject: TProject): string; override; function GetProjectUsesAppBundle: Boolean; override; function GetTestUnitFilename(AnUnitInfo: TUnitInfo): string; override; @@ -697,6 +699,14 @@ begin Result:=UTF8Trim(Result); end; +function TBuildManager.GetProjectPublishDir: string; +begin + if Project1<>nil then + Result:=RealPublishDir(Project1.PublishOptions) + else + Result:=''; +end; + function TBuildManager.GetProjectTargetFilename(aProject: TProject): string; var AMode: TRunParamsOptionsMode; @@ -2220,10 +2230,7 @@ end; function TBuildManager.MacroFuncProjPublishDir(const Param: string; const Data: PtrInt; var Abort: boolean): string; begin - if Project1<>nil then - Result:=RealPublishDir(Project1.PublishOptions) - else - Result:=''; + Result:=GetProjectPublishDir; end; function TBuildManager.MacroFuncProjUnitPath(const Param: string;