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

partially reverted changes made in 4caebcfa57, filename can be set on tempfilename

This commit is contained in:
Basile Burg 2015-01-04 05:18:21 +01:00
parent 1ecb859698
commit f69949b882
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ce_main.pas
View File

@ -1302,7 +1302,7 @@ procedure TCEMainForm.compileAndRunFile(const edIndex: NativeInt; const runArgs:
var var
editor: TCESynMemo; editor: TCESynMemo;
dmdproc: TProcess; dmdproc: TProcess;
fname, fBasename: string; fname: string;
begin begin
FreeRunnableProc; FreeRunnableProc;
@ -1320,14 +1320,9 @@ begin
subjLmFromString(fLogMessager, 'compiling ' + shortenPath(editor.fileName, 25), subjLmFromString(fLogMessager, 'compiling ' + shortenPath(editor.fileName, 25),
editor, amcEdit, amkInf); editor, amcEdit, amkInf);
if fileExists(editor.fileName) then begin if fileExists(editor.fileName) then editor.save
editor.save; else editor.saveTempFile;
fname := editor.fileName; fname := stripFileExt(editor.fileName);
end else begin
editor.saveTempFile;
fname := editor.tempFilename;
end;
fBasename := stripFileExt(fname);
if fRunnableSw = '' then if fRunnableSw = '' then
fRunnableSw := '-vcolumns'#13'-w'#13'-wi'; fRunnableSw := '-vcolumns'#13'-w'#13'-wi';
@ -1336,9 +1331,9 @@ begin
{$ENDIF} {$ENDIF}
dmdproc.Options := [poStdErrToOutput, poUsePipes]; dmdproc.Options := [poStdErrToOutput, poUsePipes];
dmdproc.Executable := DCompiler; dmdproc.Executable := DCompiler;
dmdproc.Parameters.Add(fname); dmdproc.Parameters.Add(editor.fileName);
dmdproc.Parameters.AddText(fRunnableSw); dmdproc.Parameters.AddText(fRunnableSw);
dmdproc.Parameters.Add('-of' + fBasename + exeExt); dmdproc.Parameters.Add('-of' + fname + exeExt);
LibMan.getLibFiles(nil, dmdproc.Parameters); LibMan.getLibFiles(nil, dmdproc.Parameters);
LibMan.getLibSources(nil, dmdproc.Parameters); LibMan.getLibSources(nil, dmdproc.Parameters);
dmdproc.Execute; dmdproc.Execute;
@ -1352,10 +1347,10 @@ begin
fRunProc.CurrentDirectory := extractFilePath(fRunProc.Executable); fRunProc.CurrentDirectory := extractFilePath(fRunProc.Executable);
if runArgs <> '' then if runArgs <> '' then
fRunProc.Parameters.DelimitedText := symbolExpander.get(runArgs); fRunProc.Parameters.DelimitedText := symbolExpander.get(runArgs);
fRunProc.Executable := fBasename + exeExt; fRunProc.Executable := fname + exeExt;
fPrInpWidg.process := fRunProc; fPrInpWidg.process := fRunProc;
fRunProc.Execute; fRunProc.Execute;
sysutils.DeleteFile(fBasename + objExt); sysutils.DeleteFile(fname + objExt);
end end
else begin else begin
subjLmFromString(fLogMessager, shortenPath(editor.fileName,25) subjLmFromString(fLogMessager, shortenPath(editor.fileName,25)

6
src/ce_staticexplorer.pas
View File

@ -407,10 +407,10 @@ begin
// focused source // focused source
fJsonFname := fDoc.tempFilename + '.json'; fJsonFname := fDoc.tempFilename + '.json';
srcFname := fDoc.fileName; srcFname := fDoc.fileName;
if not fileExists(srcFname) then begin if not fileExists(srcFname) or (srcFname = fDoc.tempFilename) then
srcFname := fDoc.tempFilename;
fDoc.saveTempFile; fDoc.saveTempFile;
end; srcFname := fDoc.fileName;
//else fDoc.save; refreshonChange/autorefresh don't work until existing doc is saved //else fDoc.save; refreshonChange/autorefresh don't work until existing doc is saved
fDmdProc.Parameters.Add(srcFname); fDmdProc.Parameters.Add(srcFname);

2
src/ce_synmemo.pas
View File

@ -445,7 +445,7 @@ end;
procedure TCESynMemo.saveTempFile; procedure TCESynMemo.saveTempFile;
begin begin
Lines.SaveToFile(fTempFileName); saveToFile(fTempFileName);
fModified := false; fModified := false;
end; end;