forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, param currentDirectory for TProcess doesnt work under nix, added additional ChDir

This commit is contained in:
Basile Burg 2015-11-11 07:42:42 +01:00
parent 0055054c59
commit 6d3e29a869
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ce_main.pas
View File

@ -1712,6 +1712,7 @@ begin
else firstlineFlags:= '';
end else firstlineFlags:= '';
fRunProc := TCEProcess.Create(nil);
if redirect then
begin
@ -1768,7 +1769,7 @@ begin
begin
fMsgs.message(shortenPath(fDoc.fileName, 25) + ' successfully compiled',
fDoc, amcEdit, amkInf);
fRunProc.CurrentDirectory := extractFilePath(fRunProc.Executable);
fRunProc.CurrentDirectory := extractFileDir(fRunProc.Executable);
if runArgs <> '' then
begin
extraArgs.Clear;

25
src/ce_nativeproject.pas
View File

@ -30,6 +30,7 @@ type
fModified: boolean;
fRootFolder: string;
fBasePath: string;
fRunnerOldCwd: string;
fLibAliases: TStringList;
fConfigs: TCollection;
fSrcs, fSrcsCop: TStringList;
@ -123,6 +124,7 @@ constructor TCENativeProject.create(aOwner: TComponent);
begin
inherited create(aOwner);
//
fRunnerOldCwd := GetCurrentDir;
fProjectSubject := TCEProjectSubject.create;
//
fLibAliases := TStringList.Create;
@ -196,7 +198,7 @@ begin
else absSrc := expandFilenameEx(fBasePath, relsrc);
if SameFileName(aFilename, absSrc) then exit;
end;
relSrc := ExtractRelativepath(fBasePath, ExcludeLeadingPathDelimiter(aFilename));
relSrc := ExtractRelativePath(fBasePath, aFilename);
fSrcs.Add(relSrc);
end;
@ -676,7 +678,7 @@ function TCENativeProject.compile: Boolean;
var
config: TCompilerConfiguration;
compilproc: TProcess;
prjpath: string;
prjpath, oldCwd: string;
prjname: string;
msgs: ICEMessagesDisplay;
begin
@ -700,11 +702,14 @@ begin
if (Sources.Count = 0) and (config.pathsOptions.extraSources.Count = 0) then
exit;
//
prjpath := extractFilePath(fFileName);
oldCwd := GetCurrentDir;
ChDir(prjpath);
prjname := shortenPath(filename, 25);
compilproc := TProcess.Create(nil);
try
msgs.message('compiling ' + prjname, self as ICECommonProject, amcProj, amkInf);
prjpath := extractFilePath(fileName);
// this doesn't work under linux, so the previous ChDir.
if directoryExists(prjpath) then
compilproc.CurrentDirectory := prjpath;
compilproc.Executable := DCompiler;
@ -727,6 +732,7 @@ begin
finally
updateOutFilename;
compilproc.Free;
ChDir(oldCwd);
end;
end;
@ -734,9 +740,12 @@ function TCENativeProject.run(const runArgs: string = ''): Boolean;
var
prm: string;
i: Integer;
cwd: string;
begin
result := false;
killProcess(fRunner);
if DirectoryExists(fRunnerOldCwd) then
ChDir(fRunnerOldCwd);
//
fRunner := TCEProcess.Create(nil); // fRunner can use the input process widget.
currentConfiguration.runOptions.setProcess(fRunner);
@ -761,7 +770,12 @@ begin
//
fRunner.Executable := outputFilename;
if fRunner.CurrentDirectory = '' then
fRunner.CurrentDirectory := extractFilePath(fRunner.Executable);
begin
fRunnerOldCwd := GetCurrentDir;
cwd := extractFilePath(fRunner.Executable);
chDir(cwd);
fRunner.CurrentDirectory := cwd;
end;
if poUsePipes in fRunner.Options then begin
fRunner.OnReadData := @runProcOutput;
fRunner.OnTerminate := @runProcOutput;
@ -792,7 +806,10 @@ begin
end;
//
if not TProcess(sender).Active then
begin
getprocInputHandler.removeProcess(TProcess(sender));
ChDir(fRunnerOldCwd);
end;
end;
procedure TCENativeProject.compProcOutput(proc: TProcess);