Changeset 60 for trunk/Target/UTarget.pas

Timestamp:

Dec 3, 2014, 10:45:24 PM (9 years ago)

Author:

chronos

Message:

• Added: Free Pascal Compiler as supported target.
• Added: Log window to examine output from background execute compilers.
• Fixed: Execution of targets except Java target.

File:

• trunk/Target/UTarget.pas (modified) (7 diffs)

trunk/Target/UTarget.pas

@@ -69 +69 @@
     cmOutput, cmInput, cmLoopStart, cmLoopEnd, cmDebug);
 
+  TLogEvent = procedure (Lines: TStrings) of object;
+
   { TTarget }
 
   TTarget = class
+  private
+    FOnLog: TLogEvent;
   protected
     FCompiled: Boolean;
@@ -101 +105 @@
     ExecutorPath: string;
     SourceExtension: string;
+    RunExtension: string;
     CompiledExtension: string;
     ProjectFileName: string;
@@ -124 +129 @@
     procedure SaveToRegistry(Root: HKEY; Key: string); virtual;
     property State: TRunState read FState write SetState;
-    property OnChangeState: TNotifyEvent read FOnChangeState write FOnChangeState;
     property SourceCode: string write SetSourceCode;
     property TargetCode: string read GetTargetCode;
@@ -130 +134 @@
     property ExecutionPosition: Integer read GetExecutionPosition;
     property ProgramIndex: Integer read FProgramIndex;
+    property OnChangeState: TNotifyEvent read FOnChangeState write FOnChangeState;
+    property OnLog: TLogEvent read FOnLog write FOnLog;
   end;
 
@@ -396 +402 @@
   Process: TProcess;
   CompiledFile: string;
+  Lines: TStringList;
+  I: Integer;
 begin
   CompiledFile := ExtractFilePath(ProjectFileName) +
@@ -412 +420 @@
     try
       Process := TProcess.Create(nil);
-      Process.CurrentDirectory := ExtractFilePath(CompilerPath);
-      Process.CommandLine := LongFileName(CompilerPath) + ' ' + LongFileName(CompiledFile);
-      Process.Options := [poWaitOnExit];
+      Process.CurrentDirectory := ExtractFilePath(CompiledFile);
+      Process.Executable := LongFileName(CompilerPath);
+      Process.Parameters.Add(LongFileName(CompiledFile));
+      for I := 0 to GetEnvironmentVariableCount - 1 do
+        Process.Environment.Add(GetEnvironmentString(I));
+      Process.Options := [poWaitOnExit, poUsePipes];
       Process.Execute;
+      if Assigned(FOnLog) then begin
+        Lines := TStringList.Create;
+        Lines.LoadFromStream(Process.Output);
+        Lines.Insert(0, Process.Executable + ' ' + Process.Parameters.Text);
+        FOnLog(Lines);
+        Lines.Free;
+      end;
     finally
       Process.Free;
@@ -426 +444 @@
   Process: TProcess;
   CompiledFile: string;
+  RunFile: string;
 begin
   CompiledFile := ExtractFilePath(ProjectFileName) +
     'compiled' + DirectorySeparator + Name + DirectorySeparator +
     ExtractFileNameOnly(ProjectFileName) + CompiledExtension;
+  RunFile := ExtractFilePath(ProjectFileName) +
+    'compiled' + DirectorySeparator + Name + DirectorySeparator +
+    ExtractFileNameOnly(ProjectFileName) + RunExtension;
   if FileExistsUTF8(CompiledFile) then
   try
     Process := TProcess.Create(nil);
-    if ExecutorPath <> '' then Process.CommandLine := LongFileName(ExecutorPath) + ' ';
-    Process.CommandLine := Process.CommandLine + LongFileName(CompiledFile);
-    Process.Options := [poWaitOnExit];
+    if ExecutorPath <> '' then begin
+      Process.Executable := LongFileName(ExecutorPath);
+      Process.Parameters.Add(LongFileName(RunFile));
+    end else Process.Executable := LongFileName(RunFile);
+    Process.ShowWindow := swoShow;
+    Process.Options := [poWaitOnExit, poNewConsole];
     Process.Execute;
   finally