Changeset 162 for tags/1.3.0/Target.pas

Timestamp:

Aug 20, 2024, 12:23:10 AM (3 months ago)

Author:

chronos

Message:

Merged revision(s) 161 from trunk:

• Fixed: All targets compilation and run.

Location:

tags/1.3.0

Files:

• . (modified) (1 prop)
• Target.pas (modified) (7 diffs)

tags/1.3.0/Target.pas

@@ -80 +80 @@
   protected
     FCompiledExtension: string;
-    FRunExtension: string;
     FSourceExtension: string;
     FName: string;
@@ -118 +117 @@
     procedure Compile; virtual;
     procedure CompileToFile; virtual;
+    function GetSourceFileName: string; virtual;
+    function GetCompileParams: TStringArray; virtual;
+    function GetCompileFileName: string; virtual;
     procedure RunFromFile; virtual;
+    function GetRunParams: TStringArray; virtual;
     procedure Run; virtual;
     procedure Pause; virtual;
@@ -129 +132 @@
     procedure SaveToRegistry(Context: TRegistryContext); virtual;
     property SourceExtension: string read FSourceExtension;
-    property RunExtension: string read FRunExtension;
     property CompiledExtension: string read FCompiledExtension;
     property Name: string read FName;
@@ -183 +185 @@
 
 uses
-  FormConsole;
+  FormConsole, Common;
 
 procedure UpdateTranslation;
@@ -491 +493 @@
 procedure TTarget.CompileToFile;
 var
-  Process: TProcess;
-  CompiledFile: string;
+  SourceFile: string;
   Lines: TStringList;
-  I: Integer;
-begin
-  CompiledFile := ExtractFilePath(ProjectFileName) +
-    CompiledDir + DirectorySeparator + Name + DirectorySeparator +
-    ExtractFileNameOnly(ProjectFileName) + SourceExtension;
-  ForceDirectories(ExtractFilePath(CompiledFile));
+  Output, Error: string;
+  Executable: string;
+  Parameters: array of string;
+begin
+  SourceFile := GetSourceFileName;
+  ForceDirectories(ExtractFilePath(SourceFile));
   with TStringList.Create do
   try
     Text := FTargetCode;
-    SaveToFile(CompiledFile);
+    SaveToFile(SourceFile);
   finally
     Free;
   end;
   if CompilerPath <> '' then begin;
-    if FileExists(CompilerPath) then
-    try
-      Process := TProcess.Create(nil);
-      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 FileExists(CompilerPath) then begin
+      Executable := LongFileName(CompilerPath);
+      Parameters := GetCompileParams;
+
+      ExecuteProgramOutput(Executable, GetCompileParams, GetEnvironmentVariables,
+        Output, Error, ExitCode, ExtractFilePath(SourceFile));
+
       if Assigned(FOnLog) then begin
         Lines := TStringList.Create;
-        Lines.LoadFromStream(Process.Output);
-        Lines.Insert(0, Process.Executable + ' ' + Process.Parameters.Text);
+        Lines.Text := Output;
+        Lines.Insert(0, Executable + ' ' + Implode(',', Parameters));
         FOnLog(Lines);
         Lines.Free;
       end;
-    finally
-      Process.Free;
+
     end else raise Exception.Create(Format(SCompilerNotFound, [CompilerPath]));
   end;
 end;
 
-procedure TTarget.RunFromFile;
-var
-  CompiledFile: string;
-  RunFile: string;
-  FormConsole: TFormConsole;
-begin
-  CompiledFile := ExtractFilePath(ProjectFileName) +
+function TTarget.GetSourceFileName: string;
+begin
+  Result := ExtractFilePath(ProjectFileName) +
+    CompiledDir + DirectorySeparator + Name + DirectorySeparator +
+    ExtractFileNameOnly(ProjectFileName) + SourceExtension;
+end;
+
+function TTarget.GetCompileParams: TStringArray;
+begin
+  Result := [LongFileName(GetSourceFileName)];
+end;
+
+function TTarget.GetCompileFileName: string;
+begin
+  Result := ExtractFilePath(ProjectFileName) +
     CompiledDir + DirectorySeparator + Name + DirectorySeparator +
     ExtractFileNameOnly(ProjectFileName) + CompiledExtension;
-  RunFile := ExtractFilePath(ProjectFileName) +
-    CompiledDir + DirectorySeparator + Name + DirectorySeparator +
-    ExtractFileNameOnly(ProjectFileName) + RunExtension;
+end;
+
+procedure TTarget.RunFromFile;
+var
+  CompiledFile: string;
+  FormConsole: TFormConsole;
+  Parameters: TStringArray;
+  I: Integer;
+begin
+  CompiledFile := GetCompileFileName;
   if FileExists(CompiledFile) then
   try
@@ -550 +562 @@
         raise Exception.Create(Format(SExecutorNotFound, [ExecutorPath]));
       FormConsole.Executable := LongFileName(ExecutorPath);
-      FormConsole.Parameters.Add(LongFileName(RunFile));
+      Parameters := GetRunParams;
+      for I := 0 to Length(Parameters) - 1 do
+        FormConsole.Parameters.Add(Parameters[I]);
     end else
-      FormConsole.Executable := LongFileName(RunFile);
+      FormConsole.Executable := LongFileName(CompiledFile);
     FormConsole.ShowModal;
   finally
@@ -558 +572 @@
   end
   else raise Exception.Create(Format(SCompiledFileNotFound, [CompiledFile]));
+end;
+
+function TTarget.GetRunParams: TStringArray;
+begin
+  Result := [LongFileName(GetCompileFileName)];
 end;