mirror of https://gitlab.com/basile.b/dexed.git
project, async comp, small fixes to common proj interface
This commit is contained in:
parent
f0fd280c6d
commit
bad7f96dcb
|
@ -45,7 +45,7 @@ type
|
||||||
procedure dubProcOutput(proc: TObject);
|
procedure dubProcOutput(proc: TObject);
|
||||||
procedure dubProcTerminated(proc: TObject);
|
procedure dubProcTerminated(proc: TObject);
|
||||||
function getCurrentCustomConfig: TJSONObject;
|
function getCurrentCustomConfig: TJSONObject;
|
||||||
function compileOrRun(run: boolean; const runArgs: string = ''): boolean;
|
procedure compileOrRun(run: boolean; const runArgs: string = '');
|
||||||
public
|
public
|
||||||
constructor create(aOwner: TComponent); override;
|
constructor create(aOwner: TComponent); override;
|
||||||
destructor destroy; override;
|
destructor destroy; override;
|
||||||
|
@ -79,7 +79,7 @@ type
|
||||||
//
|
//
|
||||||
procedure compile;
|
procedure compile;
|
||||||
function compiled: boolean;
|
function compiled: boolean;
|
||||||
function run(const runArgs: string = ''): boolean;
|
procedure run(const runArgs: string = '');
|
||||||
function targetUpToDate: boolean;
|
function targetUpToDate: boolean;
|
||||||
//
|
//
|
||||||
property json: TJSONObject read fJSON;
|
property json: TJSONObject read fJSON;
|
||||||
|
@ -390,7 +390,7 @@ begin
|
||||||
SetCurrentDirUTF8(fPreCompilePath);
|
SetCurrentDirUTF8(fPreCompilePath);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCEDubProject.compileOrRun(run: boolean; const runArgs: string = ''): boolean;
|
procedure TCEDubProject.compileOrRun(run: boolean; const runArgs: string = '');
|
||||||
var
|
var
|
||||||
olddir: string;
|
olddir: string;
|
||||||
prjname: string;
|
prjname: string;
|
||||||
|
@ -460,9 +460,9 @@ begin
|
||||||
exit(fCompiled);
|
exit(fCompiled);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCEDubProject.run(const runArgs: string = ''): boolean;
|
procedure TCEDubProject.run(const runArgs: string = '');
|
||||||
begin
|
begin
|
||||||
result := compileOrRun(true);
|
compileOrRun(true);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCEDubProject.targetUpToDate: boolean;
|
function TCEDubProject.targetUpToDate: boolean;
|
||||||
|
|
|
@ -39,7 +39,6 @@ type
|
||||||
procedure Edit; override;
|
procedure Edit; override;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
TListDrawValueProc = procedure(const CurValue: ansistring; Index: integer;
|
TListDrawValueProc = procedure(const CurValue: ansistring; Index: integer;
|
||||||
ACanvas: TCanvas; const ARect:TRect; AState: TPropEditDrawState) of object;
|
ACanvas: TCanvas; const ARect:TRect; AState: TPropEditDrawState) of object;
|
||||||
|
|
||||||
|
@ -86,7 +85,7 @@ var
|
||||||
vOldPenColor, vOldBrushColor: TColor;
|
vOldPenColor, vOldBrushColor: TColor;
|
||||||
vOldPenStyle: TPenStyle;
|
vOldPenStyle: TPenStyle;
|
||||||
noFill: Boolean;
|
noFill: Boolean;
|
||||||
proc: TListDrawValueProc;
|
//proc: TListDrawValueProc;
|
||||||
Style : TTextStyle;
|
Style : TTextStyle;
|
||||||
OldColor : TColor;
|
OldColor : TColor;
|
||||||
rc: TRect;
|
rc: TRect;
|
||||||
|
@ -173,8 +172,6 @@ begin
|
||||||
end;
|
end;
|
||||||
|
|
||||||
ACanvas.TextRect(rc, rc.Left+2, rc.Top, CurValue, Style);
|
ACanvas.TextRect(rc, rc.Left+2, rc.Top, CurValue, Style);
|
||||||
|
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCECustomPathEditor.GetAttributes: TPropertyAttributes;
|
function TCECustomPathEditor.GetAttributes: TPropertyAttributes;
|
||||||
|
|
|
@ -80,8 +80,8 @@ type
|
||||||
procedure compile;
|
procedure compile;
|
||||||
// indicates wether last complation was successful.
|
// indicates wether last complation was successful.
|
||||||
function compiled: boolean;
|
function compiled: boolean;
|
||||||
// tries to un the project output and returns true if it did
|
// tries to execute the project output.
|
||||||
function run(const runArgs: string = ''): boolean;
|
procedure run(const runArgs: string = '');
|
||||||
// returns true if the target has not to be recompiled
|
// returns true if the target has not to be recompiled
|
||||||
function targetUpToDate: boolean;
|
function targetUpToDate: boolean;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ uses
|
||||||
ce_widget, ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf,
|
ce_widget, ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf,
|
||||||
ce_search, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, ce_observer,
|
ce_search, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, ce_observer,
|
||||||
ce_toolseditor, ce_procinput, ce_optionseditor, ce_symlist, ce_mru, ce_processes,
|
ce_toolseditor, ce_procinput, ce_optionseditor, ce_symlist, ce_mru, ce_processes,
|
||||||
ce_infos, ce_dubproject, ce_dialogs, ce_dubprojeditor, ce_gdb, ce_dfmt, ce_lcldragdrop;
|
ce_infos, ce_dubproject, ce_dialogs, ce_dubprojeditor, {ce_gdb,} ce_dfmt, ce_lcldragdrop;
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ type
|
||||||
function importsPathCount: integer;
|
function importsPathCount: integer;
|
||||||
function importPath(index: integer): string;
|
function importPath(index: integer): string;
|
||||||
//
|
//
|
||||||
function run(const runArgs: string = ''): Boolean;
|
procedure run(const runArgs: string = '');
|
||||||
function compiled: Boolean;
|
function compiled: Boolean;
|
||||||
procedure compile;
|
procedure compile;
|
||||||
function targetUpToDate: boolean;
|
function targetUpToDate: boolean;
|
||||||
|
@ -778,13 +778,12 @@ begin
|
||||||
fCompilProc.Execute;
|
fCompilProc.Execute;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCENativeProject.run(const runArgs: string = ''): Boolean;
|
procedure TCENativeProject.run(const runArgs: string = '');
|
||||||
var
|
var
|
||||||
prm: string;
|
prm: string;
|
||||||
i: Integer;
|
i: Integer;
|
||||||
cwd: string;
|
cwd: string;
|
||||||
begin
|
begin
|
||||||
result := false;
|
|
||||||
killProcess(fRunner);
|
killProcess(fRunner);
|
||||||
if fRunnerOldCwd.dirExists then
|
if fRunnerOldCwd.dirExists then
|
||||||
ChDir(fRunnerOldCwd);
|
ChDir(fRunnerOldCwd);
|
||||||
|
@ -824,8 +823,6 @@ begin
|
||||||
getprocInputHandler.addProcess(fRunner);
|
getprocInputHandler.addProcess(fRunner);
|
||||||
end;
|
end;
|
||||||
fRunner.Execute;
|
fRunner.Execute;
|
||||||
//
|
|
||||||
result := true;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCENativeProject.runProcOutput(sender: TObject);
|
procedure TCENativeProject.runProcOutput(sender: TObject);
|
||||||
|
|
Loading…
Reference in New Issue