From 1f4fcd682ec415fab052a52e715021a58120f71f Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sat, 3 Sep 2016 23:50:25 +0200 Subject: [PATCH] revert canges made in 36d06688c8fce51f50155c84d4f6b69f87cbd595 --- src/ce_dubproject.pas | 2 +- src/ce_libmaneditor.pas | 4 ++-- src/ce_main.pas | 8 ++++---- src/ce_nativeproject.pas | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ce_dubproject.pas b/src/ce_dubproject.pas index 3d4c3d9f..2aa448f5 100644 --- a/src/ce_dubproject.pas +++ b/src/ce_dubproject.pas @@ -567,7 +567,7 @@ begin dubProcOutput(proc); msgs := getMessageDisplay; prjname := shortenPath(filename); - fCompiled := fDubProc.ExitCode = 0; + fCompiled := fDubProc.ExitStatus = 0; if fCompiled then msgs.message(prjname + ' has been successfully compiled', self as ICECommonProject, amcProj, amkInf) diff --git a/src/ce_libmaneditor.pas b/src/ce_libmaneditor.pas index 3cde138d..f876650e 100644 --- a/src/ce_libmaneditor.pas +++ b/src/ce_libmaneditor.pas @@ -449,7 +449,7 @@ begin try processOutputToStrings(dub, str); while dub.Running do; - err := dub.ExitCode; + err := dub.ExitStatus; for msg in str do itf.message(msg, nil, amcMisc, amkAuto); finally @@ -500,7 +500,7 @@ begin try processOutputToStrings(dub, str); while dub.Running do ; - err := dub.ExitCode; + err := dub.ExitStatus; for msg in str do itf.message(msg, nil, amcMisc, amkAuto); finally diff --git a/src/ce_main.pas b/src/ce_main.pas index 1205439b..5cd067d2 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -2487,9 +2487,9 @@ begin inph := EntitiesConnector.getSingleService('ICEProcInputHandler'); if (inph <> nil) then (inph as ICEProcInputHandler).removeProcess(proc); - if (proc.ExitCode <> 0) then + if (proc.ExitStatus <> 0) then fMsgs.message(format('error: the process (%s) has returned the signal %d', - [proc.Executable, proc.ExitCode]), fDoc, amcEdit, amkErr); + [proc.Executable, proc.ExitStatus]), fDoc, amcEdit, amkErr); end; procedure TCEMainForm.actSetRunnableSwExecute(Sender: TObject); @@ -2632,7 +2632,7 @@ begin application.ProcessMessages; if not asObj then sysutils.DeleteFile(fname + objExt); - if (dmdProc.ExitCode = 0) then + if (dmdProc.ExitStatus = 0) then begin result := true; fMsgs.message(shortenPath(fDoc.fileName, 25) + ' successfully compiled', @@ -2640,7 +2640,7 @@ begin end else begin fMsgs.message(format('error: the process (%s) has returned the signal %d', - [dmdproc.Executable, dmdproc.ExitCode]), fDoc, amcEdit, amkErr); + [dmdproc.Executable, dmdproc.ExitStatus]), fDoc, amcEdit, amkErr); fMsgs.message(shortenPath(fDoc.fileName, 25) + ' has not been compiled', fDoc, amcEdit, amkErr); end; diff --git a/src/ce_nativeproject.pas b/src/ce_nativeproject.pas index 431105e5..34c6fe0d 100644 --- a/src/ce_nativeproject.pas +++ b/src/ce_nativeproject.pas @@ -670,7 +670,7 @@ begin processOutputToStrings(prc, lst); while prc.Running do sleep(1); - com := prc.ExitCode = 0; + com := prc.ExitStatus = 0; for j := 0 to lst.Count -1 do getMessageDisplay.message(lst[j], self as ICECommonProject, amcProj, amkAuto); finally @@ -705,7 +705,7 @@ begin if poUsePipes in prc.Options then runProcOutput(prc); finally - result := prc.ExitCode = 0; + result := prc.ExitStatus = 0; prc.Free; end; end; @@ -849,9 +849,9 @@ begin getprocInputHandler.removeProcess(TProcess(sender)); SetCurrentDirUTF8(fRunnerOldCwd); // - if (proc.ExitCode <> 0) then + if (proc.ExitStatus <> 0) then msgs.message(format('error: the process (%s) has returned the signal %d', - [proc.Executable, proc.ExitCode]), self as ICECommonProject, amcProj, amkErr); + [proc.Executable, proc.ExitStatus]), self as ICECommonProject, amcProj, amkErr); end; end; @@ -880,7 +880,7 @@ begin compProcOutput(proc); msgs := getMessageDisplay; prjname := shortenPath(filename); - fCompiled := fCompilProc.ExitCode = 0; + fCompiled := fCompilProc.ExitStatus = 0; updateOutFilename; if fCompiled then msgs.message(prjname + ' has been successfully compiled',