From aa35683cf97a3a23998bc8ae3339733c63b24feb Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Fri, 7 Nov 2014 07:30:09 +0100 Subject: [PATCH] dcd integration: process can be located elsewhere if their path is known --- lazproj/coedit.lpi | 5 ----- src/ce_dcd.pas | 6 +++--- src/ce_synmemo.pas | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi index bf118728..9b4ffd24 100644 --- a/lazproj/coedit.lpi +++ b/lazproj/coedit.lpi @@ -52,11 +52,6 @@ - - - - - diff --git a/src/ce_dcd.pas b/src/ce_dcd.pas index 5b6e1ae7..958f7445 100644 --- a/src/ce_dcd.pas +++ b/src/ce_dcd.pas @@ -68,7 +68,7 @@ begin if DCD_server <> nil then FreeAndNil(DCD_server); DCD_server := TProcess.Create(nil); - DCD_server.Executable := extractFilePath(application.ExeName) + directorySeparator + 'dcd-server' + exeExt; + DCD_server.Executable := 'dcd-server' + exeExt; DCD_server.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; DCD_server.ShowWindow := swoHIDE; end; @@ -198,10 +198,10 @@ end; initialization createServer; DCD_client := TProcess.Create(nil); - DCD_client.Executable := extractFilePath(application.ExeName) + directorySeparator + 'dcd-client' + exeExt; + DCD_client.Executable := 'dcd-client' + exeExt; DCD_client.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; DCD_client.ShowWindow := swoHIDE; - dcdOn := fileExists(DCD_server.Executable) and fileExists(DCD_client.Executable); + dcdOn := exeInSysPath(DCD_server.Executable) and exeInSysPath(DCD_client.Executable); lines := TStringList.Create; finalization DCD_server.Active := false; diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas index bbfab415..64c2fd73 100644 --- a/src/ce_synmemo.pas +++ b/src/ce_synmemo.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, SynEdit, SynMemo, ce_d2syn, SynEditHighlighter, controls, lcltype, LazSynEditText, SynPluginSyncroEdit, SynEditKeyCmds, ce_project, - SynHighlighterLFM, SynEditMouseCmds, ce_common, ce_observer, menus; + SynHighlighterLFM, SynEditMouseCmds, ce_common, ce_observer; type TCESynMemo = class(TSynMemo)